Switch to rich #1098

phcreery · 2021-01-09T18:44:15Z

Drop TQDM in favor of willmcgugan/rich
This was #1037 before branch convention changes.
#1037 was part of #895 but I created a new PR after asyncio switch.

Before:

After:

See #1037 for more info.

spotdl/__main__.py

Silverarmor · 2021-01-09T22:11:02Z

One thing I note, not sure if its an issue/fixable. Resizing the command window, the progress bars will adapt, but after that, when you "snap" the window back (by dragging to corner/top of screen/side of screen), the bars go all messy as per

(note duplicated song progress bar)

(Running Windows 10 pro)

phcreery · 2021-01-09T22:24:34Z

One thing I note, not sure if its an issue/fixable. Resizing the command window, the progress bars will adapt, but after that, when you "snap" the window back (by dragging to corner/top of screen/side of screen), the bars go all messy as per

(note duplicated song progress bar)

(Running Windows 10 pro)

I see. Several factors play into this. The text column width is determined at __init__ and not changed after that. (Resizing window to smaller than that width causes an unwanted linefeed AKA duplicate bar) Also, after the code is complete, there is no way for the script to modify the already outputted text. If this is happening during execution, it is most likely due to the former OR is a result of how willmcgugan/rich operates.

* Transition to setup.cfg rather than setup.py * Update setup.cfg * add packages * Add Readme to PyPi * Spacing * Delete oldsetup.py * Drop Version Support for Py3.6 * Update as for #1098 * Fix Critical Error in setup.py Had comma separated list rather than semi colon. Prevented setup.py from functioning * Add 3.9 classifier * Update setup.cfg * Drop py3.6 support * Re-add Py3.6 support * Change Email * Remove `requests` * add tqdm to requirements * Fix Line Lengths in bug report template it was annoying me lol * Update and rename pull_request_template.md to PULL_REQUEST_TEMPLATE.md

Silverarmor · 2021-01-12T23:28:17Z

I think tests/test_entry_point.py will need to be edited or something since that uses tqdm? Not entirely sure how that check works.
Last time i removed tqdm ran into THIS - #1096 (comment)

@aklajnert ?

phcreery · 2021-01-13T02:26:19Z

Hmm, just ran pytest and a whole 5 tests failed. Nice.

Then the URL for test_download_a_playlist is non-existent, is this intentional? https://open.spotify.com/playlist/37i9dQZF1DX1vrY9HPZioH

After picking a new playlist, it resolved that one. In 4 of the other tests, my code affected the output so I had to modify pytest to be compliant. All tests passing now.

Silverarmor · 2021-01-13T02:29:37Z

@aklajnert ^?

aklajnert · 2021-01-13T05:30:22Z

Hmm, just ran pytest and a whole 5 tests failed. Nice.

Then the URL for test_download_a_playlist is non-existent, is this intentional? https://open.spotify.com/playlist/37i9dQZF1DX1vrY9HPZioH

After picking a new playlist, it resolved that one. In 4 of the other tests, my code affected the output so I had to modify pytest to be compliant. All tests passing now.

Please update your branch - I see you have a conflict with tests/test_entry_point.py file. In general, this branch seems a bit outdated as it doesn't even run tests on CI. I've just run all tests and they're fine.

I think tests/test_entry_point.py will need to be edited or something since that uses tqdm? Not entirely sure how that check works.
Last time i removed tqdm ran into THIS - #1096 (comment)

@aklajnert ?

Not necessarily. In your case, the project wouldn't work because the tqdm was missing from setup.cfg while still being used which was caught by tests. Removing tqdm and its usages shouldn't fail them.

@last72

Finalizing Development branch -- * Improved `saveFile` handling * Fixed tests, recorded new cassettes * Setup CI on GitHub actions * Disable VCR only for Python 3.8 to speed up tests * Clean `mypy` and add it to the CI * Fixed syntax for tox.ini * Refactor setup.py. Add setup.cfg. modify issue & PR templates. (#1096) * Transition to setup.cfg rather than setup.py * Update setup.cfg * add packages * Add Readme to PyPi * Spacing * Delete oldsetup.py * Drop Version Support for Py3.6 * Update as for #1098 * Fix Critical Error in setup.py Had comma separated list rather than semi colon. Prevented setup.py from functioning * Add 3.9 classifier * Update setup.cfg * Drop py3.6 support * Re-add Py3.6 support * Change Email * Remove `requests` * add tqdm to requirements * Fix Line Lengths in bug report template it was annoying me lol * Update and rename pull_request_template.md to PULL_REQUEST_TEMPLATE.md * Fixing typo (#1108) @last72 helping to fix typos in CONTRIBUTING.md * Fixing typo ometimes, -> Sometimes, * Fixing typo intensions -> intentions * Core values: How we decided what gets included (#1105) @MikhailZex - Core values: How we decided what gets included * Values: What get added, and what gets removed * Updates based on @Silverarmor's Review - Used title case - Canged '~(80%)' to '~80%+) - Removed unnecessary line breaks - Removed extra COREVALUES.md * Prepare Update to 3.3.0 Updated setup.cfg version to 3.3.0 * Fix setup.cfg & setup.py dev (#1116) Authored by @phcreery @Silverarmor @phcreery helped solve the big problem! * Attempt to unfck it * Try change entry point to all? * Try add a main() function * remove colon bit * Revert to 172e973 Signed-off-by: Silverarmor <[email protected]> * idk whats happening * try fix packages? mayb helps? * back to __main__ * Removed where to look * script as spotdl * didnt work, trying spotdl:spotdl * trying __main__ maybe? * I am literally desperate and trying different files now. hopefully? maybe? * hopefully fixed * Revert "hopefully fixed" This reverts commit 1f07c0b. * Fix entry point. Big thanks @phcreery who figured this one out! Co-Authored-By: Peyton Creery <[email protected]> Co-authored-by: Peyton Creery <[email protected]> * Transfer mypy.ini to setup.cfg Co-authored-by: Andrzej Klajnert <[email protected]> Co-authored-by: Woongyeol Choi <[email protected]> Co-authored-by: Michael George <[email protected]> Co-authored-by: Peyton Creery <[email protected]>

Silverarmor

Needs updating from master.

Also note 490f926 - I deleted tmp file. - Maybe needs to be added to .gitignore?

…ify-downloader into switch-to-rich-dev

phcreery · 2021-01-15T14:55:13Z

@Silverarmor updated

Silverarmor

Lots of merge conflicts in /tests/ files.

tests/cassettes/test_multiple_elements.yaml

tests/cassettes/test_search_and_download.yaml

aklajnert · 2021-01-16T12:22:57Z

Lots of merge conflicts in /tests/ files.

Do not resolve conflicts in YAML files in /tests/cassetes directory, as they are autogenerated. Simply remove them and run tests again, so they will be recreated. Or just pick select theirs on conflicts resolving.

aklajnert · 2021-02-12T10:53:53Z

@Silverarmor - did you close it intentionally?

Silverarmor · 2021-02-12T10:54:49Z

my bad, made a mistake and was tryna fix it

…to switch-to-rich-dev

ghost · 2021-03-19T07:17:30Z

@phcreery, could you look into the merge conflicts, as long as they exist, the checks will not run

…to switch-to-rich-dev

invalid escape sequence '\$' (Which is correct in our case).

spotdl/download/progressHandlers.py

spotdl/download/downloader.py

…ify-downloader into switch-to-rich-dev

Silverarmor

LGTM

aklajnert · 2021-03-24T06:04:54Z

There are quite a lot flake8 violations, but they should be easy to fix.

spotdl/download/downloader.py

Silverarmor · 2021-03-25T03:09:59Z

3ec3de4 appears to have caused tests to fail

aklajnert · 2021-03-25T05:12:17Z

@Silverarmor - I think this should be merged next, as it is quite vulnerable to merge conflicts.

Silverarmor · 2021-03-25T05:19:03Z

@Silverarmor - I think this should be merged next, as it is quite vulnerable to merge conflicts.

Will do

Silverarmor · 2021-03-25T05:21:23Z

Want to also note thanks for all your hard work on this feature! @phcreery

@jcs090218

* Fix MikhailZex GitHub's link (#1215) Authored by @jcs090218 * Use the proper name for beautifulsoup4 (#1210) Authored by @timschumi * Refactor spotify client (#1188) Authored by @aklajnert * Switch to rich (#1098) Authored by @phcreery * Bump version number to 3.5.0 Co-authored-by: Jen-Chieh Shen <[email protected]> Co-authored-by: Tim Schumacher <[email protected]> Co-authored-by: Andrzej Klajnert <[email protected]> Co-authored-by: Peyton Creery <[email protected]> Co-authored-by: Michael George <[email protected]> Co-authored-by: Jakub <[email protected]>

phcreery added 5 commits January 9, 2021 12:12

initial changed for rich

82e8d9c

fixes

79200c1

comment consistency

5d008cc

thx BetterCodeHub

ddd0106

unnecessary comment

2c0a9d1

Silverarmor added a commit to Silverarmor/spotify-downloader that referenced this pull request Jan 9, 2021

Update as for spotDL#1098

8d3ccee

Silverarmor reviewed Jan 9, 2021

View reviewed changes

spotdl/__main__.py Outdated Show resolved Hide resolved

Silverarmor added the Enhancement Enhancing spotDL label Jan 10, 2021

phcreery added 2 commits January 9, 2021 22:16

descriptions/comments

838258d

remove unnecesary try in main.py

2c382e0

Silverarmor added a commit to Silverarmor/spotify-downloader that referenced this pull request Jan 11, 2021

Update as for spotDL#1098

23a362f

phcreery requested review from a user and Silverarmor January 11, 2021 18:25

update pytest test cases

8099799

Delete tmp

490f926

Silverarmor requested changes Jan 15, 2021

View reviewed changes

phcreery added 3 commits January 15, 2021 08:51

Merge branch 'dev' into switch-to-rich-dev

2a8c412

Merge branch 'switch-to-rich-dev' of https://github.com/phcreery/spot…

fb1da11

…ify-downloader into switch-to-rich-dev

clean up merge issues

de6dee5

Silverarmor requested changes Jan 15, 2021

View reviewed changes

tests/cassettes/test_multiple_elements.yaml Outdated Show resolved Hide resolved

tests/cassettes/test_multiple_elements.yaml Outdated Show resolved Hide resolved

tests/cassettes/test_search_and_download.yaml Outdated Show resolved Hide resolved

Silverarmor closed this Feb 12, 2021

Silverarmor deleted the branch spotDL:dev February 12, 2021 10:37

Silverarmor reopened this Feb 12, 2021

phcreery added 4 commits February 13, 2021 14:26

Merge branch 'dev' of https://github.com/spotDL/spotify-downloader in…

f4a5908

…to switch-to-rich-dev

fix typting

7e9a08c

fix merge conflicts

8419f4b

coreected song naming

35f0605

ghost force-pushed the dev branch from 117242a to 9d985fd Compare March 15, 2021 05:23

phcreery and others added 3 commits March 22, 2021 11:22

Merge branch 'dev' of https://github.com/spotDL/spotify-downloader in…

67f7db8

…to switch-to-rich-dev

fix cassetes

9630b66

Ignore W605

a12223a

invalid escape sequence '\$' (Which is correct in our case).

Silverarmor requested changes Mar 22, 2021

View reviewed changes

phcreery added 2 commits March 23, 2021 09:00

suggested fixes and formatting

1ec9a68

Merge branch 'switch-to-rich-dev' of https://github.com/phcreery/spot…

80d173b

…ify-downloader into switch-to-rich-dev

Silverarmor approved these changes Mar 24, 2021

View reviewed changes

flake8 compliant formatting

9be74ab

aklajnert approved these changes Mar 24, 2021

View reviewed changes

spotdl/download/downloader.py Outdated Show resolved Hide resolved

remove residual unused function

3ec3de4

fix test to not call redundant function removed in 3ec3de4

47db96b

Silverarmor merged commit 324a363 into spotDL:dev Mar 25, 2021

Silverarmor mentioned this pull request Mar 25, 2021

Publish v3.5.0 #1232

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Switch to rich #1098

Switch to rich #1098

phcreery commented Jan 9, 2021

Silverarmor commented Jan 9, 2021

phcreery commented Jan 9, 2021

Silverarmor commented Jan 12, 2021

phcreery commented Jan 13, 2021 •

edited

Loading

Silverarmor commented Jan 13, 2021

aklajnert commented Jan 13, 2021

Silverarmor left a comment •

edited

Loading

phcreery commented Jan 15, 2021 •

edited

Loading

Silverarmor left a comment

aklajnert commented Jan 16, 2021

aklajnert commented Feb 12, 2021

Silverarmor commented Feb 12, 2021

ghost commented Mar 19, 2021

Silverarmor left a comment

aklajnert commented Mar 24, 2021

Silverarmor commented Mar 25, 2021

aklajnert commented Mar 25, 2021

Silverarmor commented Mar 25, 2021

Silverarmor commented Mar 25, 2021

Switch to rich #1098

Switch to rich #1098

Conversation

phcreery commented Jan 9, 2021

Silverarmor commented Jan 9, 2021

phcreery commented Jan 9, 2021

Silverarmor commented Jan 12, 2021

phcreery commented Jan 13, 2021 • edited Loading

Silverarmor commented Jan 13, 2021

aklajnert commented Jan 13, 2021

Silverarmor left a comment • edited Loading

Choose a reason for hiding this comment

phcreery commented Jan 15, 2021 • edited Loading

Silverarmor left a comment

Choose a reason for hiding this comment

aklajnert commented Jan 16, 2021

aklajnert commented Feb 12, 2021

Silverarmor commented Feb 12, 2021

ghost commented Mar 19, 2021

Silverarmor left a comment

Choose a reason for hiding this comment

aklajnert commented Mar 24, 2021

Silverarmor commented Mar 25, 2021

aklajnert commented Mar 25, 2021

Silverarmor commented Mar 25, 2021

Silverarmor commented Mar 25, 2021

phcreery commented Jan 13, 2021 •

edited

Loading

Silverarmor left a comment •

edited

Loading

phcreery commented Jan 15, 2021 •

edited

Loading