mirrors/streamrip
1
0
Fork 0
mirror of https://github.com/nathom/streamrip.git synced 2025-05-17 16:45:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix #58 and #59

Browse source
This commit is contained in:
nathom 2021-04-20 09:48:39 -07:00
parent d3ba6e027a
commit 2d35001793
4 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -128,12 +128,15 @@ the descriptions of the fields. They can also be found inside the file, which
can be accessed with `rip config --open`. can be accessed with `rip config --open`.
```yaml ```yaml
qobuz: qobuz:
quality: '1: 320kbps MP3, 2: 16/44.1, 3: 24/<=96, 4: 24/>=96' quality: '1: 320kbps MP3, 2: 16/44.1, 3: 24/<=96, 4: 24/>=96'
download_booklets: 'This will download booklet pdfs that are included with some albums'
password: 'This is an md5 hash of the plaintext password'
app_id: 'Do not change' app_id: 'Do not change'
secrets: 'Do not change' secrets: 'Do not change'
tidal: tidal:
quality: '0, 1, 2, or 3' quality: '0: 256kbps AAC, 1: 320kbps AAC, 2: 16/44.1 "HiFi" FLAC, 3: 24/44.1 "MQA" FLAC'
download_videos: 'This will download videos included in Video Albums.'
user_id: 'Do not change any of the fields below' user_id: 'Do not change any of the fields below'
token_expiry: 'Tokens last 1 week after refresh. This is the Unix timestamp of the expiration time.' token_expiry: 'Tokens last 1 week after refresh. This is the Unix timestamp of the expiration time.'
deezer: "Deezer doesn't require login" deezer: "Deezer doesn't require login"
@ -163,6 +166,7 @@ qobuz:
lastfm: 'Last.fm playlists are downloaded by searching for the titles of the tracks' lastfm: 'Last.fm playlists are downloaded by searching for the titles of the tracks'
source: 'The source on which to search for the tracks.' source: 'The source on which to search for the tracks.'
concurrent_downloads: 'Download (and convert) tracks all at once, instead of sequentially. If you are converting the tracks, and/or have fast internet, this will substantially improve processing speed.' concurrent_downloads: 'Download (and convert) tracks all at once, instead of sequentially. If you are converting the tracks, and/or have fast internet, this will substantially improve processing speed.'
``` ```

1
streamrip/clients.py
View file

@ -13,6 +13,7 @@ from .constants import (
AGENT, AGENT,
AVAILABLE_QUALITY_IDS, AVAILABLE_QUALITY_IDS,
DEEZER_BASE, DEEZER_BASE,
DEEZER_DL,
DEEZER_MAX_Q, DEEZER_MAX_Q,
QOBUZ_BASE, QOBUZ_BASE,
QOBUZ_FEATURED_KEYS, QOBUZ_FEATURED_KEYS,

2
streamrip/config.py
View file

@ -3,7 +3,6 @@ import copy
import logging import logging
import os import os
import re import re
from functools import cache
from pprint import pformat from pprint import pformat
from ruamel.yaml import YAML from ruamel.yaml import YAML
@ -310,7 +309,6 @@ class ConfigDocumentation:
# key, doc pairs are unique # key, doc pairs are unique
self.docs.remove(to_remove) self.docs.remove(to_remove)
@cache
def _get_key_regex(self, spaces, key): def _get_key_regex(self, spaces, key):
regex = rf"{spaces}{key}:(?:$|\s+?(.+))" regex = rf"{spaces}{key}:(?:$|\s+?(.+))"
return re.compile(regex) return re.compile(regex)

2
streamrip/metadata.py
View file

@ -333,6 +333,8 @@ class TrackMetadata:
if self.__source == "qobuz": if self.__source == "qobuz":
genres = re.findall(r"([^\u2192\/]+)", "/".join(self._genres)) genres = re.findall(r"([^\u2192\/]+)", "/".join(self._genres))
genres = set(genres) genres = set(genres)
elif self.__source == 'deezer':
genres = ', '.join(g['name'] for g in self._genres)
return ", ".join(genres) return ", ".join(genres)