github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1597 from avaris/fix_static_watcher

Browse source 
Fix static path watchers
This commit is contained in:
Justin Mayer 2015-01-26 17:48:45 -08:00
commit e3139db712
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
pelican/__init__.py
View file

@ -359,8 +359,13 @@ def main():
pelican.ignore_files), pelican.ignore_files),
'settings': file_watcher(args.settings)} 'settings': file_watcher(args.settings)}
for static_path in settings.get("STATIC_PATHS", []): old_static = settings.get("STATIC_PATHS", [])
watchers[static_path] = folder_watcher(static_path, [''], pelican.ignore_files) for static_path in old_static:
# use a prefix to avoid possible overriding of standard watchers above
watchers['[static]%s' % static_path] = folder_watcher(
os.path.join(pelican.path, static_path),
[''],
pelican.ignore_files)
try: try:
if args.autoreload: if args.autoreload:
@ -386,6 +391,29 @@ def main():
original_load_cache = settings['LOAD_CONTENT_CACHE'] original_load_cache = settings['LOAD_CONTENT_CACHE']
_ignore_cache(pelican) _ignore_cache(pelican)
# Adjust static watchers if there are any changes
new_static = settings.get("STATIC_PATHS", [])
# Added static paths
# Add new watchers and set them as modified
for static_path in set(new_static).difference(old_static):
static_key = '[static]%s' % static_path
watchers[static_key] = folder_watcher(
os.path.join(pelican.path, static_path),
[''],
pelican.ignore_files)
modified[static_key] = next(watchers[static_key])
# Removed static paths
# Remove watchers and modified values
for static_path in set(old_static).difference(new_static):
static_key = '[static]%s' % static_path
watchers.pop(static_key)
modified.pop(static_key)
# Replace old_static with the new one
old_static = new_static
if any(modified.values()): if any(modified.values()):
print('\n-> Modified: {}. re-generating...'.format( print('\n-> Modified: {}. re-generating...'.format(
', '.join(k for k, v in modified.items() if v))) ', '.join(k for k, v in modified.items() if v)))