pyrekordbox 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

pyrekordbox/__main__.py

@@ -9,7 +9,7 @@ import sys
 import urllib.request
 from pathlib import Path
 
-from pyrekordbox.config import _cache_file, write_db6_key_cache
+from pyrekordbox.config import get_cache_file, write_db6_key_cache
 
 KEY_SOURCES = [
     {
@@ -144,7 +144,8 @@ def download_db6_key():
             dp = match.group("dp")
             break
     if dp:
-        print(f"Found key, updating cache file {_cache_file}")
+        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.")

pyrekordbox/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.4.1'
-__version_tuple__ = version_tuple = (0, 4, 1)
+__version__ = version = '0.4.2'
+__version_tuple__ = version_tuple = (0, 4, 2)

pyrekordbox/config.py

@@ -67,6 +67,10 @@ def get_appdata_dir() -> Path:
     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.
 
@@ -477,7 +481,7 @@ def write_db6_key_cache(key: str) -> None:  # pragma: no cover
     lines.append("dp: " + key)
     text = "\n".join(lines)
 
-    cache_file = get_appdata_dir() / "pyrekordbox" / _cache_file_name
+    cache_file = get_cache_file()
     if not cache_file.parent.exists():
         cache_file.parent.mkdir()
 
@@ -494,7 +498,7 @@ def _update_sqlite_key(opts, conf):
     cache_version = 0
     pw, dp = "", ""
 
-    cache_file = get_appdata_dir() / "pyrekordbox" / _cache_file_name
+    cache_file = get_cache_file()
 
     if cache_file.exists():  # pragma: no cover
         logger.debug("Found cache file %s", cache_file)

pyrekordbox/db6/database.py

@@ -27,7 +27,7 @@ try:
     from sqlcipher3 import dbapi2 as sqlite3  # noqa
 
     _sqlcipher_available = True
-except ImportError:
+except ImportError:  # pragma: no cover
     import sqlite3
 
     _sqlcipher_available = False
@@ -125,9 +125,9 @@ class Rekordbox6Database:
             raise FileNotFoundError(f"File '{path}' does not exist!")
         # Open database
         if unlock:
-            if not _sqlcipher_available:
+            if not _sqlcipher_available:  # pragma: no cover
                 raise ImportError("Could not unlock database: 'sqlcipher3' package not found")
-            if not key:
+            if not key:  # pragma: no cover
                 try:
                     key = rb_config["dp"]
                 except KeyError:

pyrekordbox/db6/tables.py

@@ -207,14 +207,14 @@ class Base(DeclarativeBase):
         return [column.key for column in inspect(cls).relationships]  # noqa
 
     @classmethod
-    def __get_keys__(cls):
+    def __get_keys__(cls):  # pragma: no cover
         """Get all attributes of the table."""
         items = cls.__dict__.items()
         keys = [k for k, v in items if not callable(v) and not k.startswith("_")]
         return keys
 
     @classmethod
-    def keys(cls):
+    def keys(cls):  # pragma: no cover
         """Returns a list of all column names including the relationships."""
         if not cls.__keys__:  # Cache the keys
             cls.__keys__ = cls.__get_keys__()
@@ -248,7 +248,7 @@ class Base(DeclarativeBase):
         """Returns a dictionary of all column names and values."""
         return {key: self.__getitem__(key) for key in self.columns()}
 
-    def pformat(self, indent="   "):
+    def pformat(self, indent="   "):  # pragma: no cover
         lines = [f"{self.__tablename__}"]
         columns = self.columns()
         w = max(len(col) for col in columns)

pyrekordbox/rbxml.py

@@ -1042,13 +1042,14 @@ class RekordboxXml:
         >>> track = file.get_track(TrackID=1)
 
         """
-        if index is None and TrackID is None:
-            raise ValueError("Either index or TrackID has to be specified!")
+        if index is None and TrackID is None and Location is None:
+            raise ValueError("Either index, TrackID or Location has to be specified!")
 
         if TrackID is not None:
             el = self._collection.find(f'.//{Track.TAG}[@TrackID="{TrackID}"]')
         elif Location is not None:
-            el = self._collection.find(f'.//{Track.TAG}[@Location="{Location}"]')
+            encoded = encode_path(Location)
+            el = self._collection.find(f'.//{Track.TAG}[@Location="{encoded}"]')
         else:
             el = self._collection.find(f".//{Track.TAG}[{index + 1}]")
         return Track(element=el)
@@ -1091,10 +1092,10 @@ class RekordboxXml:
             node = node.get_playlist(name)
         return node
 
-    def _update_track_count(self):
-        """Updates the track count element."""
-        num_tracks = len(self._collection.findall(f".//{Track.TAG}"))
-        self._collection.attrib["Entries"] = str(num_tracks)
+    # def _update_track_count(self):
+    #     """Updates the track count element."""
+    #     num_tracks = len(self._collection.findall(f".//{Track.TAG}"))
+    #     self._collection.attrib["Entries"] = str(num_tracks)
 
     def _increment_track_count(self):
         """Increment the track count element."""

{pyrekordbox-0.4.1.dist-info → pyrekordbox-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrekordbox
-Version: 0.4.1
+Version: 0.4.2
 Summary: Inofficial Python package for interacting with the library of Pioneers Rekordbox DJ software.
 Author-email: Dylan Jones <dylanljones94@gmail.com>
 License: MIT License

{pyrekordbox-0.4.1.dist-info → pyrekordbox-0.4.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pyrekordbox/__init__.py,sha256=hvg2dB7qhgGB6SmcRg8AION6mTGdlsThdHhsDZ9WYfs,622
-pyrekordbox/__main__.py,sha256=BtyDwVSGyoURY9Cy004vRL5Tgkwt4F7eXX_GD_vVYNQ,5976
-pyrekordbox/_version.py,sha256=yF2DwGUoQKNnLhAbpZX8kCQKjw77EZzhRk7_OTftets,511
-pyrekordbox/config.py,sha256=TTrL2bOo9DDKSW2yys8axaLB2GHhhD8VL7vq4dJxi1A,28309
+pyrekordbox/__main__.py,sha256=ogn1wEOue1RUjGA0BxmgVIphcSCkoM1jZKRND0cAVLA,6016
+pyrekordbox/_version.py,sha256=_F8vLxUxrAtC2alXNPGVa9l3P6_vLpQAzemS6QlnPGQ,511
+pyrekordbox/config.py,sha256=yKRE0N_YU68kek-7bz0vouTgoQOVMXGKLZA21ydePd0,28333
 pyrekordbox/logger.py,sha256=dq1BtXBGavuAjuc45mvjF6mOWaeZqZFzo2aBOJdJ0Ik,483
-pyrekordbox/rbxml.py,sha256=UqATygpuOVGlSYj0nzcHSmDjTeQ9EL5AVLhAxS523F4,38340
+pyrekordbox/rbxml.py,sha256=4qx7YX2UegsYQ2ETfqR-Qyus-8jQ89mer1YjEvq1WtQ,38422
 pyrekordbox/utils.py,sha256=hkYIgG5U4rzl2tjN9ESzLnf8OysEFybRQgmr6J7xq-k,4363
 pyrekordbox/anlz/__init__.py,sha256=SEVY0oPX9ohCVViUbsoOLTrBrFewTh-61qJxwXgAJKg,3155
 pyrekordbox/anlz/file.py,sha256=F6axHmprnp0j3pZkqmmp5iiJBUpqtWiAhSzlAJp2H6Y,6951
@@ -11,15 +11,15 @@ pyrekordbox/anlz/structs.py,sha256=Lt4fkb3SAE8w146eWeWGnpgRoP6jhLMWrSMoMwPjG04,7
 pyrekordbox/anlz/tags.py,sha256=nlPBKyRB8Z9J69bX2K8ZPQk_g1tMazKeVf2ViAqMX-c,13947
 pyrekordbox/db6/__init__.py,sha256=TZX_BPGZIkc4zSTULIc8yd_bf91MAezGtZevKNh3kZ0,856
 pyrekordbox/db6/aux_files.py,sha256=MehdQSc4iryiHvH8RfE9_9xMnD5qjRRDhTo0o0KRLw0,7592
-pyrekordbox/db6/database.py,sha256=2FTwVZOx8pSLLRr9ZV_95TUUtCfPo3CSLKYyudBN8-o,80678
+pyrekordbox/db6/database.py,sha256=IHEEg8X3BiQF2MMfvYg36BvL6yqYY_jpCO-ysP8tU3Q,80738
 pyrekordbox/db6/registry.py,sha256=zYq_B7INM97de7vUTxqmA4N_P53loDkBkYdzdoeSnvY,9725
 pyrekordbox/db6/smartlist.py,sha256=GG6jE0BHMtx0RHgiVRpWYuL-Ex5edTNSLSDQNiCGzK0,12170
-pyrekordbox/db6/tables.py,sha256=EST6wvsJjlwmVB8JWBLMKbW3Mskk5qAo-xBqB09Q-Hg,68479
+pyrekordbox/db6/tables.py,sha256=rQZ1qtJBtxiSrvmqGQEG61um5sf6UL5GeppFKO2p_zo,68539
 pyrekordbox/mysettings/__init__.py,sha256=6iLTQ1KIjuoq8Zt3thmkjqJSxrRVIi7BrQpxNcsQK04,706
 pyrekordbox/mysettings/file.py,sha256=JBfVe3jsmah_mGJjyC20_EqJZyJ7ftcOcCkRDKcWgv0,12671
 pyrekordbox/mysettings/structs.py,sha256=5Y1F3qTmsP1fRB39_BEHpQVxKx2DO9BytEuJUG_RNcY,8472
-pyrekordbox-0.4.1.dist-info/licenses/LICENSE,sha256=VwG9ZgC2UZnI0gTezGz1qkcAZ7sknBUQ1M62Z2nht54,1074
-pyrekordbox-0.4.1.dist-info/METADATA,sha256=q8KLPyfFte6I8cpdZai6LN8Kck8LI1E4rNZs947nnSY,15480
-pyrekordbox-0.4.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-pyrekordbox-0.4.1.dist-info/top_level.txt,sha256=bUHkyxIHZDgSB6zhYnF1o4Yf1EQlTGGIkVRq9uEtsa4,12
-pyrekordbox-0.4.1.dist-info/RECORD,,
+pyrekordbox-0.4.2.dist-info/licenses/LICENSE,sha256=VwG9ZgC2UZnI0gTezGz1qkcAZ7sknBUQ1M62Z2nht54,1074
+pyrekordbox-0.4.2.dist-info/METADATA,sha256=XhI0TjehrWsupNOK1AEQcomb29sE2ydlb2wuU9WEXQ0,15480
+pyrekordbox-0.4.2.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+pyrekordbox-0.4.2.dist-info/top_level.txt,sha256=bUHkyxIHZDgSB6zhYnF1o4Yf1EQlTGGIkVRq9uEtsa4,12
+pyrekordbox-0.4.2.dist-info/RECORD,,