diff --git a/shared/jekyll_import.py b/shared/jekyll_import.py index 0e0397304a97de6d69bd172eb5a5cdf7291d0990..b092f214ad51a976e03a8ff6ff60d923cbc2f957 100644 --- a/shared/jekyll_import.py +++ b/shared/jekyll_import.py @@ -6,7 +6,7 @@ import string import urllib import xml.etree.ElementTree as ET import zipfile -from datetime import date +from datetime import date, datetime from http.client import InvalidURL from io import StringIO from typing import List @@ -508,8 +508,15 @@ class JekyllArticleImporter: """ Projde adresář článků a pokusí se zprocesovat Markdown do article. Vrací list dict pro django messages (klíč levelu, text). + Začne vyčištěním logu. """ - logger.info("Import započat") + self.article_parent_page.last_import_log = "" + self.article_parent_page.save() + + msg = "{} Import započat".format(datetime.now()) + logger.info(msg) + self.page_log += "{}\n\n".format(msg) + for file_name in os.listdir(os.path.join(self.path, POSTS_DIR)): # Případ podsložek (typicky po jednotlivých letech) if os.path.isdir(os.path.join(self.path, POSTS_DIR, file_name)): @@ -522,8 +529,11 @@ class JekyllArticleImporter: file_path = os.path.join(POSTS_DIR, file_name) self.process_article(file_name, file_path) + msg = "{} Import ukončen".format(datetime.now()) + logger.info(msg) + self.page_log += "{}\n\n".format(msg) + self.create_summary_log() - logger.info("Import dokončen") def process_article(self, file_name: str, file_path: str): match = re.match(r"(\d*)-(\d*)-(\d*)-(.*)\.(.*)", file_name)