lib: Pass sorting information through the TagStore.add() function

Signed-off-by: Anna Schumaker <Anna@NoWheyCreamery.com>

lib/tagstore.py

@@ -10,14 +10,14 @@ class TagStore:
         self.Added = publisher.Publisher()
         self.Removed = publisher.Publisher()
 
-    def __add_tag__(self, name, track):
-        t = self.__get_tag__(name)
+    def __add_tag__(self, name, sort, track):
+        t = self.__get_tag__(name, sort)
         if track:
             t.add_track(track)
         return t
 
-    def __alloc_tag__(self, name):
-        return tag.Tag(name)
+    def __alloc_tag__(self, name, sort):
+        return tag.Tag(name, sort)
 
     def __getitem__(self, name):
         with self.lock:
@@ -27,11 +27,11 @@ class TagStore:
         with self.lock:
             return { "store" : self.store }
 
-    def __get_tag__(self, name):
+    def __get_tag__(self, name, sort):
         with self.lock:
             if (t := self.store.get(name)) != None:
                 return t
-            t = self.__alloc_tag__(name)
+            t = self.__alloc_tag__(name, sort)
             self.store[name] = t
         self.Added.publish(t)
         return t
@@ -49,8 +49,8 @@ class TagStore:
         self.Added = publisher.Publisher()
         self.Removed = publisher.Publisher()
 
-    def add(self, name, track=None):
-        return self.__add_tag__(name.strip(), track)
+    def add(self, name, track=None, sort=None):
+        return self.__add_tag__(name.strip(), sort, track)
 
     def init_track(self, name, track):
         with self.lock:
@@ -79,14 +79,14 @@ class TagStore:
 
 
 class TagSuperStore(TagStore):
-    def __alloc_tag__(self, key):
-        return tag.SuperTag(key[0], key[1])
+    def __alloc_tag__(self, key, sort):
+        return tag.SuperTag(key[0], key[1], sort)
 
     def __pop_tag__(self, t):
         self.store.pop((t.parent, t.name))
 
-    def add(self, parent, name, track):
-        return super().__add_tag__((parent, name.strip()), track)
+    def add(self, parent, name, track, sort=None):
+        return super().__add_tag__((parent, name.strip()), sort, track)
 
     def init_track(self, parent, name, track):
         return super().init_track((parent, name), track)

lib/test_tagstore.py

@@ -62,6 +62,11 @@ class TestTagStore(unittest.TestCase):
         store.remove(tag)
         self.assertNotIn("test", store.store.keys())
 
+    def test_tag_store_add_remove_sort(self):
+        store = tagstore.TagStore()
+        tag = store.add("test", sort="sort")
+        self.assertEqual(tag.sort, "sort")
+
     def test_tag_store_items(self):
         store = tagstore.TagStore()
         self.assertEqual(len(store), 0)