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

Support optional db files

Browse source
This commit is contained in:
shortcutme 2017-04-12 17:36:03 +02:00
parent dafe9981a2
commit 169cf2e6ae
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/MergerSite/MergerSitePlugin.py
View file

@ -235,7 +235,7 @@ class SiteStoragePlugin(object):
merged_site.log.error("[MISSING] %s" % content_inner_path) merged_site.log.error("[MISSING] %s" % content_inner_path)
# Data files in content.json # Data files in content.json
content_inner_path_dir = helper.getDirname(content_inner_path) # Content.json dir relative to site content_inner_path_dir = helper.getDirname(content_inner_path) # Content.json dir relative to site
for file_relative_path in content["files"].keys(): for file_relative_path in content.get("files", {}).keys() + content.get("files_optional", {}).keys():
if not file_relative_path.endswith(".json"): if not file_relative_path.endswith(".json"):
continue # We only interesed in json files continue # We only interesed in json files
file_inner_path = content_inner_path_dir + file_relative_path # File Relative to site dir file_inner_path = content_inner_path_dir + file_relative_path # File Relative to site dir

2
src/Site/SiteStorage.py
View file

@ -83,7 +83,7 @@ class SiteStorage(object):
self.log.error("[MISSING] %s" % content_inner_path) self.log.error("[MISSING] %s" % content_inner_path)
# Data files in content.json # Data files in content.json
content_inner_path_dir = helper.getDirname(content_inner_path) # Content.json dir relative to site content_inner_path_dir = helper.getDirname(content_inner_path) # Content.json dir relative to site
for file_relative_path in content["files"].keys(): for file_relative_path in content.get("files", {}).keys() + content.get("files_optional", {}).keys():
if not file_relative_path.endswith(".json"): if not file_relative_path.endswith(".json"):
continue # We only interesed in json files continue # We only interesed in json files
file_inner_path = content_inner_path_dir + file_relative_path # File Relative to site dir file_inner_path = content_inner_path_dir + file_relative_path # File Relative to site dir