Skip to content

Commit 2b33f65

Browse files
committed
Merge remote-tracking branch 'azumukupoe/artistdelimiter'
2 parents 1da4e02 + 47b2c4f commit 2b33f65

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Set arguments in the commandline like this: `-sc False` or `--codec mp3`. Wrap a
9393
| `MD_SAVE_GENRES` | `--md-save-genres` | False | Whether genres should be saved in metadata |
9494
| `MD_ALLGENRES` | `--md-allgenres` | False | Save all relevant genres in metadata |
9595
| `MD_GENREDELIMITER` | `--md-genredelimiter` | , | Delimiter character used to split genres in metadata |
96+
| `MD_ARTISTDELIMITER` | `--md-artistdelimiter` | , | Delimiter character used to split artists in metadata |
9697
| `SKIP_EXISTING_FILES` | `-ie`, `--skip-existing` | True | Skip songs with the same name |
9798
| `SKIP_PREVIOUSLY_DOWNLOADED` | `-ip`, `--skip-previously-downloaded` | False | Use the global song_archive file to skip previously downloaded songs |
9899
| `RETRY_ATTEMPTS` | `--retry-attempts` | 1 | Number of times Zotify will retry a failed request |

zotify/config.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
MD_SAVE_GENRES = 'MD_SAVE_GENRES'
3333
MD_ALLGENRES = 'MD_ALLGENRES'
3434
MD_GENREDELIMITER = 'MD_GENREDELIMITER'
35+
MD_ARTISTDELIMITER = 'MD_ARTISTDELIMITER'
3536
PRINT_PROGRESS_INFO = 'PRINT_PROGRESS_INFO'
3637
PRINT_WARNINGS = 'PRINT_WARNINGS'
3738
RETRY_ATTEMPTS = 'RETRY_ATTEMPTS'
@@ -91,7 +92,8 @@
9192
MD_DISC_TRACK_TOTALS: { 'default': 'True', 'type': bool, 'arg': ('--md-disc-track-totals' ,) },
9293
MD_SAVE_GENRES: { 'default': 'False', 'type': bool, 'arg': ('--md-save-genres' ,) },
9394
MD_ALLGENRES: { 'default': 'False', 'type': bool, 'arg': ('--md-allgenres' ,) },
94-
MD_GENREDELIMITER: { 'default': ',', 'type': str, 'arg': ('--md-genredelimiter' ,) },
95+
MD_GENREDELIMITER: { 'default': ', ', 'type': str, 'arg': ('--md-genredelimiter' ,) },
96+
MD_ARTISTDELIMITER: { 'default': ', ', 'type': str, 'arg': ('--md-artistdelimiter' ,) },
9597
SKIP_EXISTING: { 'default': 'True', 'type': bool, 'arg': ('-ie', '--skip-existing' ,) },
9698
SKIP_PREVIOUSLY_DOWNLOADED: { 'default': 'False', 'type': bool, 'arg': ('-ip', '--skip-previously-downloaded' ,) },
9799
RETRY_ATTEMPTS: { 'default': '1', 'type': int, 'arg': ('--retry-attempts' ,) },
@@ -327,6 +329,10 @@ def get_all_genres(cls) -> bool:
327329
def get_all_genres_delimiter(cls) -> bool:
328330
return cls.get(MD_GENREDELIMITER)
329331

332+
@classmethod
333+
def get_artist_delimiter(cls) -> bool:
334+
return cls.get(MD_ARTISTDELIMITER)
335+
330336
@classmethod
331337
def get_output(cls, mode: str) -> str:
332338
v = cls.get(OUTPUT)

zotify/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ def set_audio_tags(filename, artists, genres, name, album_name, album_artist, re
194194

195195
def conv_artist_format(artists) -> str:
196196
""" Returns converted artist format """
197-
return ', '.join(artists)
197+
return Zotify.CONFIG.get_artist_delimiter().join(artists)
198198

199199

200200
def set_music_thumbnail(filename: PurePath, image_url, mode: str) -> None:

0 commit comments

Comments
 (0)