oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Respect optionalHelp when checking files

Browse source
This commit is contained in:
shortcutme 2019-05-30 04:28:41 +02:00
parent fce30baa12
commit 8e2a7c2b2d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Site/SiteStorage.py
View file

@ -446,9 +446,10 @@ class SiteStorage(object):
if not os.path.isfile(file_path): if not os.path.isfile(file_path):
if self.site.content_manager.isDownloaded(file_inner_path, hash_id): if self.site.content_manager.isDownloaded(file_inner_path, hash_id):
back["num_optional_removed"] += 1 back["num_optional_removed"] += 1
self.log.debug("[OPTIONAL REMOVED] %s" % file_inner_path) self.log.debug("[OPTIONAL MISSING] %s" % file_inner_path)
self.site.content_manager.optionalRemoved(file_inner_path, hash_id, file_node["size"]) self.site.content_manager.optionalRemoved(file_inner_path, hash_id, file_node["size"])
if add_optional: if add_optional and self.site.isDownloadable(file_inner_path):
self.log.debug("[OPTIONAL ADDING] %s" % file_inner_path)
bad_files.append(file_inner_path) bad_files.append(file_inner_path)
continue continue
@ -489,7 +490,7 @@ class SiteStorage(object):
s = time.time() s = time.time()
res = self.verifyFiles( res = self.verifyFiles(
quick_check, quick_check,
add_optional=self.site.isDownloadable(""), add_optional=True,
add_changed=not self.site.settings.get("own") # Don't overwrite changed files if site owned add_changed=not self.site.settings.get("own") # Don't overwrite changed files if site owned
) )
bad_files = res["bad_files"] bad_files = res["bad_files"]