no need to pass meta to contentnode anymore

Author: JasperVanDenBosch

syrinx/node.py

@@ -14,19 +14,21 @@ class ContentNode:
     front: Dict[str, str]
     buildPage: bool
     path: str
-    meta: BuildMetaInfo
     config: SyrinxConfiguration
     isLeaf: bool
 
-    def __init__(self, meta: BuildMetaInfo, config: SyrinxConfiguration):
+    def __init__(self, config: SyrinxConfiguration):
         self.buildPage = False
         self.leaves = []
         self.branches = []
         self.front = {}
-        self.meta = meta
         self.config = config
         self.isLeaf = False
 
+    @property
+    def meta(self) -> BuildMetaInfo:
+        return self.config.meta
+
     @property
     def sequenceNumber(self) -> int:
         if 'SequenceNumber' in self.front:

syrinx/read.py

@@ -55,16 +55,14 @@ def read_file(fpath: str) -> Tuple[Dict, str]:
 
 def read(root_dir: str, config: SyrinxConfiguration) -> ContentNode:
 
-    meta = config.meta
     content_dir = join(root_dir, 'content')
 
     tree: Dict[str, ContentNode] = dict()
-    root = ContentNode(meta, config)
+    root = ContentNode(config)
     root.name = ''
-    root.meta = meta
     for (dirpath, _, fnames) in walk(content_dir):
 
-        indexNode = ContentNode(meta, config)
+        indexNode = ContentNode(config)
         indexNode.name = basename(dirpath)
         if dirpath == content_dir:
             indexNode = root
@@ -91,7 +89,7 @@ def read(root_dir: str, config: SyrinxConfiguration) -> ContentNode:
                 node = indexNode
                 node.buildPage = True
             else:
-                node = ContentNode(meta, config)
+                node = ContentNode(config)
                 node.name = name
                 node.isLeaf = True
                 node.buildPage = True if config.leaf_pages else False

tests/node.py

@@ -6,7 +6,8 @@ class ContentNodeTests(TestCase):
 
     def test_follows_buildPage(self):
         from syrinx.node import ContentNode
-        node = ContentNode(None, None)
+        config = Mock()
+        node = ContentNode(config)
         node.name = 'foo_bar'
         node.front = dict()
         self.assertEqual(node.title, 'Foo Bar')
@@ -32,8 +33,7 @@ def test_includeInSitemap(self, cfg, fm, bld, url, exp):
         config = Mock()
         config.sitemap = cfg
         config.domain = url
-        meta = Mock()
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.name = 'b'
         node.front = dict()
         node.buildPage = bld

tests/node_lastmodified.py

@@ -13,9 +13,8 @@ def test_lastModified_direct_entry(self):
         """Test that direct LastModified entry is converted to datetime"""
         config = Mock()
         config.branches = Branches({})
-        meta = Mock()
 
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.front = {'LastModified': '2025-10-01T12:00:00'}
 
         result = node.lastModified
@@ -29,9 +28,8 @@ def test_lastModified_branch_lookup(self):
             'main': datetime(2025, 12, 6, 13, 15, 24, 42024, tzinfo=UTC),
         }
         config.branches = Branches(branches_dict)
-        meta = Mock()
 
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.front = {'LastModifiedBranch': 'main'}
 
         result = node.lastModified
@@ -46,9 +44,8 @@ def test_lastModified_branch_lookup_different_branch(self):
             'feature-branch': datetime(2025, 11, 15, 10, 30, 0, tzinfo=UTC),
         }
         config.branches = Branches(branches_dict)
-        meta = Mock()
 
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.front = {'LastModifiedBranch': 'feature-branch'}
 
         result = node.lastModified
@@ -62,9 +59,8 @@ def test_lastModified_direct_takes_precedence(self):
             'main': datetime(2025, 12, 6, 13, 15, 24, tzinfo=UTC),
         }
         config.branches = Branches(branches_dict)
-        meta = Mock()
 
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.front = {
             'LastModified': '2025-09-01T08:00:00',
             'LastModifiedBranch': 'main'
@@ -78,9 +74,8 @@ def test_lastModified_no_entries(self):
         """Test that None is returned when no entries present"""
         config = Mock()
         config.branches = Branches({})
-        meta = Mock()
 
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.front = {}
 
         self.assertIsNone(node.lastModified)
@@ -92,9 +87,8 @@ def test_lastModified_unknown_branch_raises_error(self):
             'main': datetime(2025, 12, 6, 13, 15, 24, tzinfo=UTC),
         }
         config.branches = Branches(branches_dict)
-        meta = Mock()
 
-        node = ContentNode(meta, config)
+        node = ContentNode(config)
         node.front = {'LastModifiedBranch': 'nonexistent-branch'}
 
         with self.assertRaises(UnknownBranchError) as cm: