music-kraken/music-kraken-core
3
2
Fork 0
Code Issues 10 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

fix: properly stored encoding now

Browse Source
This commit is contained in:
Hazel 2024-04-26 14:24:14 +02:00
parent 25eceb727b
commit f52b5e6325
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/actual_donwload.py
View File

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

4
music_kraken/connection/cache.py
View File

@ -57,6 +57,7 @@ class Cache:
self._time_fields = {"created", "expires"} self._time_fields = {"created", "expires"}
with self.index.open("r") as i: with self.index.open("r") as i:
try:
for c in json.loads(i.read()): for c in json.loads(i.read()):
for key in self._time_fields: for key in self._time_fields:
c[key] = datetime.fromisoformat(c[key]) c[key] = datetime.fromisoformat(c[key])
@ -64,6 +65,8 @@ class Cache:
ca = CacheAttribute(**c) ca = CacheAttribute(**c)
self.cached_attributes.append(ca) self.cached_attributes.append(ca)
self._id_to_attribute[ca.id] = ca self._id_to_attribute[ca.id] = ca
except json.JSONDecodeError:
pass
@lru_cache() @lru_cache()
def _init_module(self, module: str) -> Path: def _init_module(self, module: str) -> Path:
@ -129,6 +132,7 @@ class Cache:
name=name, name=name,
created=datetime.now(), created=datetime.now(),
expires=datetime.now() + timedelta(days=expires_in), expires=datetime.now() + timedelta(days=expires_in),
additional_info=additional_info,
) )
self._write_attribute(cache_attribute) self._write_attribute(cache_attribute)

8
music_kraken/connection/connection.py
View File

@ -134,7 +134,7 @@ class Connection:
return return
self.cache.set(r.content, name, expires_in=kwargs.get("expires_in", self.cache_expiring_duration), additional_info={ self.cache.set(r.content, name, expires_in=kwargs.get("expires_in", self.cache_expiring_duration), additional_info={
"encoding", r.encoding, "encoding": r.encoding,
}, **n_kwargs) }, **n_kwargs)
def request( def request(
@ -191,9 +191,11 @@ class Connection:
request_trace(f"{trace_string}\t[cached]") request_trace(f"{trace_string}\t[cached]")
with responses.RequestsMock() as resp: with responses.RequestsMock() as resp:
additional_info = cached.attribute.additional_info
body = cached.content body = cached.content
if "encoding" in cached.additional_info: if "encoding" in additional_info:
body = body.decode(cached.additional_info["encoding"]) body = body.decode(additional_info["encoding"])
resp.add( resp.add(
method=method, method=method,

2
music_kraken/pages/abstract.py
View File

@ -451,7 +451,7 @@ class Page:
source = sources[0] source = sources[0]
if not found_on_disc: if not found_on_disc:
r = self.download_song_to_target(source=source, target=temp_target, desc=song.title) r = self.download_song_to_target(source=source, target=temp_target, desc=song.option_string)
if not r.is_fatal_error: if not r.is_fatal_error:
r.merge(self._post_process_targets(song, temp_target, r.merge(self._post_process_targets(song, temp_target,

2
music_kraken/pages/musify.py
View File

@ -1128,4 +1128,4 @@ class Musify(Page):
self.LOGGER.warning(f"The source has no audio link. Falling back to {endpoint}.") self.LOGGER.warning(f"The source has no audio link. Falling back to {endpoint}.")
return self.stream_connection.stream_into(endpoint, target, raw_url=True, exclude_headers=["Host"]) return self.stream_connection.stream_into(endpoint, target, raw_url=True, exclude_headers=["Host"], name=desc)