From 3099820956db2e4656fd20d860edd7e8ff94c7b0 Mon Sep 17 00:00:00 2001 From: Yaronzz Date: Thu, 23 Jun 2022 11:26:33 +0800 Subject: [PATCH] 1. update setup.py --- .github/{workflows => tmpFlows}/stale.yml | 0 .github/workflows/build.yml | 30 ++++++------ .gitignore | 3 ++ .vscode/launch.json | 1 + README.md | 56 ++++++++++++----------- TIDALDL-PY/requirements.txt | 3 +- TIDALDL-PY/setup.py | 10 ++-- TIDALDL-PY/tidal_dl/__init__.py | 4 +- 8 files changed, 59 insertions(+), 48 deletions(-) rename .github/{workflows => tmpFlows}/stale.yml (100%) diff --git a/.github/workflows/stale.yml b/.github/tmpFlows/stale.yml similarity index 100% rename from .github/workflows/stale.yml rename to .github/tmpFlows/stale.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 08f79aa..e42f0de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,22 +49,22 @@ jobs: # cp -rf tidal_gui/resource dist/ # working-directory: TIDALDL-PY - - name: Build tidal-gui - shell: bash - if: ${{ matrix.os != 'macos-latest' }} - run: | - cp -rf guiStatic.in MANIFEST.in - pyinstaller -D tidal_gui/__init__.py -w -n tidal-gui - working-directory: TIDALDL-PY + # - name: Build tidal-gui + # shell: bash + # if: ${{ matrix.os != 'macos-latest' }} + # run: | + # cp -rf guiStatic.in MANIFEST.in + # pyinstaller -D tidal_gui/__init__.py -w -n tidal-gui + # working-directory: TIDALDL-PY - - name: Gzip tidal-gui - shell: bash - if: ${{ matrix.os != 'macos-latest' }} - run: | - cp -rf ../tidal_gui/resource ./tidal-gui/ - tar -zcvf tidal-gui.tar.gz tidal-gui - rm -rf tidal-gui - working-directory: TIDALDL-PY/dist + # - name: Gzip tidal-gui + # shell: bash + # if: ${{ matrix.os != 'macos-latest' }} + # run: | + # cp -rf ../tidal_gui/resource ./tidal-gui/ + # tar -zcvf tidal-gui.tar.gz tidal-gui + # rm -rf tidal-gui + # working-directory: TIDALDL-PY/dist - name: Upload artifact uses: actions/upload-artifact@v2 diff --git a/.gitignore b/.gitignore index a3089ff..4606030 100644 --- a/.gitignore +++ b/.gitignore @@ -175,3 +175,6 @@ TIDALDL-PY/exe/tidal_dl_win.tar.gz TIDALDL-PY/tidal-gui.spec .history/ .gitignore +/TIDALDL-PY/tidal_dl_old +/TIDALDL-PY/tidal_gui_old +/TIDALDL-PY/tidal_gui diff --git a/.vscode/launch.json b/.vscode/launch.json index c9c13c0..89d3457 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -16,6 +16,7 @@ "env": { "PYTHONPATH": "${workspaceRoot}/TIDALDL-PY/" }, + "justMyCode": false }, { "name": "Python: common line", diff --git a/README.md b/README.md index b4d7897..51b41f8 100644 --- a/README.md +++ b/README.md @@ -31,26 +31,23 @@

-## 📺 Installation -| Name | platform | Install | -| ----------------------------- | --------------------------------- | ------------------------------------------------------------ | -| tidal-dl (cli) | Windows \ Linux \ Macos \ Android | ```pip3 install tidal-dl --upgrade```
[Detailed Description](https://yaronzz.com/post/tidal_dl_installation/#Install) | -| tidal-gui | Windows | [GUI Repository](https://github.com/yaronzz/Tidal-Media-Downloader-PRO) | -| tidal-gui(**Cross-platform**) | Windows \ Linux \ Macos | ```pip3 install tidal-gui --upgrade``` | +## 📺 Installation + +| Name | platform | Install | +| ----------------------------------- | --------------------------------- | --------------------------------------------------------------------------------------------------------------------- | +| tidal-dl (cli) | Windows \ Linux \ Macos \ Android | ``pip3 install tidal-dl --upgrade``
[Detailed Description](https://yaronzz.com/post/tidal_dl_installation/#Install) | +| tidal-gui | Windows | [GUI Repository](https://github.com/yaronzz/Tidal-Media-Downloader-PRO) | +| tidal-gui(**Cross-platform**) | Windows \ Linux \ Macos | ``pip3 install tidal-gui --upgrade`` | ### Nightly Builds -|Download nightly builds from continuous integration: | [![Build Status][Build]][Actions] -|-------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------| - -[Actions]: https://github.com/yaronzz/Tidal-Media-Downloader/actions -[Build]: https://github.com/yaronzz/Tidal-Media-Downloader/workflows/Tidal%20Media%20Downloader/badge.svg +| Download nightly builds from continuous integration: | [Build Status][Actions] | +| ---------------------------------------------------- | ----------------------- | ## 🤖 Features + - Download album \ track \ video \ playlist \ artist-albums - - Add metadata to songs - - Selectable video resolution and track quality ## 💽 User Interface @@ -89,7 +86,7 @@ | {ArtistName} | The Beatles | | {ArtistsName} | The Beatles | | {TrackTitle} | I Saw Her Standing There (Remastered 2009) | -| {ExplicitFlag} | (*Explicit*) | +| {ExplicitFlag} | (*Explicit*) | | {AlbumYear} | 1963 | | {AlbumTitle} | Please Please Me (Remastered) | | {AudioQuality} | LOSSLESS | @@ -99,25 +96,26 @@ ### Video -| Tag | Example Value | -| ----------------- | ------------------------------------------ | -| {VideoNumber} | 00 | -| {ArtistName} | DMX | -| {ArtistsName} | DMX, Westside Gunn | -| {VideoTitle} | Hood Blues | -| {ExplicitFlag} | (*Explicit*) | -| {VideoYear} | 2021 | -| {TrackID} | 188932980 | +| Tag | Example Value | +| -------------- | ------------------ | +| {VideoNumber} | 00 | +| {ArtistName} | DMX | +| {ArtistsName} | DMX, Westside Gunn | +| {VideoTitle} | Hood Blues | +| {ExplicitFlag} | (*Explicit*) | +| {VideoYear} | 2021 | +| {TrackID} | 188932980 | ## ☕ Support -If you really like my projects and want to support me, you can buy me a coffee and star this project. +If you really like my projects and want to support me, you can buy me a coffee and star this project. Buy Me A Coffee ## 🎂 Contributors -This project exists thanks to all the people who contribute. - + +This project exists thanks to all the people who contribute. +```` ## 🎨 Libraries and reference @@ -127,8 +125,9 @@ This project exists thanks to all the people who contribute. - [tidal-wiki](https://github.com/Fokka-Engineering/TIDAL/wiki) ## 📜 Disclaimer + - Private use only. -- Need a Tidal-HIFI subscription. +- Need a Tidal-HIFI subscription. - You should not use this method to distribute or pirate music. - It may be illegal to use this in your country, so be informed. @@ -141,6 +140,7 @@ python3 setup.py install ``` ## Fork changes - Scenario and comments: + I would be content with TIDAL download feature, to give me off-line music on my device. I find playlists good for that. But playlist changes are not done well. If I add 1 song to a 100 song playlist, the only way I can get it on my phone is: - @@ -156,3 +156,5 @@ So this is to fill that gap in my scenario. But the effect seems useful for oth Also: some improved handling of the "onlyM4A" flag. If files have been renamed from mp4 to m4a, the SKIP download logic wasn't working. Now it's handled for the simple case at least. +[Actions]: https://github.com/yaronzz/Tidal-Media-Downloader/actions +[Build]: https://github.com/yaronzz/Tidal-Media-Downloader/workflows/Tidal%20Media%20Downloader/badge.svg diff --git a/TIDALDL-PY/requirements.txt b/TIDALDL-PY/requirements.txt index c886401..1360a3a 100644 --- a/TIDALDL-PY/requirements.txt +++ b/TIDALDL-PY/requirements.txt @@ -4,6 +4,7 @@ prettytable==3.1.1 mutagen==1.45.1 psutil==5.9.0 pycryptodome==3.14.1 -aigpy==2022.6.15.1 +aigpy==2022.6.22.1 lyricsgenius==3.0.1 pydub==0.25.1 +PyQt5==5.15.7 diff --git a/TIDALDL-PY/setup.py b/TIDALDL-PY/setup.py index 3d953ee..e4fee82 100644 --- a/TIDALDL-PY/setup.py +++ b/TIDALDL-PY/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages from tidal_dl.printf import VERSION setup( - name='tidal-dl-test', + name='tidal-dl', version=VERSION, license="Apache2", description="Tidal Music Downloader.", @@ -13,7 +13,11 @@ setup( packages=find_packages(exclude=['tidal_gui*']), include_package_data=False, platforms="any", - install_requires=["aigpy>=2022.6.15.1", "requests>=2.22.0", - "pycryptodome", "pydub", "prettytable", "lyricsgenius"], + install_requires=["aigpy>=2022.6.22.1", + "requests>=2.22.0", + "pycryptodome", + "pydub", + "prettytable", + "PyQt5"], entry_points={'console_scripts': ['tidal-dl = tidal_dl:main', ]} ) diff --git a/TIDALDL-PY/tidal_dl/__init__.py b/TIDALDL-PY/tidal_dl/__init__.py index 78e9b8a..7736f70 100644 --- a/TIDALDL-PY/tidal_dl/__init__.py +++ b/TIDALDL-PY/tidal_dl/__init__.py @@ -144,5 +144,5 @@ def test(): if __name__ == '__main__': - test() - # main() + # test() + main()