Skip to content

Merge various prs #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GitGitro wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Merge various prs #169

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6c23d2e
Added an option to set maximum filename length
azumukupoe Jul 10, 2024
e97ba91
Undo edit to a comment.
azumukupoe Jul 10, 2024
175f5ce
Force track_number to be 2 digit values
azumukupoe Jul 10, 2024
a3b1a4c
Changed artist join character to '/'
azumukupoe Jul 5, 2024
a0936bf
Added an option to change artist delimiter character
azumukupoe Jul 6, 2024
475db48
grab and populate total number of tracks
uuupah Jul 4, 2024
d301d8f
move total_tracks under track_number for consistency
uuupah Jul 4, 2024
3a89de3
Allow Spotify URL with country code
May 26, 2024
e1b5d8f
Allow Spotify URLs with country code
May 27, 2024
37d4972
Effective libopus support
Apr 10, 2024
c040fb2
Update track.py
diogosena Apr 5, 2024
20e5e38
Update track.py (fix "bad escape")
saadndm Mar 11, 2024
bf740da
Add {artists} template
D3viantS4ge Jan 23, 2024
e20939d
compile archive file by default
ryansereno Nov 28, 2023
1161ebb
sort playlist tracks by date-added
ryansereno Dec 14, 2023
612039a
reverted
ryansereno Dec 14, 2023
146ffb4
translate comments
GitGitro Aug 1, 2024
76acc6c
Revert "Effective libopus support"
GitGitro Aug 1, 2024
b98e02c
Update track.py
diogosena Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions zotify/track.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,17 @@ def download_track(mode: str, track_id: str, extra_keys=None, disable_progressba

# a song with the same name is installed
if not check_id and check_name:
c = len([file for file in Path(filedir).iterdir() if re.search(f'^{filename}_', str(file))]) + 1

if Zotify.CONFIG.get_skip_existing():
Printer.print(PrintChannel.SKIPS, '\n### SKIPPING: ' + song_name + ' (SONG ALREADY EXISTS) ###' + "\n")
return
Comment thread
GitGitro marked this conversation as resolved.
Outdated
else:
c = len([file for file in Path(filedir).iterdir() if re.search(f'^{filename}_', str(file))]) + 1

fname = PurePath(PurePath(filename).name).parent
ext = PurePath(PurePath(filename).name).suffix
fname = PurePath(filename).stem
ext = PurePath(PurePath(filename).name).suffix

filename = PurePath(filedir).joinpath(f'{fname}_{c}{ext}')
filename = PurePath(filedir).joinpath(f'{fname}_{c}{ext}')

except Exception as e:
Printer.print(PrintChannel.ERRORS, '### SKIPPING SONG - FAILED TO QUERY METADATA ###')
Expand Down Expand Up @@ -284,6 +289,22 @@ def download_track(mode: str, track_id: str, extra_keys=None, disable_progressba

if Zotify.CONFIG.get_bulk_wait_time():
time.sleep(Zotify.CONFIG.get_bulk_wait_time())

# Verifica se o nome da playlist foi fornecido
if extra_keys and 'playlist' in extra_keys:
playlist_file = PurePath(Zotify.CONFIG.get_root_path()).joinpath(extra_keys['playlist'] + '.m3u8')

# Se for o primeiro item da playlist, realiza o truncamento
if extra_keys['playlist_num'].lstrip('0') == '1':
with open(playlist_file, 'w', encoding='utf-8') as f:
f.write("#EXTM3U\n")

# Adiciona o nome do arquivo da música baixada à playlist M3U8
with open(playlist_file, "a", encoding='utf-8') as f:
#f.write("#EXTINF:-1," + urlencode(song_name) + "\n")
#f.write(f"{filename}\n")
f.write(f"{filename.relative_to(PurePath(Zotify.CONFIG.get_root_path()))}\n")

except Exception as e:
Printer.print(PrintChannel.ERRORS, '### SKIPPING: ' + song_name + ' (GENERAL DOWNLOAD ERROR) ###')
Printer.print(PrintChannel.ERRORS, 'Track_ID: ' + str(track_id))
Expand Down