zotify-dev/zotify
1
0
Fork 0
Code Issues 199 Pull requests 18 Projects Releases Packages Wiki Activity Actions

Merge various prs #169

Open
GitGitro wants to merge 19 commits from GitGitro/main into main
pull from: GitGitro/main
merge into: zotify-dev:main
Conversation 5 Commits 19 Files changed 6 +87 -24
GitGitro commented 2024-08-01 11:37:32 -04:00 (Migrated from github.com)
Copy link

Hi! i've merged various pull requests in order to bring the project a bit up to date and fix some bugs

all credits are in the commits as i have cherry-picked but here are the authors:
@azumukupoe
@uuupah
@diogosena
@D3viantS4ge
@ryansereno

this fixes:
#131 #32 #74 #64 #65 #38 #25 #24

Hi! i've merged various pull requests in order to bring the project a bit up to date and fix some bugs all credits are in the commits as i have cherry-picked but here are the authors: @azumukupoe @uuupah @diogosena @D3viantS4ge @ryansereno this fixes: #131 #32 #74 #64 #65 #38 #25 #24
🚀 2
diogosena commented 2024-08-01 14:53:31 -04:00 (Migrated from github.com)
Copy link

Please include this commit diogosena/zotify@d3eea11be3

Please include this commit https://github.com/diogosena/zotify/commit/d3eea11be3865a83017b24818ba0f240201fdfb5
diogosena (Migrated from github.com) reviewed 2024-08-01 15:35:34 -04:00
zotify/track.py
diogosena (Migrated from github.com) commented 2024-08-01 15:35:34 -04:00
Copy link

this is fixed in commit diogosena/zotify@d3eea11be3

this is fixed in commit https://github.com/diogosena/zotify/commit/d3eea11be3865a83017b24818ba0f240201fdfb5
GitGitro (Migrated from github.com) reviewed 2024-08-01 16:01:14 -04:00
zotify/track.py
GitGitro (Migrated from github.com) commented 2024-08-01 16:01:14 -04:00
Copy link

Added, thank you!

Added, thank you!
D3viantS4ge (Migrated from github.com) reviewed 2024-08-03 14:03:11 -04:00
zotify/track.py
D3viantS4ge (Migrated from github.com) commented 2024-08-03 14:03:11 -04:00
Copy link

Perhaps the delimiter should be configurable via --md-artistdelimiter?

Perhaps the delimiter should be configurable via `--md-artistdelimiter`?
thegreatestgiant commented 2024-11-17 09:19:31 -05:00 (Migrated from github.com)
Copy link

@GitGitro I used your version and whenever it comes across a song that I already have in my playlist, it downloads it again but adds a _1

###   SKIPPING: Panic! At The Disco - Girls _ Girls _ Boys (SONG ALREADY EXISTS)   ###

Panic! At The Disco - Girls _ Girls _ Boys: 100%|████████████████████████████████████████████████████████████████▉| 3.52M/3.53M [00:21<00:00, 169kB/s]
                                                                                                                                                      ###   Downloaded "Panic! At The Disco - Girls _ Girls _ Boys" to "Creative title/Panic! At The Disco - Girls _ Girls _ Boys_1.ogg" in 21s (plus 5s converting)   ###

                                                                                                                                                      
###   SKIPPING: Panic! At The Disco - The Ballad of Mona Lisa (SONG ALREADY EXISTS)   ###

Panic! At The Disco - The Ballad of Mona Lisa: 100%|█████████████████████████████████████████████████████████████▉| 3.92M/3.92M [00:26<00:00, 156kB/s]
                                                                                                                                                      ###   Downloaded "Panic! At The Disco - The Ballad of Mona Lisa" to "Creative title/Panic! At The Disco - The Ballad of Mona Lisa_1.ogg" in 26s (plus 3s converting)   ###
@GitGitro I used your version and whenever it comes across a song that I already have in my playlist, it downloads it again but adds a _1 ``` ### SKIPPING: Panic! At The Disco - Girls _ Girls _ Boys (SONG ALREADY EXISTS) ### Panic! At The Disco - Girls _ Girls _ Boys: 100%|████████████████████████████████████████████████████████████████▉| 3.52M/3.53M [00:21<00:00, 169kB/s] ### Downloaded "Panic! At The Disco - Girls _ Girls _ Boys" to "Creative title/Panic! At The Disco - Girls _ Girls _ Boys_1.ogg" in 21s (plus 5s converting) ### ### SKIPPING: Panic! At The Disco - The Ballad of Mona Lisa (SONG ALREADY EXISTS) ### Panic! At The Disco - The Ballad of Mona Lisa: 100%|█████████████████████████████████████████████████████████████▉| 3.92M/3.92M [00:26<00:00, 156kB/s] ### Downloaded "Panic! At The Disco - The Ballad of Mona Lisa" to "Creative title/Panic! At The Disco - The Ballad of Mona Lisa_1.ogg" in 26s (plus 3s converting) ### ```
This pull request has changes conflicting with the target branch.
  • zotify/utils.py
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin GitGitro/main:GitGitro/main
git switch GitGitro/main

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff GitGitro/main
git switch GitGitro/main
git rebase main
git switch main
git merge --ff-only GitGitro/main
git switch GitGitro/main
git rebase main
git switch main
git merge --no-ff GitGitro/main
git switch main
git merge --squash GitGitro/main
git switch main
git merge --ff-only GitGitro/main
git switch main
git merge GitGitro/main
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
zotify-dev/zotify!169
No description provided.