development/actual_donwload.py

@@ -1,13 +1,15 @@
-import logging
-
 import music_kraken
 
+import logging
 print("Setting logging-level to DEBUG")
 logging.getLogger().setLevel(logging.DEBUG)
 
 if __name__ == "__main__":
     commands = [
-        "s: #a Ghost Bath",
+        "s: #a Crystal F",
+        "10",
+        "1",
+        "3",
     ]
 
     

music_kraken/audio/metadata.py

@@ -107,7 +107,7 @@ def write_metadata_to_target(metadata: Metadata, target: Target, song: Song):
                 mime="image/jpeg",
                 type=3,
                 desc=u"Cover",
-                data=converted_target.raw_content,
+                data=converted_target.read_bytes(),
             )
         )
         id3_object.frames.delall("USLT")

music_kraken/connection/connection.py

@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-import copy
-import inspect
 import logging
 import threading
 import time
-from typing import TYPE_CHECKING, Dict, List, Optional, Set
-from urllib.parse import ParseResult, urlparse, urlunsplit
+from typing import List, Dict, Optional, Set
+from urllib.parse import urlparse, urlunsplit, ParseResult
+import copy
+import inspect
 
 import requests
 import responses
@@ -14,15 +14,12 @@ from tqdm import tqdm
 
 from .cache import Cache
 from .rotating import RotatingProxy
-
-if TYPE_CHECKING:
-    from ..objects import Target
-
+from ..objects import Target
 from ..utils import request_trace
-from ..utils.config import main_settings
-from ..utils.hacking import merge_args
 from ..utils.string_processing import shorten_display_url
+from ..utils.config import main_settings
 from ..utils.support_classes.download_result import DownloadResult
+from ..utils.hacking import merge_args
 
 
 class Connection:

music_kraken/objects/artwork.py

@@ -2,10 +2,8 @@ from __future__ import annotations
 
 from copy import copy
 from dataclasses import dataclass, field
-from functools import cached_property
 from typing import Dict, List, Optional, Set, Tuple, Type, TypedDict, Union
 
-from ..connection import Connection
 from ..utils import create_dataclass_instance, custom_hash
 from ..utils.config import main_settings
 from ..utils.enums import PictureType
@@ -15,9 +13,6 @@ from .metadata import ID3Timestamp
 from .metadata import Mapping as id3Mapping
 from .metadata import Metadata
 from .parents import OuterProxy as Base
-from .target import Target
-
-artwork_connection: Connection = Connection(module="artwork")
 
 
 @dataclass
@@ -25,7 +20,7 @@ class ArtworkVariant:
     url: str
     width: Optional[int] = None
     height: Optional[int] = None
-    image_format: Optional[str] = None
+    image_format: Optional[str] = ""
 
     def __hash__(self) -> int:
         return custom_hash(self.url)
@@ -36,26 +31,6 @@ class ArtworkVariant:
     def __contains__(self, other: str) -> bool:
         return custom_hash(other) == hash(self.url)
 
-    def __merge__(self, other: ArtworkVariant) -> None:
-        for key, value in other.__dict__.items():
-            if value is None:
-                continue
-
-            if getattr(self, key) is None:
-                setattr(self, key, value)
-
-    @cached_property
-    def target(self) -> Target:
-        return Target.temp()
-
-    def fetch(self) -> None:
-        global artwork_connection
-
-        r = artwork_connection.get(self.url, name=hash_url(url))
-        if r is None:
-            return
-
-        self.target.raw_content = r.content
 
 @dataclass
 class Artwork:
@@ -80,9 +55,10 @@ class Artwork:
         variant = self.search_variant(kwargs.get("url"))
 
         if variant is None:
-            variant, kwargs = create_dataclass_instance(ArtworkVariant, kwargs)
+            variant, kwargs = create_dataclass_instance(ArtworkVariant, **kwargs)
             self.variants.append(variant)
 
+        variant.url = url
         variant.__dict__.update(kwargs)
 
     @property
@@ -91,10 +67,6 @@ class Artwork:
             return None
         return self.variants[0].url
 
-    def fetch(self) -> None:
-        for variant in self.variants:
-            variant.fetch()
-
 
 class ArtworkCollection:
     """
@@ -119,6 +91,8 @@ class ArtworkCollection:
         self._data = []
         self.extend(data)
 
+       
+
     def search_artwork(self, url: str) -> Optional[ArtworkVariant]:
         for artwork in self._data:
             if url in artwork:
@@ -132,19 +106,18 @@ class ArtworkCollection:
     def _create_new_artwork(self, **kwargs) -> Tuple[Artwork, dict]:
         kwargs["artwork_type"] = kwargs.get("artwork_type", self.artwork_type)
 
-        return create_dataclass_instance(Artwork, dict(**kwargs))
+        return create_dataclass_instance(ArtworkVariant, dict(**kwargs))
 
-    def add_data(self, url: str, **kwargs) -> Artwork:
+    def add_data(self, url: str, **kwargs) -> None:
         kwargs["url"] = url
 
         artwork = self.search_artwork(url)
 
         if artwork is None:
-            artwork, kwargs = self._create_new_artwork(**kwargs)
+            artwork, kwargs = self._create_new_artwork(url=url)
             self._data.append(artwork)
 
-        artwork.add_data(**kwargs)
-        return artwork
+        artwork.add_data(url, **kwargs)
 
     def append(self, value: Union[Artwork, ArtworkVariant, dict], **kwargs):
         """
@@ -172,7 +145,9 @@ class ArtworkCollection:
         This will make the artworks ready for download
         """
         for artwork in self._data:
-            artwork.fetch()
+            for variants in artwork.variants:
+                pass
+        pass
 
     def __merge__(self, other: ArtworkCollection, **kwargs) -> None:
         self.parent_artworks.update(other.parent_artworks)

music_kraken/objects/target.py

@@ -1,17 +1,17 @@
 from __future__ import annotations
 
+from pathlib import Path
+from typing import List, Tuple, TextIO, Union, Optional
 import logging
 import random
-from pathlib import Path
-from typing import List, Optional, TextIO, Tuple, Union
-
 import requests
 from tqdm import tqdm
 
-from ..utils.config import logging_settings, main_settings
-from ..utils.shared import HIGHEST_ID
-from ..utils.string_processing import fit_to_file_system
 from .parents import OuterProxy
+from ..utils.shared import HIGHEST_ID
+from ..utils.config import main_settings, logging_settings
+from ..utils.string_processing import fit_to_file_system
+
 
 LOGGER = logging.getLogger("target")
 
@@ -117,11 +117,3 @@ class Target(OuterProxy):
 
     def read_bytes(self) -> bytes:
         return self.file_path.read_bytes()
-
-    @property
-    def raw_content(self) -> bytes:
-        return self.file_path.read_bytes()
-
-    @raw_content.setter
-    def raw_content(self, content: bytes):
-        self.file_path.write_bytes(content)

music_kraken/utils/__init__.py

@@ -156,7 +156,6 @@ def create_dataclass_instance(t, data: dict):
         Tuple[Type, dict]: The created instance and a dict, containing the data, which was not used in the creation
     """
     
-    needed_data = {k: v for k, v in data.items() if k in t.__dataclass_fields__}
-    removed_data = {k: v for k, v in data.items() if k not in t.__dataclass_fields__}
-
-    return t(**needed_data), removed_data
+    data = {k: v for k, v in data.items() if hasattr(t, k)}
+    removed_data = {k: v for k, v in data.items() if not hasattr(t, k)}
+    return t(**data), removed_data

music_kraken/utils/string_processing.py

@@ -1,4 +1,3 @@
-import re
 import string
 from functools import lru_cache
 from pathlib import Path
@@ -238,6 +237,5 @@ def is_url(value: Any) -> bool:
     
     if not isinstance(value, str):
         return True
-        
-    # value has to be a string
-    return re.match(URL_PATTERN, value) is not None
+
+    return re.match(URL_PATTERN, query) is not None