From 9820b4a1c2d30fb7dcf6e21e2922f996dcd9bf81 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Fri, 13 Oct 2017 20:28:54 +0300 Subject: [PATCH] [Sync] Kazimir refactoring. Signature changed --- utils/Sync/kazimir/__init__.py | 2 +- utils/Sync/sync/models/Album.py | 1 - utils/Sync/sync/models/Article.py | 5 ++--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/utils/Sync/kazimir/__init__.py b/utils/Sync/kazimir/__init__.py index 25fb727a..e59c94a6 100644 --- a/utils/Sync/kazimir/__init__.py +++ b/utils/Sync/kazimir/__init__.py @@ -22,7 +22,7 @@ def get_images_src(text: str) -> [str]: return [img.get('src') for img in images] -def kazimir_to_html(text: str) -> str: +def create_tree(text: str) -> str: tokens = text.split('\n') tokens = markup_tokens(tokens) tokens = join_tokens(tokens) diff --git a/utils/Sync/sync/models/Album.py b/utils/Sync/sync/models/Album.py index 8c3be4da..ac7e2ba0 100644 --- a/utils/Sync/sync/models/Album.py +++ b/utils/Sync/sync/models/Album.py @@ -7,7 +7,6 @@ import lxml.html import kazimir import settings from db import collection -from kazimir import kazimir_to_html from sync import create_date_and_title_from_folder_name, images_from_html, create_post_from_image_list, create_date, \ create_post from sync.data import Provider, list_images diff --git a/utils/Sync/sync/models/Article.py b/utils/Sync/sync/models/Article.py index a5519fe4..7cedb93a 100644 --- a/utils/Sync/sync/models/Article.py +++ b/utils/Sync/sync/models/Article.py @@ -7,7 +7,7 @@ import lxml.html import kazimir import settings from db import collection -from kazimir import kazimir_to_html +from kazimir import create_tree from sync import create_date_and_title_from_folder_name, images_from_html, create_post_from_image_list, create_date from sync.data import Provider, list_images from sync.models import Model @@ -170,8 +170,7 @@ def read_manifest(provider, path): async def create_post(provider: Provider, folder: str, md: str, sizes): - post = kazimir.kazimir_to_html(md) - html = lxml.html.fromstring(post) + html = kazimir.create_tree(md) images = [] for img in html.cssselect('img'): src = img.get('src')