1 files changed, 20 insertions, 13 deletions

diff --git a/src/article_handler.py b/src/article_handler.py
index 2655bcc..6ee0420 100644
--- a/src/article_handler.py
+++ b/src/article_handler.py
@@ -5,6 +5,8 @@ import logging
 import pathlib
 import glob
 import typing
+from typing import Tuple
+
 import yaml
 
 
@@ -22,7 +24,12 @@ class ArticleNoMetaData(ArticleHandlerException):
 
 
 @dataclasses.dataclass
-class MetaData:
+class WebPage:
+    url: str
+
+
+@dataclasses.dataclass
+class MetaData():
     description: str
     created: datetime.date
 
@@ -34,7 +41,7 @@ class MetaData:
 
 
 @dataclasses.dataclass
-class Article:
+class Article(WebPage):
     title: str
     meta_data: MetaData
     web_dir: tuple
@@ -43,31 +50,27 @@ class Article:
     folder_path: typing.Union[None, str | os.PathLike] = None
 
     @property
-    def web_path(self):
-        return f'{"/" if self.web_dir else ""}{"/".join(self.web_dir)}/{self.title}'
-
-    @property
     def pretty_print(self) -> str:
         return f'''
 Title:       {self.title}
 Meta data:   {self.meta_data.pretty_print}
 Web dir:     {self.web_dir}
-Web path:    {self.web_path}
+URL:         {self.url}
 Source path: {self.source_path}
 Folder path: {self.folder_path}
 Source:      {f'{self.source[0:49]}...' if len(self.source) >= 50 else self.source}'''  # Truncate long source text
 
 
 @dataclasses.dataclass
-class Folder(list):
+class Folder(WebPage):
     articles: typing.List[Article] = dataclasses.field(default_factory=list)
     sub_folders: typing.Dict[str, typing.Self] = dataclasses.field(default_factory=dict)
 
 
-def get_web_dir(path, title) -> typing.Tuple[str]:
+def get_web_dir(path, title) -> tuple[str, ...]:
     dir_structure = path.split(title)[0]
     # Split into tuple, remove first part, assemble to path again, all to remove the first source dir agnostically 
-    dir_structure_prefix_striped = pathlib.Path(dir_structure).parts[1:]
+    dir_structure_prefix_striped = pathlib.Path(dir_structure).parts[2:]
     return dir_structure_prefix_striped
 
 
@@ -97,6 +100,7 @@ def get_article(path: str | os.PathLike) -> Article:
     if basename == 'index':
         # Article is the folder
         article_folder_name = os.path.dirname(path)
+        article_args['folder_path'] = article_folder_name
         dir_basename = os.path.basename(article_folder_name)
         article_args['title'] = dir_basename
     else:
@@ -105,6 +109,9 @@ def get_article(path: str | os.PathLike) -> Article:
     article_args['web_dir'] = get_web_dir(path, article_args['title'])
     article_args['source_path'] = path
 
+    article_args[
+        'url'] = f'{"/" if article_args["web_dir"] else ""}{"/".join(article_args["web_dir"])}/{article_args["title"]}'
+
     with open(path, 'r') as file:
         source = file.read()
         article_args['source'], article_args['meta_data'] = parse_article_meta_data(source)
@@ -113,14 +120,14 @@ def get_article(path: str | os.PathLike) -> Article:
     return article
 
 
-def discover_folder_structure(article: Article, articles: typing.List[Article]):
+def discover_folder_structure(article: Article, articles: Folder):
     previous_folder = articles
     for folder_name in article.web_dir:
         logging.debug(folder_name)
 
         if folder_name not in previous_folder.sub_folders:
             logging.debug('new')
-            current_folder = Folder()
+            current_folder = Folder(url=f'{previous_folder.url}{folder_name}/')
             previous_folder.sub_folders[folder_name] = current_folder
         else:
             logging.debug('reuse')
@@ -133,7 +140,7 @@ def discover_folder_structure(article: Article, articles: typing.List[Article]):
 
 def discover_articles(path):
     articles_paths = glob.glob(f'{path}/**/*.md', recursive=True)  # Equivalent to ls ./**.md
-    articles = Folder()
+    articles = Folder(url='/')
     for article_path in articles_paths:
         article = get_article(article_path)
         logging.debug(article.pretty_print)