jeff/siglican
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed bug with loading theme twice

Browse source
This commit is contained in:
sawall 2014-10-03 00:07:42 -05:00
parent 21a6781a53
commit 32db7870e3
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
siglican.py
View file

@ -61,7 +61,7 @@ _DEFAULT_SIGAL_SETTINGS = {
'SIGAL_ORIG_LINK': False, 'SIGAL_ORIG_LINK': False,
# 'PLUGINS': [], # 'PLUGINS': [],
# 'PLUGIN_PATHS': [], # 'PLUGIN_PATHS': [],
'SIGAL_SOURCE': 'sigal', 'SIGAL_SOURCE': 'siglican',
'SIGAL_THEME': 'colorbox', 'SIGAL_THEME': 'colorbox',
'SIGAL_THUMB_DIR': 'thumbs', 'SIGAL_THUMB_DIR': 'thumbs',
'SIGAL_THUMB_FIT': True, 'SIGAL_THUMB_FIT': True,
@ -244,8 +244,8 @@ class SigalGalleryGenerator(Generator):
self.theme = self.settings['SIGAL_THEME'] self.theme = self.settings['SIGAL_THEME']
default_themes = os.path.normpath(os.path.join( default_themes = os.path.normpath(os.path.join(
os.path.abspath(os.path.dirname(__file__)), 'themes')) os.path.abspath(os.path.dirname(__file__)), 'themes'))
logger.debug("siglican: custom theme: %s", self.theme) #logger.debug("siglican: custom theme: %s", self.theme)
logger.debug("siglican: default themedir: %s", default_themes) #logger.debug("siglican: default themedir: %s", default_themes)
if not os.path.exists(self.theme): if not os.path.exists(self.theme):
self.theme = os.path.join(default_themes, os.path.basename(self.theme)) self.theme = os.path.join(default_themes, os.path.basename(self.theme))
if not os.path.exists(self.theme): if not os.path.exists(self.theme):
@ -253,7 +253,6 @@ class SigalGalleryGenerator(Generator):
os.path.basename(self.theme)) os.path.basename(self.theme))
logger.info("siglican theme: %s", self.theme) logger.info("siglican theme: %s", self.theme)
theme_relpath = os.path.join(self.theme, 'templates')
## note 1: it's impossible to add additional templates to jinja ## note 1: it's impossible to add additional templates to jinja
## after the initial init, which means we either need to put plugin ## after the initial init, which means we either need to put plugin

16
writer.py
View file

@ -43,7 +43,7 @@ from .utils import url_from_path
class Writer(object): class Writer(object):
"""Generate html pages for each directory of images.""" """Generate html pages for each directory of images."""
def __init__(self, settings, theme=None, index_title=''): def __init__(self, settings, theme, index_title=''):
self.settings = settings self.settings = settings
self.output_dir = settings['SIGAL_DESTINATION'] self.output_dir = settings['SIGAL_DESTINATION']
self.index_title = index_title self.index_title = index_title
@ -51,21 +51,11 @@ class Writer(object):
# check for a custom theme in ./sigal/themes, if not found, look for a # check for a custom theme in ./sigal/themes, if not found, look for a
# default in the sigal_theme/themes plugin directory # default in the sigal_theme/themes plugin directory
self.theme = settings['SIGAL_THEME']
default_themes = os.path.normpath(os.path.join(
os.path.abspath(os.path.dirname(__file__)), 'themes'))
self.logger.debug("siglican: custom theme: %s", self.theme)
self.logger.debug("siglican: default themedir: %s", default_themes)
if not os.path.exists(self.theme):
self.theme = os.path.join(default_themes, os.path.basename(self.theme))
if not os.path.exists(self.theme):
raise Exception("siglican: unable to find theme: %s" %
os.path.basename(self.theme))
self.logger.info("siglican theme: %s", self.theme) self.logger.info("siglican theme: %s", theme)
# pelican theme path merged with siglican theme path # pelican theme path merged with siglican theme path
theme_paths = [ os.path.join(self.theme, 'templates'), theme_paths = [ os.path.join(theme, 'templates'),
os.path.join(self.settings['THEME'], 'templates') ] os.path.join(self.settings['THEME'], 'templates') ]
# setup jinja env # setup jinja env