pyrekordbox 0.2.2__py3-none-any.whl → 0.3.0__py3-none-any.whl

pyrekordbox/db6/database.py

@@ -12,7 +12,6 @@ from sqlalchemy import create_engine, or_, event, MetaData
 from sqlalchemy.orm import Session
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.sql.sqltypes import DateTime, String
-import packaging.version
 from ..utils import get_rekordbox_pid
 from ..config import get_config
 from ..anlz import get_anlz_paths, read_anlz_files
@@ -23,24 +22,22 @@ from . import tables
 
 try:
     from sqlcipher3 import dbapi2 as sqlite3  # noqa
+
+    _sqlcipher_available = True
 except ImportError:
     import sqlite3
 
-MAX_VERSION = packaging.version.parse("6.6.5")
+    _sqlcipher_available = False
+
+MAX_VERSION = "6.6.5"
 
 logger = logging.getLogger(__name__)
 
 rb6_config = get_config("rekordbox6")
 
 
-class IncompatibleVersionError(Exception):
-    def __init__(self, rb_version):
-        super().__init__(
-            f"Incompatible rekordbox 6 version\n"
-            f"Your are using rekordbox {rb_version} but the key extraction only works "
-            f"for versions lower than {MAX_VERSION}.\n"
-            "Please use the `key` parameter to manually provide the database key."
-        )
+class NoCachedKey(Exception):
+    pass
 
 
 def open_rekordbox_database(path=None, key="", unlock=True, sql_driver=None):
@@ -109,13 +106,16 @@ def open_rekordbox_database(path=None, key="", unlock=True, sql_driver=None):
 
     if unlock:
         if not key:
-            ver = packaging.version.parse(rb6_config["version"])
-            if ver >= MAX_VERSION:
-                raise IncompatibleVersionError(rb6_config["version"])
             try:
                 key = rb6_config["dp"]
             except KeyError:
-                raise ValueError("Could not unlock database: No key found")
+                raise NoCachedKey(
+                    "Could not unlock database: No key found\n"
+                    f"If you are using Rekordbox>{MAX_VERSION} the key can not be "
+                    f"extracted automatically!\n"
+                    "Please use the CLI of pyrekordbox to download the key or "
+                    "use the `key` parameter to manually provide the database key."
+                )
             logger.info("Key: %s", key)
         # Unlock database
         con.execute(f"PRAGMA key='{key}'")
@@ -207,14 +207,26 @@ class Rekordbox6Database:
             raise FileNotFoundError(f"File '{path}' does not exist!")
         # Open database
         if unlock:
-            if "dp" in rb6_config:
-                key = rb6_config["dp"]
+            if not _sqlcipher_available:
+                raise ImportError(
+                    "Could not unlock database: 'sqlcipher3' package not found"
+                )
             if not key:
-                ver = packaging.version.parse(rb6_config["version"])
-                if ver >= MAX_VERSION:
-                    raise IncompatibleVersionError(rb6_config["version"])
-                else:
-                    raise ValueError("Could not unlock database: No key found")
+                try:
+                    key = rb6_config["dp"]
+                except KeyError:
+                    raise NoCachedKey(
+                        "Could not unlock database: No key found\n"
+                        f"If you are using Rekordbox>{MAX_VERSION} the key cannot be "
+                        f"extracted automatically!\n"
+                        "Please use the CLI of pyrekordbox to download the key or "
+                        "use the `key` parameter to manually provide it."
+                    )
+            else:
+                # Check if key looks like a valid key
+                if not key.startswith("402fd"):
+                    raise ValueError("The provided database key doesn't look valid!")
+
             logger.info("Key: %s", key)
             # Unlock database and create engine
             url = f"sqlite+pysqlcipher://:{key}@/{path}?"
@@ -1815,7 +1827,9 @@ class Rekordbox6Database:
         root = self.get_anlz_dir(content)
         return read_anlz_files(root)
 
-    def update_content_path(self, content, path, save=True, check_path=True):
+    def update_content_path(
+        self, content, path, save=True, check_path=True, commit=True
+    ):
         """Update the file path of a track in the Rekordbox v6 database.
 
         This changes the `FolderPath` entry in the ``DjmdContent`` table and the
@@ -1832,6 +1846,8 @@ class Rekordbox6Database:
             If True, the changes made are written to disc.
         check_path : bool, optional
             If True, raise an assertion error if the given file path does not exist.
+        commit : bool, optional
+            If True, the changes are committed to the database. True by default.
 
         Examples
         --------
@@ -1848,7 +1864,7 @@ class Rekordbox6Database:
         Updating the path changes the database entry
 
         >>> new_path = "C:/Music/PioneerDJ/Sampler/PRESET ONESHOT/NOISE.wav"
-        >>> db.update_content_path(cont, new_path)
+        >>> db.update_content_path(cont, path)
         >>> cont.FolderPath
         C:/Music/PioneerDJ/Sampler/PRESET ONESHOT/NOISE.wav
 
@@ -1882,15 +1898,31 @@ class Rekordbox6Database:
         logger.debug("Updating database file path: %s", path)
         content.FolderPath = path
 
+        # Update the OrgFolderPath column with the new path
+        # if the column matches the old_path variable
+        org_folder_path = content.OrgFolderPath
+        if org_folder_path == old_path:
+            content.OrgFolderPath = path
+
+        # Update the FileNameL column with the new filename if it changed
+        new_name = path.split("/")[-1]
+        if content.FileNameL != new_name:
+            content.FileNameL = new_name
+
         if save:
-            logger.debug("Saving changes")
+            logger.debug("Saving ANLZ files")
             # Save ANLZ files
             for anlz_path, anlz in anlz_files.items():
                 anlz.save(anlz_path)
+
+        if commit:
             # Commit database changes
+            logger.debug("Committing changes to the database")
             self.commit()
 
-    def update_content_filename(self, content, name, save=True, check_path=True):
+    def update_content_filename(
+        self, content, name, save=True, check_path=True, commit=True
+    ):
         """Update the file name of a track in the Rekordbox v6 database.
 
         This changes the `FolderPath` entry in the ``DjmdContent`` table and the
@@ -1907,6 +1939,8 @@ class Rekordbox6Database:
             If True, the changes made are written to disc.
         check_path : bool, optional
             If True, raise an assertion error if the new file path does not exist.
+        commit : bool, optional
+            If True, the changes are committed to the database. True by default.
 
         See Also
         --------
@@ -1932,7 +1966,6 @@ class Rekordbox6Database:
         >>> file = list(files.values())[0]
         >>> cont.FolderPath == file.get("path")
         True
-
         """
         if isinstance(content, (int, str)):
             content = self.get_content(ID=content)
@@ -1941,7 +1974,7 @@ class Rekordbox6Database:
         ext = old_path.suffix
         new_path = old_path.parent / name
         new_path = new_path.with_suffix(ext)
-        self.update_content_path(content, new_path, save, check_path)
+        self.update_content_path(content, new_path, save, check_path, commit=commit)
 
     def to_dict(self, verbose=False):
         """Convert the database to a dictionary.

pyrekordbox/db6/registry.py

@@ -4,6 +4,7 @@
 
 import logging
 from contextlib import contextmanager
+from sqlalchemy.orm.exc import ObjectDeletedError
 
 logger = logging.getLogger(__name__)
 
@@ -72,7 +73,12 @@ class RekordboxAgentRegistry:
             The table entry instance.
         """
         if cls.__enabled__:
-            logger.debug("On delete: %s", instance)
+            try:
+                s = str(instance)
+                logger.debug("On delete: %s", s)
+            except ObjectDeletedError:
+                instance = []
+
             cls.__update_sequence__.append((instance, "delete", "", ""))
 
     @classmethod