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

Fix optional files deleting

Browse source
This commit is contained in:
shortcutme 2017-01-27 14:01:55 +01:00
parent 8a75f200ca
commit 13f0ccf8c6
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Ui/UiWebsocket.py
View file

@ -471,10 +471,13 @@ class UiWebsocket(object):
file_info = self.site.content_manager.getFileInfo(inner_path) file_info = self.site.content_manager.getFileInfo(inner_path)
if file_info.get("optional"): if file_info.get("optional"):
content_json = self.site_storage.loadJson(file_info["content_inner_path"]) self.log.debug("Deleting optional file: %s" % inner_path)
if inner_path in content_json.get("files_optional", {}): relative_path = file_info["relative_path"]
del content_json["files_optional"][inner_path] content_json = self.site.storage.loadJson(file_info["content_inner_path"])
self.site_storage.writeJson(content_json) if relative_path in content_json.get("files_optional", {}):
del content_json["files_optional"][relative_path]
self.site.storage.writeJson(file_info["content_inner_path"], content_json)
self.site.content_manager.loadContent(file_info["content_inner_path"], add_bad_files=False, force=True)
try: try:
self.site.storage.delete(inner_path) self.site.storage.delete(inner_path)