Merge pull request 'fix/caching_signatures' (#32) from fix/caching_signatures into experimental

Reviewed-on: #32

.vscode/settings.json

@@ -24,6 +24,7 @@
         "encyclopaedia",
         "ENDC",
         "Gitea",
+        "isrc",
         "levenshtein",
         "metallum",
         "musify",

development/actual_donwload.py

@@ -6,8 +6,8 @@ logging.getLogger().setLevel(logging.DEBUG)
 
 if __name__ == "__main__":
     commands = [
-        "s: #a Psychonaut 4",
-        "d: 0",
+        "s: #a Crystal F",
+        "d: 20",
     ]
 
     

music_kraken/audio/metadata.py

@@ -1,5 +1,5 @@
 import mutagen
-from mutagen.id3 import ID3, Frame, APIC
+from mutagen.id3 import ID3, Frame, APIC, USLT
 from pathlib import Path
 from typing import List
 import logging
@@ -7,6 +7,7 @@ from PIL import Image
 
 from ..utils.config import logging_settings, main_settings
 from ..objects import Song, Target, Metadata
+from ..objects.metadata import Mapping
 from ..connection import Connection
 
 LOGGER = logging_settings["tagging_logger"]
@@ -105,8 +106,11 @@ def write_metadata_to_target(metadata: Metadata, target: Target, song: Song):
                 data=converted_target.read_bytes(),
             )
         )
-
-        mutagen_file = mutagen.File(target.file_path)
+        id3_object.frames.delall("USLT")
+        uslt_val = metadata.get_id3_value(Mapping.UNSYNCED_LYRICS)
+        id3_object.frames.add(
+            USLT(encoding=3, lang=u'eng', desc=u'desc', text=uslt_val)
+        )
 
     id3_object.add_metadata(metadata)
     id3_object.save()

music_kraken/objects/metadata.py

@@ -92,7 +92,7 @@ class Mapping(Enum):
         key = attribute.value
 
         if key[0] == 'T':
-            # a text fiel
+            # a text field
             return cls.get_text_instance(key, value)
         if key[0] == "W":
             # an url field
@@ -355,7 +355,12 @@ class Metadata:
             return None
 
         list_data = self.id3_dict[field]
-
+        #correct duplications
+        correct_list_data = list()
+        for data in list_data:
+            if data not in correct_list_data:
+                correct_list_data.append(data)
+        list_data = correct_list_data
         # convert for example the time objects to timestamps
         for i, element in enumerate(list_data):
             # for performance’s sake I don't do other checks if it is already the right type
@@ -368,7 +373,7 @@ class Metadata:
             if type(element) == ID3Timestamp:
                 list_data[i] = element.timestamp
                 continue
-
+            
         """
         Version 2.4 of the specification prescribes that all text fields (the fields that start with a T, except for TXXX) can contain multiple values separated by a null character. 
         Thus if above conditions are met, I concatenate the list,
@@ -376,7 +381,7 @@ class Metadata:
         """
         if field.value[0].upper() == "T" and field.value.upper() != "TXXX":
             return self.NULL_BYTE.join(list_data)
-
+        
         return list_data[0]
 
     def get_mutagen_object(self, field):
@@ -395,6 +400,5 @@ class Metadata:
         """
         # set the tagging timestamp to the current time
         self.__setitem__(Mapping.TAGGING_TIME, [ID3Timestamp.now()])
-
         for field in self.id3_dict:
             yield self.get_mutagen_object(field)

music_kraken/objects/parents.py

@@ -301,6 +301,33 @@ class OuterProxy:
 
         return r
 
+    @property
+    def root_collections(self) -> List[Collection]:
+        if len(self.UPWARDS_COLLECTION_STRING_ATTRIBUTES) == 0:
+            return [self]
+
+        r = []
+        for collection_string_attribute in self.UPWARDS_COLLECTION_STRING_ATTRIBUTES:
+            r.extend(self.__getattribute__(collection_string_attribute))
+
+        return r
+
+    def _compile(self, **kwargs):
+        pass
+
+    def compile(self, from_root=False, **kwargs):
+        # compile from the root
+        if not from_root:
+            for c in self.root_collections:
+                c.compile(from_root=True, **kwargs)
+            return
+
+        self._compile(**kwargs)
+
+        for c_attribute in self.DOWNWARDS_COLLECTION_STRING_ATTRIBUTES:
+            for c in self.__getattribute__(c_attribute):
+                c.compile(from_root=True, **kwargs)
+
     TITEL = "id"
     @property
     def title_string(self) -> str:

music_kraken/objects/song.py

@@ -376,6 +376,25 @@ class Album(Base):
             r += f" with {len(self.song_collection)} songs"
         return r
 
+    def _compile(self):
+        self.analyze_implied_album_type()
+        self.update_tracksort()
+
+    def analyze_implied_album_type(self):
+        # if the song collection has only one song, it is reasonable to assume that it is a single
+        if len(self.song_collection) == 1:
+            self.album_type = AlbumType.SINGLE
+            return
+
+        # if the album already has an album type, we don't need to do anything
+        if self.album_type is not AlbumType.OTHER:
+            return
+
+        # for information on EP's I looked at https://www.reddit.com/r/WeAreTheMusicMakers/comments/a354ql/whats_the_cutoff_length_between_ep_and_album/
+        if len(self.song_collection) < 9:
+            self.album_type = AlbumType.EP
+            return
+
     def update_tracksort(self):
         """
         This updates the tracksort attributes, of the songs in
@@ -525,6 +544,9 @@ class Artist(Base):
             self.label_collection.extend(object_list)
             return
 
+    def _compile(self):
+        self.update_albumsort()
+
     def update_albumsort(self):
         """
         This updates the albumsort attributes, of the albums in
@@ -535,9 +557,6 @@ class Artist(Base):
 
         :return:
         """
-        if len(self.main_album_collection) <= 0:
-            return
-
         type_section: Dict[AlbumType, int] = defaultdict(lambda: 2, {
             AlbumType.OTHER: 0,  # if I don't know it, I add it to the first section
             AlbumType.STUDIO_ALBUM: 0,
@@ -580,7 +599,7 @@ class Artist(Base):
             album_list.extend(sections[section_index])
 
         # replace the old collection with the new one
-        self.main_album_collection: Collection = Collection(data=album_list, element_type=Album)
+        self.main_album_collection._data = album_list
 
     INDEX_DEPENDS_ON = ("name", "source_collection", "contact_collection")
     @property

music_kraken/objects/target.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import List, Tuple, TextIO, Union
+from typing import List, Tuple, TextIO, Union, Optional
 import logging
 import random
 import requests
@@ -31,7 +31,10 @@ class Target(OuterProxy):
     }
 
     @classmethod
-    def temp(cls, name: str = str(random.randint(0, HIGHEST_ID))) -> P:
+    def temp(cls, name: str = str(random.randint(0, HIGHEST_ID)), file_extension: Optional[str] = None) -> P:
+        if file_extension is not None:
+            name = f"{name}.{file_extension}"
+
         return cls(main_settings["temp_directory"] / name)
 
     # This is automatically generated

music_kraken/pages/abstract.py

@@ -361,6 +361,7 @@ class Page:
         return download_result
 
     def _download_song(self, song: Song, naming_dict: NamingDict):
+        song.compile()
         if "genre" not in naming_dict and song.genre is not None:
             naming_dict["genre"] = song.genre
 
@@ -381,7 +382,7 @@ class Page:
             song.target_collection.append(new_target)
 
         r = DownloadResult(1)
-        temp_target: Target = Target.temp()
+        temp_target: Target = Target.temp(file_extension=main_settings["audio_format"])
 
         found_on_disc = False
         target: Target

music_kraken/pages/youtube_music/super_youtube.py

@@ -145,6 +145,8 @@ class SuperYouTube(Page):
         _sponsorblock_connection: Connection = Connection()
         self.sponsorblock = python_sponsorblock.SponsorBlock(silent=True, session=_sponsorblock_connection.session)
 
+        super().__init__(*args, **kwargs)
+
     def get_source_type(self, source: Source) -> Optional[Type[DatabaseObject]]:
         _url_type = {
             YouTubeUrlType.CHANNEL: Artist,

music_kraken/pages/youtube_music/youtube_music.py

@@ -193,8 +193,7 @@ class YoutubeMusic(SuperYouTube):
 
         self.start_millis = get_current_millis()
 
-        if self.credentials.api_key == "" or DEBUG_YOUTUBE_INITIALIZING:
-            self._fetch_from_main_page()
+        self._fetch_from_main_page()
 
         SuperYouTube.__init__(self, *args, **kwargs)
 
@@ -215,6 +214,8 @@ class YoutubeMusic(SuperYouTube):
         self.download_values_by_url: dict = {}
         self.not_download: Dict[str, DownloadError] = {}
 
+        super().__init__(*args, **kwargs)
+
     def _fetch_from_main_page(self):
         """
         ===API=KEY===
@@ -736,8 +737,9 @@ class YoutubeMusic(SuperYouTube):
                 raw_headers=True,
                 disable_cache=True,
                 headers=media.get("headers", {}),
-                # chunk_size=media.get("chunk_size", main_settings["chunk_size"]),
+                chunk_size=main_settings["chunk_size"],
                 method="GET",
+                timeout=5,
             )
         else:
             result = DownloadResult(error_message=str(media.get("error") or self.not_download[source.hash_url]))

pyproject.toml

@@ -69,7 +69,7 @@ dependencies = [
     "toml~=0.10.2",
     "typing_extensions~=4.7.1",
 
-    "python-sponsorblock~=0.0.dev1",
+    "python-sponsorblock~=0.1",
     "youtube_dl",
 ]
 dynamic = [