prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use build_private_fonction & refactor build_gallery

Browse Source
This commit is contained in:
Titoko 2016-05-30 19:52:23 +02:00
parent c0e7807cfa
commit 7ee6ec7cff
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
prosopopee/prosopopee.py
View File

@ -244,8 +244,6 @@ def build_gallery(gallery, settings, templates, parent_galleries=False):
error(isinstance(gallery_settings, dict), "Your %s should be a dict" % (os.path.join(gallery, "settings.yaml"))) error(isinstance(gallery_settings, dict), "Your %s should be a dict" % (os.path.join(gallery, "settings.yaml")))
error(gallery_settings.get("title"), "You should specify a title in %s" % (os.path.join(gallery, "settings.yaml"))) error(gallery_settings.get("title"), "You should specify a title in %s" % (os.path.join(gallery, "settings.yaml")))
gallery_index_template = templates.get_template("gallery-index.html")
page_template = templates.get_template("page.html")
gallery_cover = {} gallery_cover = {}
dirs = filter(lambda x: x not in (".", "..") and os.path.isdir(os.path.join(gallery_path, x)) and dirs = filter(lambda x: x not in (".", "..") and os.path.isdir(os.path.join(gallery_path, x)) and
@ -255,7 +253,9 @@ def build_gallery(gallery, settings, templates, parent_galleries=False):
if not os.path.exists(os.path.join("build", gallery_path)): if not os.path.exists(os.path.join("build", gallery_path)):
os.makedirs(os.path.join("build", gallery_path)) os.makedirs(os.path.join("build", gallery_path))
if gallery_settings.get("public", True) or dirs: if not gallery_settings.get("public", True):
build_private_gallery(settings, gallery_settings, gallery_path, templates)
else:
error(gallery_settings.get("title"), "Your gallery describe in %s need to have a " error(gallery_settings.get("title"), "Your gallery describe in %s need to have a "
"title" % (os.path.join(gallery, "settings.yaml"))) "title" % (os.path.join(gallery, "settings.yaml")))
error(gallery_settings.get("cover"), "You should specify a path to a cover picture " error(gallery_settings.get("cover"), "You should specify a path to a cover picture "
@ -325,7 +325,13 @@ def build_gallery(gallery, settings, templates, parent_galleries=False):
build_index(settings, sub_page_galleries_cover, subgallery_templates, gallery_path) build_index(settings, sub_page_galleries_cover, subgallery_templates, gallery_path)
gallery_cover['sub_gallery'] = sub_page_galleries_cover gallery_cover['sub_gallery'] = sub_page_galleries_cover
return gallery_cover
return gallery_cover
def build_private_gallery(settings, gallery_settings, gallery_path, template):
gallery_index_template = template.get_template("gallery-index.html")
page_template = template.get_template("page.html")
# this should probably be a factory # this should probably be a factory
Image.base_dir = os.path.join(os.getcwd(), gallery_path) Image.base_dir = os.path.join(os.getcwd(), gallery_path)
@ -343,11 +349,9 @@ def build_gallery(gallery, settings, templates, parent_galleries=False):
gallery=gallery_settings, gallery=gallery_settings,
Image=Image, Image=Image,
Video=Video, Video=Video,
link=gallery link=gallery_path
).encode("Utf-8")) ).encode("Utf-8"))
return gallery_cover
def build_index(settings, galleries_cover, templates, gallery_path=''): def build_index(settings, galleries_cover, templates, gallery_path=''):
index_template = templates.get_template("index.html") index_template = templates.get_template("index.html")