pyrekordbox 0.4.3__py3-none-any.whl → 0.4.4__py3-none-any.whl

pyrekordbox/__main__.py

@@ -3,30 +3,10 @@
 # Date:   2023-08-15
 
 import os
-import re
 import shutil
 import sys
-import urllib.request
 from pathlib import Path
 
-from pyrekordbox.config import get_cache_file, write_db6_key_cache
-
-KEY_SOURCES = [
-    {
-        "url": r"https://raw.githubusercontent.com/mganss/CueGen/19878e6eb3f586dee0eb3eb4f2ce3ef18309de9d/CueGen/Generator.cs",  # noqa: E501
-        "regex": re.compile(
-            r'((.|\n)*)Config\.UseSqlCipher.*\?.*"(?P<dp>.*)".*:.*null',
-            flags=re.IGNORECASE | re.MULTILINE,
-        ),
-    },
-    {
-        "url": r"https://raw.githubusercontent.com/dvcrn/go-rekordbox/8be6191ba198ed7abd4ad6406d177ed7b4f749b5/cmd/getencryptionkey/main.go",  # noqa: E501
-        "regex": re.compile(
-            r'((.|\n)*)fmt\.Print\("(?P<dp>.*)"\)', flags=re.IGNORECASE | re.MULTILINE
-        ),
-    },
-]
-
 
 class WorkingDir:
     def __init__(self, path):
@@ -130,40 +110,12 @@ def install_pysqlcipher(
             print(f"Could not remove temporary directory '{tmpdir}'!")
 
 
-def download_db6_key():
-    dp = ""
-    for source in KEY_SOURCES:
-        url = source["url"]
-        regex = source["regex"]
-        print(f"Looking for key: {url}")
-
-        res = urllib.request.urlopen(url)
-        data = res.read().decode("utf-8")
-        match = regex.match(data)
-        if match:
-            dp = match.group("dp")
-            break
-    if dp:
-        cache_file = get_cache_file()
-        print(f"Found key, updating cache file {cache_file}")
-        write_db6_key_cache(dp)
-    else:
-        print("No key found in the online sources.")
-
-
 def main():
     from argparse import ArgumentParser
 
     parser = ArgumentParser("pyrekordbox")
     subparsers = parser.add_subparsers(dest="command")
 
-    # Download Rekordbx 6 database key command
-    subparsers.add_parser(
-        "download-key",
-        help="Download the Rekordbox 6 database key from the internet "
-        "and write it to the cache file.",
-    )
-
     # Install pysqlcipher3 command (Windows only)
     install_parser = subparsers.add_parser(
         "install-sqlcipher",
@@ -192,9 +144,7 @@ def main():
 
     # Parse args and handle command
     args = parser.parse_args(sys.argv[1:])
-    if args.command == "download-key":
-        download_db6_key()
-    elif args.command == "install-sqlcipher":
+    if args.command == "install-sqlcipher":
         install_pysqlcipher(args.tmpdir, args.cryptolib, install=not args.buildonly)
 
 

pyrekordbox/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.4.3'
-__version_tuple__ = version_tuple = (0, 4, 3)
+__version__ = version = '0.4.4'
+__version_tuple__ = version_tuple = (0, 4, 4)
+
+__commit_id__ = commit_id = None

pyrekordbox/anlz/file.py

@@ -108,30 +108,36 @@ class AnlzFile(abc.Mapping):  # type: ignore[type-arg]
             # Get the four byte struct type
             tag_type = tag_data[:4].decode("ascii")
 
+            # Get tag length from generic tag header
+            tag_struct = structs.AnlzTag.parse(tag_data)
+            len_tag = tag_struct.len_tag
+
             if tag_type == "PSSI":
                 # The version that rekordbox 6 *exports* is garbled with an XOR mask.
+                # Determine if the tag is garbled by checking the initial (masked) mood value.
                 # All bytes after byte 17 (len_e) are XOR-masked with a pattern that is
                 # generated by adding the value of len_e to each byte of XOR_MASK
 
                 # Check if the file is garbled (only on exported files)
                 # For this we check the validity of mood and bank
                 # Mood: High=1, Mid=2, Low=3
-                # Bank: 0-8
                 mood = Int16ub.parse(tag_data[18:20])
-                bank = Int16ub.parse(tag_data[28:30])
-                if 1 <= mood <= 3 and 0 <= bank <= 8:
+                if 1 <= mood <= 3:
                     logger.debug("PSSI is not garbled!")
                 else:
-                    logger.debug("PSSI is garbled!")
-                    # deobfuscate tag_data[18:] using xor with XOR_MASK+len_entries
-                    len_entries = Int16ub.parse(tag_data[16:])
-                    tag_data = bytearray(data[i : i + len(tag_data)])
-                    for x in range(len(tag_data[18:])):
+                    logger.debug("PSSI is garbled! (raw_mood=%s)", mood)
+                    len_entries = Int16ub.parse(tag_data[16:18])
+
+                    # Copy only this tag's data so we don't mutate the remainder of file slice
+                    mutable_tag_data = bytearray(tag_data[:len_tag])
+
+                    for x in range(len(mutable_tag_data) - 18):
                         mask = XOR_MASK[x % len(XOR_MASK)] + len_entries
                         if mask > 255:
                             mask -= 256
-                        tag_data[x + 18] ^= mask
-                    tag_data = bytes(tag_data)
+                        mutable_tag_data[18 + x] ^= mask
+
+                    tag_data = bytes(mutable_tag_data)
 
             try:
                 # Parse the struct
@@ -140,7 +146,7 @@ class AnlzFile(abc.Mapping):  # type: ignore[type-arg]
                     raise StructNotInitializedError()
                 tags.append(tag)
                 len_header = tag.struct.len_header
-                len_tag = tag.struct.len_tag
+
                 logger.debug(
                     "Parsed struct '%s' (len_header=%s, len_tag=%s)",
                     tag_type,
@@ -149,8 +155,7 @@ class AnlzFile(abc.Mapping):  # type: ignore[type-arg]
                 )
             except KeyError:
                 logger.warning("Tag '%s' not supported!", tag_type)
-                tag_struct = structs.AnlzTag.parse(tag_data)
-                len_tag = tag_struct.len_tag
+
             i += len_tag
 
         self.file_header = file_header

pyrekordbox/config.py

@@ -8,30 +8,18 @@ Contains all the path and settings handling of the Rekordbox installation(s) on
 the users machine.
 """
 
-import base64
 import json
 import logging
 import os
-import re
 import sys
-import textwrap
-import time
 import xml.etree.cElementTree as xml
 from pathlib import Path
 from typing import Any, Dict, List, Union
 
-import blowfish
-import frida
 import packaging.version
 
-from .utils import get_rekordbox_pid
-
 logger = logging.getLogger(__name__)
 
-# Cache file for pyrekordbox data
-_cache_file_version = 2
-_cache_file_name = "rb.cache"
-
 # Define empty pyrekordbox configuration
 __config__ = {
     "pioneer": {
@@ -48,29 +36,6 @@ class InvalidApplicationDirname(Exception):
     pass
 
 
-def get_appdata_dir() -> Path:
-    """Returns the path of the application data directory.
-
-    On Windows, the application data is stored in `/Users/user/AppData/Roaming`.
-    On macOS the application data is stored in `~/Libary/Application Support`.
-    """
-    if sys.platform == "win32":
-        # Windows: located in /Users/user/AppData/Roaming/
-        app_data = Path(os.environ["AppData"])
-    elif sys.platform == "darwin":
-        # MacOS: located in ~/Library/Application Support/
-        app_data = Path("~").expanduser() / "Library" / "Application Support"
-    else:
-        # Linux: not supported
-        logger.warning(f"OS {sys.platform} not supported!")
-        return Path("~").expanduser() / ".local" / "share"
-    return app_data
-
-
-def get_cache_file() -> Path:
-    return get_appdata_dir() / "pyrekordbox" / _cache_file_name
-
-
 def get_pioneer_install_dir(path: Union[str, Path] = None) -> Path:  # pragma: no cover
     """Returns the path of the Pioneer program installation directory.
 
@@ -231,46 +196,6 @@ def read_rekordbox6_options(pioneer_app_dir: Union[str, Path]) -> Dict[str, Any]
     return options
 
 
-def read_rekordbox6_asar(rb6_install_dir: Union[str, Path]) -> str:
-    """Finds and parses the Rekordbox 6 `app.asar` archive file.
-
-    An ASAR file is an archive used to package source code for an application
-    using Electron. Rekordbox 6 stores some useful information for opening the
-    new `master.db` database in this file.
-
-    Parameters
-    ----------
-    rb6_install_dir : str or Path
-        The path of the Rekordbox 6 installation directory.
-
-    Returns
-    -------
-    asar_data : str
-        The data of the Rekordbox 6 `app.asar` archive file as ANSI encoded string.
-    """
-    rb6_install_dir = Path(rb6_install_dir)
-    # Find location of app asar file
-    if sys.platform == "win32":
-        location = rb6_install_dir / "rekordboxAgent-win32-x64" / "resources"
-        encoding = "ANSI"
-    elif sys.platform == "darwin":
-        if not str(rb6_install_dir).endswith(".app"):
-            rb6_install_dir = rb6_install_dir / "rekordbox.app"
-        location = (
-            rb6_install_dir / "Contents" / "MacOS" / "rekordboxAgent.app" / "Contents" / "Resources"
-        )
-        encoding = "cp437"
-    else:
-        logger.warning(f"OS {sys.platform} not supported!")
-        return ""
-
-    # Read asar file
-    path = (location / "app.asar").absolute()
-    with open(path, "rb") as fh:
-        data = fh.read().decode(encoding, errors="replace")
-    return data
-
-
 def _extract_version(name: str, major_version: int) -> str:
     name = name.replace(".app", "")  # Needed for MacOS
     ver_str = name.replace("rekordbox", "").strip()
@@ -387,199 +312,6 @@ def _get_rb5_config(
     return conf
 
 
-def _extract_pw(pioneer_install_dir: Path) -> str:  # pragma: no cover
-    """Extract the password for decrypting the Rekordbox 6 database key."""
-    asar_data = read_rekordbox6_asar(pioneer_install_dir)
-    match_result = re.search('pass: ".(.*?)"', asar_data)
-    if match_result is None:
-        raise RuntimeError("Could not read `app.asar` file.")
-    match = match_result.group(0)
-    pw = match.replace("pass: ", "").strip('"')
-    return pw
-
-
-class KeyExtractor:
-    """Extracts the Rekordbox database key using code injection.
-
-    This method works by injecting code into the Rekordbox process and intercepting the
-    call to unlock the database. Works for any Rekordbox version.
-    """
-
-    # fmt: off
-    SCRIPT = textwrap.dedent("""
-    var sqlite3_key = Module.findExportByName(null, 'sqlite3_key');
-
-    Interceptor.attach(sqlite3_key, {
-        onEnter: function(args) {
-            var size = args[2].toInt32();
-            var key = args[1].readUtf8String(size);
-            send('sqlite3_key: ' + key);
-        }
-    });
-    """)
-    # fmt: on
-
-    def __init__(self, rekordbox_executable: Union[str, Path]):
-        self.executable = str(rekordbox_executable)
-        self.key = ""
-
-    def on_message(self, message: Dict[str, Any], data: Any) -> None:
-        payload = message["payload"]
-        if payload.startswith("sqlite3_key"):
-            self.key = payload.split(": ")[1]
-
-    def run(self) -> str:
-        pid = get_rekordbox_pid()
-        if pid:
-            raise RuntimeError(
-                "Rekordbox is running. Please close Rekordbox before running the `KeyExtractor`."
-            )
-        # Spawn Rekordbox process and attach to it
-        pid = frida.spawn(self.executable)
-        frida.resume(pid)
-        session = frida.attach(pid)
-        script = session.create_script(self.SCRIPT)
-        script.on("message", self.on_message)
-        script.load()
-        # Wait for key to be extracted
-        while not self.key:
-            time.sleep(0.1)
-        # Kill Rekordbox process
-        frida.kill(pid)
-
-        return self.key
-
-
-def write_db6_key_cache(key: str) -> None:  # pragma: no cover
-    r"""Writes the decrypted Rekordbox6 database key to the cache file.
-
-    This method can also be used to manually cache the database key, provided
-    the user has found the key somewhere else. The key can be, for example,
-    found in some other projects that hard-coded it.
-
-    The cache file is stored in the application data directory of pyrekordbox:
-    Windows: `C:\Users\<user>\AppData\Roaming\pyrekordbox`
-    macOS: `~/Library/Application Support/pyrekordbox`
-
-    Parameters
-    ----------
-    key : str
-        The decrypted database key. To make sure the key is valid, the first
-        five characters are checked before writing the key to the cache file.
-        The key should start with '402fd'.
-
-    Examples
-    --------
-    >>> from pyrekordbox.config import write_db6_key_cache
-    >>> from pyrekordbox import Rekordbox6Database
-    >>> write_db6_key_cache("402fd...")
-    >>> db = Rekordbox6Database()  # The db can now be opened without providing the key
-    """
-    # Check if the key looks like a valid key
-    if not key.startswith("402fd"):
-        raise ValueError("The provided database key doesn't look valid!")
-    lines = list()
-    lines.append(f"version: {_cache_file_version}")
-    lines.append("dp: " + key)
-    text = "\n".join(lines)
-
-    cache_file = get_cache_file()
-    if not cache_file.parent.exists():
-        cache_file.parent.mkdir()
-
-    with open(cache_file, "w") as fh:
-        fh.write(text)
-    # Set the config key to make sure the key is present after calling method
-    if __config__["rekordbox6"]:
-        __config__["rekordbox6"]["dp"] = key  # type: ignore
-    if __config__["rekordbox7"]:
-        __config__["rekordbox7"]["dp"] = key  # type: ignore
-
-
-def _update_sqlite_key(opts: Dict[str, Any], conf: Dict[str, Any]) -> None:
-    cache_version = 0
-    pw, dp = "", ""
-
-    cache_file = get_cache_file()
-
-    if cache_file.exists():  # pragma: no cover
-        logger.debug("Found cache file %s", cache_file)
-        # Read cache file
-        with open(cache_file, "r") as fh:
-            text = fh.read()
-        lines = text.splitlines()
-        if lines[0].startswith("version:"):
-            cache_version = int(lines[0].split(":")[1].strip())
-        else:
-            cache_version = 1
-        if cache_version == 1:
-            # Cache file introduced in pyrekordbox 0.1.6 contains only the password
-            pw = lines[0]
-            logger.debug("Found pw in cache file")
-        elif cache_version == 2:
-            # Cache file introduced in pyrekordbox 0.1.7 contains version and db key
-            dp = lines[1].split(":")[1].strip()
-            logger.debug("Found dp in cache file")
-        else:
-            raise ValueError(f"Invalid cache version: {cache_version}")
-    else:
-        logger.debug("No cache file found")
-
-    if cache_version < _cache_file_version:  # pragma: no cover
-        # Update cache file
-        if not pw:
-            logger.debug("Extracting pw")
-            try:
-                pw = _extract_pw(conf["install_dir"])
-                logger.debug("Extracted pw from 'app.asar'")
-            except (FileNotFoundError, RuntimeError):
-                logger.debug("Could not extract pw from 'app.asar'")
-                pw = ""
-
-        if not dp:
-            if pw:
-                cipher = blowfish.Cipher(pw.encode())
-                dp = base64.standard_b64decode(opts["dp"])  # type: ignore
-                dp = b"".join(cipher.decrypt_ecb(dp)).decode()
-                logger.debug("Unlocked dp from pw: %s", dp)
-            else:
-                if sys.platform == "win32":
-                    executable = conf["install_dir"] / "rekordbox.exe"
-                elif sys.platform == "darwin":
-                    install_dir = conf["install_dir"]
-                    if not str(install_dir).endswith(".app"):
-                        install_dir = install_dir / "rekordbox.app"
-                    executable = install_dir / "Contents" / "MacOS" / "rekordbox"
-                else:
-                    # Linux: not supported
-                    logger.warning(f"OS {sys.platform} not supported!")
-                    executable = Path("")
-
-                if not executable.exists():
-                    logger.warning(f"Could not find Rekordbox executable: {executable}")
-                else:
-                    extractor = KeyExtractor(executable)
-                    try:
-                        dp = extractor.run()
-                        logger.debug("Extracted dp from Rekordbox process")
-                    except Exception as e:
-                        logger.info(f"`KeyExtractor` failed: {e}")
-
-        if dp:
-            logger.debug("Writing dp to cache file")
-            write_db6_key_cache(dp)
-        else:
-            logging.warning(
-                "Could not retrieve db-key or read it from cache file,"
-                "use the CLI to download it from external sources: "
-                "`python -m pyrekordbox download-key`"
-            )
-
-    # Add database key to config if found
-    if dp:
-        conf["dp"] = dp
-
-
 def _get_rb6_config(
     pioneer_prog_dir: Path, pioneer_app_dir: Path, dirname: str = ""
 ) -> Dict[str, Any]:
@@ -594,9 +326,6 @@ def _get_rb6_config(
     assert str(conf["db_dir"]) == str(db_dir)
     assert str(conf["db_path"]) == str(db_path)
 
-    # Update SQLite key
-    _update_sqlite_key(opts, conf)
-
     return conf
 
 
@@ -614,69 +343,9 @@ def _get_rb7_config(
     assert str(conf["db_dir"]) == str(db_dir)
     assert str(conf["db_path"]) == str(db_path)
 
-    # Update SQLite key
-    _update_sqlite_key(opts, conf)
-
     return conf
 
 
-# noinspection PyPackageRequirements,PyUnresolvedReferences
-def _read_config_file(path: Union[str, Path]) -> Dict[str, Any]:
-    path = Path(path)
-    if not path.exists():
-        raise FileNotFoundError(f"No such file or directory: '{path}'")
-
-    ext = path.suffix.lower()
-    if ext == ".cfg":
-        from configparser import ConfigParser
-
-        parser = ConfigParser()
-        parser.read(path)
-        return {k: v for k, v in parser.items() if v is not None}
-    elif ext == ".toml":
-        import toml
-
-        return dict(toml.load(path))
-    elif ext in (".yaml", ".yml"):
-        import yaml
-
-        with open(path, "r") as stream:
-            return dict(yaml.safe_load(stream))
-    return dict()
-
-
-def read_pyrekordbox_configuration() -> Dict[str, Any]:
-    """Reads the pyrekordbox configuration.
-
-    So far only the `pioneer-install-dir` and `pioneer-app-dir` fileds in the
-    `rekordbox` section are supported. Supported configuration files are
-    pyproject.toml, setup.cfg, rekordbox.toml, rekordbox.cfg and rekordbox.yml.
-    The files are searched for in that order.
-
-    Returns
-    -------
-    pyrekordbox_config : dict
-        The pyrekordbox configuration data, if found.
-    """
-    files = ["pyproject.toml", "setup.cfg"]
-    for ext in [".toml", ".cfg", ".yaml", ".yml"]:
-        files.append("pyrekordbox" + ext)
-
-    for file in files:
-        try:
-            data = _read_config_file(file)
-            config = dict(data["rekordbox"])
-            logger.debug("Read configuration from '%s'", file)
-        except (ImportError, FileNotFoundError) as e:
-            logger.debug("Could not read config file '%s': %s", file, e)
-        except KeyError:
-            pass
-        else:
-            if config:
-                return config
-    return dict()
-
-
 def update_config(
     pioneer_install_dir: Union[str, Path] = None,
     pioneer_app_dir: Union[str, Path] = None,
@@ -713,19 +382,6 @@ def update_config(
         The name of the Rekordbox 7 installation directory. By default, the normal
         directory name is used (Windows: 'rekordbox 7.x.x', macOS: 'rekordbox 7.app').
     """
-    # Read config file
-    conf = read_pyrekordbox_configuration()
-    if pioneer_install_dir is None and "pioneer-install-dir" in conf:
-        pioneer_install_dir = conf["pioneer-install-dir"]
-    if pioneer_app_dir is None and "pioneer-app-dir" in conf:
-        pioneer_app_dir = conf["pioneer-app-dir"]
-    if not rb5_install_dirname and "rekordbox5-install-dirname" in conf:
-        rb5_install_dirname = conf["rekordbox5-install-dirname"]
-    if not rb6_install_dirname and "rekordbox6-install-dirname" in conf:
-        rb6_install_dirname = conf["rekordbox6-install-dirname"]
-    if not rb7_install_dirname and "rekordbox7-install-dirname" in conf:
-        rb7_install_dirname = conf["rekordbox7-install-dirname"]
-
     # Pioneer installation directory
     try:
         pioneer_install_dir = get_pioneer_install_dir(pioneer_install_dir)

pyrekordbox/db6/database.py

@@ -17,7 +17,7 @@ from sqlalchemy.sql.sqltypes import DateTime, String
 
 from ..anlz import AnlzFile, get_anlz_paths, read_anlz_files  # type: ignore[attr-defined]
 from ..config import get_config
-from ..utils import get_rekordbox_pid
+from ..utils import deobfuscate, get_rekordbox_pid
 from . import tables
 from .aux_files import MasterPlaylistXml
 from .registry import RekordboxAgentRegistry
@@ -33,23 +33,18 @@ except ImportError:  # pragma: no cover
 
     _sqlcipher_available = False
 
-MAX_VERSION = "6.6.5"
 SPECIAL_PLAYLIST_IDS = [
     "100000",  # Cloud Library Sync
     "200000",  # CUE Analysis Playlist
 ]
 
+BLOB = b"PN_Pq^*N>(JYe*u^8;Yg76HuZ<mR13S?=>)b9;DpoTXV(6ItkU`}8*m6tx_I{Solh_N#dfe{v="
+
 logger = logging.getLogger(__name__)
 
 PathLike = Union[str, Path]
 ContentLike = Union[DjmdContent, int, str]
 PlaylistLike = Union[DjmdPlaylist, int, str]
-
-
-class NoCachedKey(Exception):
-    pass
-
-
 T = TypeVar("T", bound=tables.Base)
 
 
@@ -143,24 +138,15 @@ class Rekordbox6Database:
         if unlock:
             if not _sqlcipher_available:  # pragma: no cover
                 raise ImportError("Could not unlock database: 'sqlcipher3' package not found")
+
             if not key:  # pragma: no cover
-                try:
-                    key = rb_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:
+                key = deobfuscate(BLOB)
+            elif not key.startswith("402fd"):
                 # Check if key looks like a valid key
-                if not key.startswith("402fd"):
-                    raise ValueError("The provided database key doesn't look valid!")
+                raise ValueError("The provided database key doesn't look valid!")
 
-            logger.debug("Key: %s", key)
             # Unlock database and create engine
+            logger.debug("Key: %s", key)
             url = f"sqlite+pysqlcipher://:{key}@/{db_path}?"
             engine = create_engine(url, module=sqlite3)
         else:

pyrekordbox/db6/tables.py

@@ -127,21 +127,24 @@ def datetime_to_str(value: datetime) -> str:
 
 def string_to_datetime(value: str) -> datetime:
     try:
+        # Normalize 'Z' (Zulu/UTC) to '+00:00' for fromisoformat compatibility
+        if value.endswith("Z"):
+            value = value[:-1] + "+00:00"
         dt = datetime.fromisoformat(value)
     except ValueError:
         if len(value.strip()) > 23:
-            # Assume the format
-            # "2025-04-12 19:11:29.274 -05:00" or
+            # Handles formats like:
             # "2025-04-12 19:11:29.274 -05:00 (Central Daylight Time)"
             datestr, tzinfo = value[:23], value[23:30]
             datestr = datestr.strip()
             tzinfo = tzinfo.strip()
-            assert re.match(r"^[+-]?\d{1,2}:\d{2}", tzinfo)
-            datestr = datestr.strip() + tzinfo
+            if tzinfo == "Z":
+                tzinfo = "+00:00"
+            assert re.match(r"^[+-]?\d{1,2}:\d{2}", tzinfo), f"Invalid tzinfo: {tzinfo}"
+            datestr = datestr + tzinfo
         else:
-            datestr, tzinfo = value, ""
+            datestr = value.strip()
         dt = datetime.fromisoformat(datestr)
-    # Convert to local timezone and return without timezone
     return dt.astimezone().replace(tzinfo=None)
 
 

pyrekordbox/utils.py

@@ -4,15 +4,19 @@
 
 """This module contains common constants and methods used in other modules."""
 
+import base64
 import os
 import warnings
 import xml.etree.cElementTree as xml
+import zlib
 from xml.dom import minidom
 
 import psutil
 
 warnings.simplefilter("always", DeprecationWarning)
 
+BLOB_KEY = b"657f48f84c437cc1"
+
 
 def warn_deprecated(name: str, new_name: str = "", hint: str = "", remove_in: str = "") -> None:
     s = f"'{name}' is deprecated"
@@ -162,3 +166,19 @@ def pretty_xml(element: xml.Element, indent: str = None, encoding: str = "utf-8"
     # Remove annoying empty lines
     string = "\n".join([line for line in string.splitlines() if line.strip()])
     return string
+
+
+def obfuscate(plaintext: str) -> bytes:
+    """Obfuscates a plaintext string using zlib compression and XOR encryption."""
+    key = BLOB_KEY
+    data = zlib.compress(plaintext.encode("utf-8"))
+    xored = bytes(b ^ key[i % len(key)] for i, b in enumerate(data))
+    return base64.b85encode(xored)  # bytes
+
+
+def deobfuscate(blob: bytes) -> str:
+    """Deobfuscates a previously obfuscated string."""
+    key = BLOB_KEY
+    data = base64.b85decode(blob)
+    xored = bytes(b ^ key[i % len(key)] for i, b in enumerate(data))
+    return zlib.decompress(xored).decode("utf-8")

{pyrekordbox-0.4.3.dist-info → pyrekordbox-0.4.4.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: pyrekordbox
-Version: 0.4.3
+Version: 0.4.4
 Summary: Inofficial Python package for interacting with the library of Pioneers Rekordbox DJ software.
 Author-email: Dylan Jones <dylanljones94@gmail.com>
 License: MIT License
         
-        Copyright (c) 2022-2024, Dylan Jones
+        Copyright (c) 2022-2025, Dylan Jones
         
         Permission is hereby granted, free of charge, to any person obtaining a copy
         of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ Project-URL: Source, https://github.com/dylanljones/pyrekordbox
 Project-URL: Documentation, https://pyrekordbox.readthedocs.io/en/stable/
 Project-URL: Tracker, https://github.com/dylanljones/pyrekordbox/issues
 Platform: any
-Classifier: Development Status :: 3 - Alpha
+Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Information Technology
 Classifier: License :: OSI Approved :: MIT License
@@ -48,14 +48,12 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: bidict>=0.21.0
-Requires-Dist: blowfish>=0.6.0
 Requires-Dist: construct>=2.10.0
 Requires-Dist: numpy>=1.19.0
 Requires-Dist: packaging
 Requires-Dist: psutil>=5.9.0
 Requires-Dist: sqlalchemy>=2.0.0
 Requires-Dist: sqlcipher3-wheels
-Requires-Dist: frida-tools
 Requires-Dist: python-dateutil
 Provides-Extra: test
 Requires-Dist: hypothesis>=6.0.0; extra == "test"
@@ -87,11 +85,9 @@ Pioneers Rekordbox DJ Software. It currently supports
 - Analysis files (ANLZ)
 - My-Setting files
 
-Tested Rekordbox versions: ``5.8.6 | 6.7.7 | 7.0.9``
+Check the [changelog][CHANGELOG] for recent changes!
 
-> [!WARNING]
-> This project is still under development and might contain bugs or have breaking API changes in the future.
-> Check the [changelog][CHANGELOG] for recent changes!
+Tested Rekordbox versions: ``5.8.6 | 6.7.7 | 7.0.9``
 
 
 ## 🔧 Installation
@@ -143,10 +139,6 @@ from pyrekordbox.config import update_config
 update_config("<pioneer_install_dir>", "<pioneer_app_dir>")
 ````
 
-Alternatively the two paths can be specified in a configuration file under the section
-`rekordbox`. Supported configuration files are pyproject.toml, setup.cfg, pyrekordbox.toml,
-pyrekordbox.cfg and pyrekordbox.yaml.
-
 
 ### Rekordbox 6/7 database
 
@@ -193,19 +185,6 @@ So far only a few tables support adding or deleting entries:
 - ``DjmdGenre``: Genres
 - ``DjmdLabel``: Labels
 
-If the automatic key extraction fails the command line interface of ``pyrekordbox``
-provides a command for downloading the key from known sources and writing it to the
-cache file:
-````shell
-python -m pyrekordbox download-key
-````
-Once the key is cached the database can be opened without providing the key.
-The key can also be provided manually:
-````python
-db = Rekordbox6Database(key="<insert key here>")
-````
-
-
 ### Rekordbox XML
 
 The Rekordbox XML database is used for importing (and exporting) Rekordbox collections
@@ -263,9 +242,6 @@ Changing and creating the Rekordbox analysis files is planned as well, but for t
 full structure of the analysis files has to be understood.
 
 Unsupported ANLZ tags:
-  - PCOB
-  - PCO2
-  - PSSI
   - PWV6
   - PWV7
   - PWVC
@@ -317,22 +293,20 @@ instead of opening an issue.
 Pyrekordbox is tested on Windows and MacOS, however some features can't be tested in
 the CI setup since it requires a working Rekordbox installation.
 
+## ♡ Sponsor
+
+If pyrekordbox has helped you or saved you time, consider supporting its development - every coffee makes a difference!
+
+[![BuyMeACoffee](https://raw.githubusercontent.com/pachadotdev/buymeacoffee-badges/main/bmc-white.svg)](https://www.buymeacoffee.com/dylanljones)
+
 
 ## 🔗 Related Projects and References
 
 - [crate-digger]: Java library for fetching and parsing rekordbox exports and track analysis files.
 - [rekordcrate]: Library for parsing Pioneer Rekordbox device exports
 - [supbox]: Get the currently playing track from Rekordbox v6 as Audio Hijack Shoutcast/Icecast metadata, display in your OBS video broadcast or export as JSON.
-- Deep Symmetry has an extensive analysis of Rekordbox's ANLZ and .edb export file formats
+- [Deep Symmetry] has an extensive analysis of Rekordbox's ANLZ and .edb export file formats
   https://djl-analysis.deepsymmetry.org/djl-analysis
-- rekordcrate reverse engineered the format of the Rekordbox MySetting files
-  https://holzhaus.github.io/rekordcrate/rekordcrate/setting/index.html
-- rekordcloud went into detail about the internals of Rekordbox 6
-  https://rekord.cloud/blog/technical-inspection-of-rekordbox-6-and-its-new-internals.
-- supbox has a nice implementation on finding the Rekordbox 6 database key
-  https://github.com/gabek/supbox
-
-
 
 
 [tests-badge]: https://img.shields.io/github/actions/workflow/status/dylanljones/pyrekordbox/tests.yml?branch=master&label=tests&logo=github&style=flat
@@ -379,3 +353,4 @@ the CI setup since it requires a working Rekordbox installation.
 [rekordcrate]: https://github.com/Holzhaus/rekordcrate
 [crate-digger]: https://github.com/Deep-Symmetry/crate-digger
 [supbox]: https://github.com/gabek/supbox
+[Deep Symmetry]: https://deepsymmetry.org/

{pyrekordbox-0.4.3.dist-info → pyrekordbox-0.4.4.dist-info}/RECORD

@@ -1,25 +1,25 @@
 pyrekordbox/__init__.py,sha256=XtHMC6j7c11dxpf2mrXGz8Ux8TJnlIGcGZTwhs6NpVU,664
-pyrekordbox/__main__.py,sha256=ogn1wEOue1RUjGA0BxmgVIphcSCkoM1jZKRND0cAVLA,6016
-pyrekordbox/_version.py,sha256=zJwW9_MgFPmVYNh3YnSsdJ4y2EqGvu1bzYeID1Rrd0A,511
-pyrekordbox/config.py,sha256=q9QTB1T0eMUsUwpo6ro_CcTcSQ1AUhpCFiJhMCaKnQc,28770
+pyrekordbox/__main__.py,sha256=uo_UyoTBXQ-mE3oxe45YWuWH9N2t9HJ5RuzEXQYELVY,4431
+pyrekordbox/_version.py,sha256=ReYqsThJkI0PbGcOHlpeQrPIWshdyOrU6h3QkRk8bHw,704
+pyrekordbox/config.py,sha256=roJEkEoKJ8Nj4OlzyE8NXaxa8riXp1GR2tYZnhS1hxI,16485
 pyrekordbox/logger.py,sha256=dq1BtXBGavuAjuc45mvjF6mOWaeZqZFzo2aBOJdJ0Ik,483
 pyrekordbox/rbxml.py,sha256=rb7bRnr_Bmf3P3bMOh8VDtR2EsVe7E4VYuClLkA-_Lc,46764
-pyrekordbox/utils.py,sha256=h0z2LZ2cI3AlBE9hO-gSXIzOMjIJhYh_5HRlxao61Fg,4500
+pyrekordbox/utils.py,sha256=JGFvmXY7P_Kn1-yvSvWPILpaEVBe_gkNtDH_DWsbIK0,5133
 pyrekordbox/anlz/__init__.py,sha256=1sArQ6P-bxBJFdcnzW4CAN20pNl3YbmDvm-8pQizTZY,3308
-pyrekordbox/anlz/file.py,sha256=Att_2FKK2AiCpV991EyF1DQVRwlGyxfL0YuePAi-qyo,7842
+pyrekordbox/anlz/file.py,sha256=oUYuAjFj7hr1Y0EoAyNsLfk0W4ryqdkdzEEKs25nPF4,7898
 pyrekordbox/anlz/structs.py,sha256=Lt4fkb3SAE8w146eWeWGnpgRoP6jhLMWrSMoMwPjG04,7925
 pyrekordbox/anlz/tags.py,sha256=rlbUAyLc-J5_l4g4xiw59Rl3dW-SClDEb7ZLRXu1xLg,16791
 pyrekordbox/db6/__init__.py,sha256=TZX_BPGZIkc4zSTULIc8yd_bf91MAezGtZevKNh3kZ0,856
 pyrekordbox/db6/aux_files.py,sha256=kKRTj2UWJdHx043MX3-yK5HUWrnxjDNZYBDOHp5Oi14,8726
-pyrekordbox/db6/database.py,sha256=IhYyFixGBX-1MfhlF-HYWozNsUydNGzafMTtio9A5wA,86584
+pyrekordbox/db6/database.py,sha256=CXqhCx4dmyG9yI_QhuPp1tV-Tefmw4UGQ0lek7jsTdk,86111
 pyrekordbox/db6/registry.py,sha256=a7qpCdvoM9EzL8iQIq4WeYDcwgdhMZtM17xOo3uXftk,10617
 pyrekordbox/db6/smartlist.py,sha256=ukQpKmA06iWAfdzS81Vb0g0qaTVnXQ7pgKa28KcMkiY,12300
-pyrekordbox/db6/tables.py,sha256=75SZyWbneArIVYZKAEjVTltm0oKePM5Af0PaMOtAW-8,69140
+pyrekordbox/db6/tables.py,sha256=vKjFsAE49JHnc7470z5T9DJMxBGaIGULgzDNcw2h1UE,69268
 pyrekordbox/mysettings/__init__.py,sha256=czSTZpv8pHYJGbqsNrwxvmpt2zHV1LPEF6f2aVoqpB8,795
 pyrekordbox/mysettings/file.py,sha256=yAPQmkT5eTRyhJJ-7hKLmyw1EzQxrkFueFBmu3jGJSY,13181
 pyrekordbox/mysettings/structs.py,sha256=5Y1F3qTmsP1fRB39_BEHpQVxKx2DO9BytEuJUG_RNcY,8472
-pyrekordbox-0.4.3.dist-info/licenses/LICENSE,sha256=VwG9ZgC2UZnI0gTezGz1qkcAZ7sknBUQ1M62Z2nht54,1074
-pyrekordbox-0.4.3.dist-info/METADATA,sha256=4i4gsSTfTrxxowkb5gNgewVrlC6AXCNdFaKCD_mOguw,15480
-pyrekordbox-0.4.3.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-pyrekordbox-0.4.3.dist-info/top_level.txt,sha256=bUHkyxIHZDgSB6zhYnF1o4Yf1EQlTGGIkVRq9uEtsa4,12
-pyrekordbox-0.4.3.dist-info/RECORD,,
+pyrekordbox-0.4.4.dist-info/licenses/LICENSE,sha256=JfWrNYI7JQpFyPTnZJmttDJqrJLIJKN9qVARn9m9Hyk,1074
+pyrekordbox-0.4.4.dist-info/METADATA,sha256=HYouMIPHbHZEopQN9LgNNIhP12MuBDpH0nzznJ98vaE,14555
+pyrekordbox-0.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyrekordbox-0.4.4.dist-info/top_level.txt,sha256=bUHkyxIHZDgSB6zhYnF1o4Yf1EQlTGGIkVRq9uEtsa4,12
+pyrekordbox-0.4.4.dist-info/RECORD,,

{pyrekordbox-0.4.3.dist-info → pyrekordbox-0.4.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{pyrekordbox-0.4.3.dist-info → pyrekordbox-0.4.4.dist-info}/licenses/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2024, Dylan Jones
+Copyright (c) 2022-2025, Dylan Jones
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal