rename article_generator.py module -> article, make functions into article generator class

1 files changed, 9 insertions, 8 deletions

diff --git a/src/blog_node5_net.py b/src/blog_node5_net.py
index d4a2871..0782810 100644
--- a/src/blog_node5_net.py
+++ b/src/blog_node5_net.py
@@ -9,7 +9,7 @@ import urllib
 import flask
 import yaml
 
-import article_generator
+import article
 import db_handler
 import telegram_handler
 
@@ -19,12 +19,14 @@ logger = logging.getLogger(__name__)
 
 site_root_folder_path = 'blog.node5.net'
 
+article_generator = article.ArticleGenerator(os.path.join(site_root_folder_path, 'articles'))
 
-def get_articles() -> article_generator.Folder:
+
+def get_articles() -> article.Folder:
     try:
-        articles = article_generator.discover_articles(os.path.join(site_root_folder_path, 'articles'))
+        articles = article_generator.discover_articles()
         return articles
-    except article_generator.ArticleHandlerException as exception:  # Known exceptions
+    except article.ArticleHandlerException as exception:  # Known exceptions
         logger.error(exception)
     exit(1)  # Exit code 1: Code for generic error
 
@@ -40,8 +42,8 @@ app = flask.Flask(__name__, template_folder=os.path.join('..', site_root_folder_
 with open(os.path.join(site_root_folder_path, 'motd.yml'), 'r') as file:
     motd_list = yaml.safe_load(file.read())
 
-folders_by_url: typing.Dict[str, article_generator.Folder] = {}
-articles_by_url: typing.Dict[str, article_generator.Article] = {}
+folders_by_url: typing.Dict[str, article.Folder] = {}
+articles_by_url: typing.Dict[str, article.Article] = {}
 
 
 @app.context_processor  # Always inject site title to all render_templates
@@ -100,7 +102,7 @@ def view_article():
     return flask.render_template('article.html', article=article)
 
 
-def register_urls(folder: article_generator.Folder):
+def register_urls(folder: article.Folder):
     # Use recursion to traverse folder tree structure
     if strip_trailing_slash(folder.url) not in folders_by_url.keys():
         # If statement is because it can be called multiple times, which would cause an error
@@ -129,7 +131,6 @@ def load_articles():
     register_urls(articles)
 
 
-
 load_articles()