From 7b798b5610a390250e6305c9b28048b36748d9d6 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Fri, 13 Oct 2017 17:39:07 +0300 Subject: [PATCH] [Sync] minor refactoring & code cleanup --- utils/Sync/settings.py | 2 ++ utils/Sync/sync.py | 1 - utils/Sync/sync/__init__.py | 1 + utils/Sync/sync/data/request.py | 2 -- utils/Sync/sync/models/Article.py | 6 +----- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/utils/Sync/settings.py b/utils/Sync/settings.py index fdbc283b..486374ad 100644 --- a/utils/Sync/settings.py +++ b/utils/Sync/settings.py @@ -50,6 +50,8 @@ person_uri = { 'А.С.Тимашева': 'as-timasheva', } +preview_image_default_url = 'https://art.shlisselburg.org/entrance.jpg' + upload_enabled = value('upload_enabled') upload_url_image = 'https://static.shlisselburg.org/upload/art/images/{}' upload_auth = ( diff --git a/utils/Sync/sync.py b/utils/Sync/sync.py index 504c06da..d19ba9fa 100644 --- a/utils/Sync/sync.py +++ b/utils/Sync/sync.py @@ -113,4 +113,3 @@ if __name__ == '__main__': loop = asyncio.get_event_loop() loop.run_until_complete(run(interval)) loop.close() - diff --git a/utils/Sync/sync/__init__.py b/utils/Sync/sync/__init__.py index a8ea13a2..4e863520 100644 --- a/utils/Sync/sync/__init__.py +++ b/utils/Sync/sync/__init__.py @@ -17,6 +17,7 @@ def create_date(date_str, date_formats=None): 2016.10.10 -> datetime + :param date_formats: :param date_str: :return: """ diff --git a/utils/Sync/sync/data/request.py b/utils/Sync/sync/data/request.py index 34c9e538..da342bfc 100644 --- a/utils/Sync/sync/data/request.py +++ b/utils/Sync/sync/data/request.py @@ -14,8 +14,6 @@ async def upload(url, path): if not settings.upload_enabled: return url - # urlf = 'https://static.shlisselburg.org/upload/art{}' - files = {'file': open(path, 'rb')} r = requests.put( url=url, diff --git a/utils/Sync/sync/models/Article.py b/utils/Sync/sync/models/Article.py index d279bc6d..a5519fe4 100644 --- a/utils/Sync/sync/models/Article.py +++ b/utils/Sync/sync/models/Article.py @@ -66,10 +66,6 @@ class Article(Model): ) def __init__(self, provider, file, params=None): - # self.__id_template: str = '{category}-{file}' - # self.__url_template: str = settings.document_url_template - # self.__url_preview_template: str = settings.document_url_preview_template - self.hash_salt = settings.hash_salt_articles self.origin = settings.origin self.version = '2' @@ -116,7 +112,7 @@ class Article(Model): elif len(self.images): self.preview = self.images[0] else: - self.preview = 'https://art.shlisselburg.org/entrance.jpg' + self.preview = settings.preview_image_default_url def bake(self): return {