Compare commits
No commits in common. "2bf362c696ee905e72edcc05c476ef98a63a8866" and "72531f0bee9eafe7f8cf259b8f8a54afc723ab3f" have entirely different histories.
2bf362c696
...
72531f0bee
@ -72,7 +72,7 @@ def write_metadata_to_target(metadata: Metadata, target: Target, song: Song):
|
||||
|
||||
r = artwork_connection.get(
|
||||
url=best_variant["url"],
|
||||
name=song.artwork.get_variant_name(best_variant),
|
||||
name=song.artwork.get_variant_name(best_variant, song.option_string),
|
||||
)
|
||||
|
||||
temp_target: Target = Target.temp()
|
||||
|
@ -194,7 +194,7 @@ class Connection:
|
||||
additional_info = cached.attribute.additional_info
|
||||
|
||||
body = cached.content
|
||||
if additional_info.get("encoding", None) is not None:
|
||||
if "encoding" in additional_info:
|
||||
body = body.decode(additional_info["encoding"])
|
||||
|
||||
resp.add(
|
||||
|
@ -8,7 +8,7 @@ from .metadata import (
|
||||
ID3Timestamp,
|
||||
Metadata
|
||||
)
|
||||
from ..utils.string_processing import unify, hash_url
|
||||
from ..utils.string_processing import unify, hash_url, hash_url
|
||||
|
||||
from .parents import OuterProxy as Base
|
||||
|
||||
@ -50,8 +50,8 @@ class Artwork:
|
||||
return None
|
||||
return min(self._variant_mapping.values(), key=lambda x: x["deviation"])
|
||||
|
||||
def get_variant_name(self, variant: ArtworkVariant) -> str:
|
||||
return f"artwork_{variant['width']}x{variant['height']}_{hash_url(variant['url']).replace('/', '_')}"
|
||||
def get_variant_name(self, variant: ArtworkVariant, option_string: str) -> str:
|
||||
return f"artwork_{variant['width']}x{variant['height']}_{option_string}"
|
||||
|
||||
def __merge__(self, other: Artwork, override: bool = False) -> None:
|
||||
for key, value in other._variant_mapping.items():
|
||||
|
Loading…
Reference in New Issue
Block a user