diff --git a/shared/jekyll_import.py b/shared/jekyll_import.py index bfa8898f2e1800f3d2a882b3d7e15a9478579304..8087bfca90f36711eaaa60a9c6027da60a770ffa 100644 --- a/shared/jekyll_import.py +++ b/shared/jekyll_import.py @@ -83,18 +83,18 @@ def download_repo_as_zip(url: str) -> (str, str): # zdá se, že někdy je -gh-pages, někdy -master... gh_pages_path = os.path.join(path, "{}-gh-pages".format(repo_name)) - gh_pages_path_exists = os.path.exists(gh_pages_path) - master_path = os.path.join(path, "{}-master".format(repo_name)) - master_path_exists = os.path.exists(master_path) - - if gh_pages_path_exists: + if os.path.exists(gh_pages_path): return gh_pages_path, repo_name - if master_path_exists: + master_path = os.path.join(path, "{}-master".format(repo_name)) + if os.path.exists(master_path): return master_path, repo_name - else: - raise NotImplementedError("Tento zip nedokážeme zpracovat.") + main_path = os.path.join(path, "{}-main".format(repo_name)) + if os.path.exists(main_path): + return main_path, repo_name + + raise NotImplementedError("Tento zip nedokážeme zpracovat.") def get_or_create_image( @@ -576,7 +576,9 @@ class JekyllArticleImporter: md = r[2] # "raw" markdown z postu html = html_md.convert(md) # očistíme o případné nechtěné HTML tagy - html = bleach.clean(html, tags=bleach.sanitizer.ALLOWED_TAGS + ["div", "p"]) + html = bleach.clean( + html, tags=list(bleach.sanitizer.ALLOWED_TAGS) + ["div", "p"] + ) article.perex = self.get_perex(md) or "..." self.handle_content(article, meta, html)