From 11ac59e3b08cd6f96bf501fd7c160b4d5c82d251 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Tue, 24 Oct 2017 17:29:01 +0300 Subject: [PATCH] [Sync] Album common provider --- utils/Sync/settings.py | 2 +- utils/Sync/sync.py | 2 +- utils/Sync/sync/models/Album.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/Sync/settings.py b/utils/Sync/settings.py index 2206d7e8..8c3bd277 100644 --- a/utils/Sync/settings.py +++ b/utils/Sync/settings.py @@ -127,7 +127,7 @@ dir_documents = './Documents' dir_schedules = './Schedules' dir_articles = './Articles' dir_persons = './Collective' -dir_albums = f('Gallery') +dir_albums = './Gallery' dir_pages = './Pages' dir_images = './Images' diff --git a/utils/Sync/sync.py b/utils/Sync/sync.py index 873bc23d..ec67f095 100644 --- a/utils/Sync/sync.py +++ b/utils/Sync/sync.py @@ -73,7 +73,7 @@ async def run(run_interval=0): ) sync_albums = Sync( - provider=io(settings.dir_albums), + provider=io(settings.provider_root), model=Album, ) diff --git a/utils/Sync/sync/models/Album.py b/utils/Sync/sync/models/Album.py index 39b5d459..779b0f79 100644 --- a/utils/Sync/sync/models/Album.py +++ b/utils/Sync/sync/models/Album.py @@ -34,7 +34,8 @@ class Album(Model): @staticmethod async def scan(provider): - documents = [i for i in provider.scan('.') if provider.is_dir(i)] + scan_dir = settings.dir_albums + documents = [i for i in provider.scan(scan_dir) if provider.is_dir(i)] documents = [Album.read(provider, i) for i in documents] return documents