From d75f7d11ce11d884a0c991b35dccf362ef109619 Mon Sep 17 00:00:00 2001
From: Matthias Blankertz <matthias@blankertz.org>
Date: Thu, 28 Aug 2025 12:14:07 +0200
Subject: [PATCH] playlistdb: Allow up to 100k tracks; Add validate method;
 docstrings

- Increase the formatting of playlist entries to allow up to 100000
  tracks. Also enforce that playlist entries are indexed by integers
  using the validate method.

- Add a validate method to validate the data stored in the
  btreedb. Optionally dump the contents to stdout. For testing, add a
  validate+dump by default when opening the db. This can be removed once
  the playlistdb is validated.
---
 software/src/main.py                      |  4 ++
 software/src/utils/playlistdb.py          | 59 ++++++++++++++++++++++-
 software/tests/utils_test/test_btreedb.py |  9 ++--
 3 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/software/src/main.py b/software/src/main.py
index 3d88de2..819604a 100644
--- a/software/src/main.py
+++ b/software/src/main.py
@@ -81,6 +81,10 @@ def run():
 
 
 def builddb():
+    """
+    For testing, build a playlist db based on the previous tag directory format.
+    Can be removed once uploading files / playlist via the web api is possible.
+    """
     import os
 
     os.unlink('/sd/tonberry.db')
diff --git a/software/src/utils/playlistdb.py b/software/src/utils/playlistdb.py
index 449312b..96b2fcf 100644
--- a/software/src/utils/playlistdb.py
+++ b/software/src/utils/playlistdb.py
@@ -65,7 +65,7 @@ class BTreeDB(IPlaylistDB):
 
     @staticmethod
     def _keyPlaylistEntry(tag, pos):
-        return b''.join([tag, b'/playlist/', "{:03}".format(pos).encode()])
+        return b''.join([tag, b'/playlist/', "{:05}".format(pos).encode()])
 
     @staticmethod
     def _keyPlaylistStart(tag):
@@ -149,6 +149,59 @@ class BTreeDB(IPlaylistDB):
         self._savePlaylist(tag, entries)
         return self.getPlaylistForTag(tag)
 
+    def validate(self, dump=False):
+        """
+        Validate the structure of the playlist database.
+        """
+        result = True
+        last_tag = None
+        last_pos = None
+        for k in self.db.keys():
+            fields = k.split(b'/')
+            if len(fields) <= 1:
+                print(f'Malformed key {k!r}')
+                result = False
+            if last_tag != fields[0]:
+                last_tag = fields[0]
+                last_pos = None
+                if dump:
+                    print(f'Tag {fields[0]}')
+            if fields[1] == b'playlist':
+                if len(fields) != 3:
+                    print(f'Malformed playlist entry: {k!r}')
+                    result = False
+                    continue
+                try:
+                    idx = int(fields[2])
+                except ValueError:
+                    print(f'Malformed playlist entry: {k!r}')
+                    result = False
+                    continue
+                if (last_pos is not None and last_pos + 1 != idx) or \
+                   (last_pos is None and idx != 0):
+                    print(f'Bad playlist entry sequence for {last_tag} at {idx}')
+                    result = False
+                last_pos = idx
+                if dump:
+                    print(f'\tTrack {idx}: {self.db[k]!r}')
+            elif fields[1] == b'playlistpos':
+                val = self.db[k]
+                try:
+                    idx = int(val)
+                except ValueError:
+                    print(f'Malformed playlist position: {val!r}')
+                    result = False
+                    continue
+                if 0 > idx or idx > last_pos:
+                    print(f'Playlist position out of range for {last_tag}: {idx}')
+                    result = False
+                if dump:
+                    print(f'\tPosition {idx}')
+            else:
+                print(f'Unknown key {k!r}')
+                result = False
+        return result
+
 
 class BTreeFileManager:
     """
@@ -164,7 +217,9 @@ class BTreeFileManager:
             self.db_file = open(self.db_path, 'w+b')
         try:
             self.db = btree.open(self.db_file, pagesize=512, cachesize=1024)
-            return BTreeDB(self.db, lambda: self.db_file.flush())
+            btdb = BTreeDB(self.db, lambda: self.db_file.flush())
+            btdb.validate(True)  # while testing, validate and dump DB on startup
+            return btdb
         except Exception:
             self.db_file.close()
             raise
diff --git a/software/tests/utils_test/test_btreedb.py b/software/tests/utils_test/test_btreedb.py
index a21c2b1..20ed048 100644
--- a/software/tests/utils_test/test_btreedb.py
+++ b/software/tests/utils_test/test_btreedb.py
@@ -12,19 +12,19 @@ class FakeDB:
     def flush(self):
         self.saved_contents = dict(self.contents)
 
-    def values(self, start_key, end_key=None, flags=None):
+    def values(self, start_key=None, end_key=None, flags=None):
         res = []
         for key in sorted(self.contents):
-            if start_key >= key:
+            if start_key is not None and start_key >= key:
                 continue
             if end_key is not None and end_key < key:
                 break
             yield self.contents[key]
             res.append(self.contents[key])
 
-    def keys(self, start_key, end_key=None, flags=None):
+    def keys(self, start_key=None, end_key=None, flags=None):
         for key in sorted(self.contents):
-            if start_key >= key:
+            if start_key is not None and start_key >= key:
                 continue
             if end_key is not None and end_key < key:
                 break
@@ -88,6 +88,7 @@ def test_playlist_create():
     new_pl = uut.createPlaylistForTag(b'foo', newplaylist)
     assert list(new_pl.getPaths()) == newplaylist
     assert new_pl.getCurrentPath() == newplaylist[0]
+    assert uut.validate(True)
 
 
 def test_playlist_load_notexist():