GitHub/Tidal-Media-Downloader
1
0
Fork 0
mirror of https://github.com/yaronzz/Tidal-Media-Downloader.git synced 2026-06-13 04:05:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

upload new version

Browse Source
This commit is contained in:
Yaronzz
2022-02-07 11:31:25 +08:00
parent 1d5b8cd8f6
commit c9ae7bfebd
8 changed files with 1882 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TIDALDL-PY/exe/tidal-dl.exe
BIN
View File
Binary file not shown.
TIDALDL-PY/tidal_dl/__init__.py
+7 -7
View File
@@ -73,7 +73,9 @@ def setAccessToken():
def setAPIKey():
global LANG
item = apiKey.getItem(CONF.apiKeyIndex)
ver = apiKey.getVersion()
Printf.info(f'Current APIKeys: {str(CONF.apiKeyIndex)} {item["platform"]}-{item["formats"]}')
Printf.info(f'Current Version: {str(ver)}')
Printf.apikeys(apiKey.getItems())
index = int(Printf.enterLimit("APIKEY index:", LANG.MSG_INPUT_ERR, apiKey.getLimitIndexs()))
@@ -196,13 +198,11 @@ def main():
checkLogin()
# onlineVer = getLastVersion('tidal-dl')
# if not isNull(onlineVer):
# icmp = cmpVersion(onlineVer, VERSION)
# if icmp > 0:
# Printf.info(LANG.PRINT_LATEST_VERSION + ' ' + onlineVer)
# Printf.info("For some reasons, this version only supports LOSSLESS.")
onlineVer = getLastVersion('tidal-dl')
if not isNull(onlineVer):
icmp = cmpVersion(onlineVer, VERSION)
if icmp > 0:
Printf.info(LANG.PRINT_LATEST_VERSION + ' ' + onlineVer)
while True:
Printf.choices()
TIDALDL-PY/tidal_dl/apiKey.py
+71 -50
View File
@@ -8,52 +8,57 @@
@Contact : yaronhuang@foxmail.com
@Desc :
"""
import json
import requests
__API_KEYS__ = [
#api key from @Fokka-Engineering
#https://github.com/Fokka-Engineering/libopenTIDAL/blob/655528e26e4f3ee2c426c06ea5b8440cf27abc4a/README.md#example
{
'platform': 'Fire TV',
'formats': 'Normal/High/HiFi(No Master)',
'clientId': 'OmDtrzFgyVVL6uW56OnFA2COiabqm',
'clientSecret': 'zxen1r3pO0hgtOC7j6twMo9UAqngGrmRiWpV7QC1zJ8=',
'valid': 'False',
},
#api key from @Dniel97
#https://github.com/Dniel97/RedSea/blob/4ba02b88cee33aeb735725cb854be6c66ff372d4/config/settings.example.py#L68
{
'platform': 'Fire TV',
'formats': 'Master-Only(Else Error)',
'clientId': '7m7Ap0JC9j1cOM3n',
'clientSecret': 'vRAdA108tlvkJpTsGZS8rGZ7xTlbJ0qaZ2K9saEzsgY=',
'valid': 'True',
},
{
'platform': 'Android TV',
'formats': 'Normal/High/HiFi(No Master)',
'clientId': 'Pzd0ExNVHkyZLiYN',
'clientSecret': 'W7X6UvBaho+XOi1MUeCX6ewv2zTdSOV3Y7qC3p3675I=',
'valid': 'False',
},
#api key from @morguldir
#https://github.com/morguldir/python-tidal/commit/50f1afcd2079efb2b4cf694ef5a7d67fdf619d09
{
'platform': 'TV',
'formats': 'Normal/High/HiFi/Master',
'clientId': '8SEZWa4J1NVC5U5Y',
'clientSecret': 'owUYDkxddz+9FpvGX24DlxECNtFEMBxipU0lBfrbq60=',
'valid': 'False',
},
{
'platform': 'Android Auto',
'formats': 'Normal/High/HiFi/Master',
'clientId': 'zU4XHVVkc2tDPo4t',
'clientSecret': 'VJKhDFqJPqvsPVNBV6ukXTJmwlvbttP7wlMlrc72se4=',
'valid': 'True',
},
]
__KEYS_JSON__ = '''
{
"version": "1.0.1",
"keys": [
{
"platform": "Fire TV",
"formats": "Normal/High/HiFi(No Master)",
"clientId": "OmDtrzFgyVVL6uW56OnFA2COiabqm",
"clientSecret": "zxen1r3pO0hgtOC7j6twMo9UAqngGrmRiWpV7QC1zJ8=",
"valid": "False",
"from": "Fokka-Engineering (https://github.com/Fokka-Engineering/libopenTIDAL/blob/655528e26e4f3ee2c426c06ea5b8440cf27abc4a/README.md#example)"
},
{
"platform": "Fire TV",
"formats": "Master-Only(Else Error)",
"clientId": "7m7Ap0JC9j1cOM3n",
"clientSecret": "vRAdA108tlvkJpTsGZS8rGZ7xTlbJ0qaZ2K9saEzsgY=",
"valid": "True",
"from": "Dniel97 (https://github.com/Dniel97/RedSea/blob/4ba02b88cee33aeb735725cb854be6c66ff372d4/config/settings.example.py#L68)"
},
{
"platform": "Android TV",
"formats": "Normal/High/HiFi(No Master)",
"clientId": "Pzd0ExNVHkyZLiYN",
"clientSecret": "W7X6UvBaho+XOi1MUeCX6ewv2zTdSOV3Y7qC3p3675I=",
"valid": "False",
"from": ""
},
{
"platform": "TV",
"formats": "Normal/High/HiFi/Master",
"clientId": "8SEZWa4J1NVC5U5Y",
"clientSecret": "owUYDkxddz+9FpvGX24DlxECNtFEMBxipU0lBfrbq60=",
"valid": "False",
"from": "morguldir (https://github.com/morguldir/python-tidal/commit/50f1afcd2079efb2b4cf694ef5a7d67fdf619d09)"
},
{
"platform": "Android Auto",
"formats": "Normal/High/HiFi/Master",
"clientId": "zU4XHVVkc2tDPo4t",
"clientSecret": "VJKhDFqJPqvsPVNBV6ukXTJmwlvbttP7wlMlrc72se4=",
"valid": "True",
"from": "1nikolas (https://github.com/yaronzz/Tidal-Media-Downloader/pull/840)"
}
]
}
'''
__API_KEYS__ = json.loads(__KEYS_JSON__)
__ERROR_KEY__ = {
'platform': 'None',
'formats': '',
@@ -63,22 +68,38 @@ __ERROR_KEY__ = {
},
def getNum():
return len(__API_KEYS__)
return len(__API_KEYS__['keys'])
def getItem(index: int):
if index < 0 or index >= len(__API_KEYS__):
if index < 0 or index >= len(__API_KEYS__['keys']):
return __ERROR_KEY__
return __API_KEYS__[index]
return __API_KEYS__['keys'][index]
def getItems():
return __API_KEYS__
return __API_KEYS__['keys']
def getLimitIndexs():
array = []
for i in range(len(__API_KEYS__)):
for i in range(len(__API_KEYS__['keys'])):
array.append(str(i))
return array
def getVersion():
return __API_KEYS__['version']
#Load from gist
try:
respond = requests.get('https://api.github.com/gists/48d01f5a24b4b7b37f19443977c22cd6')
if respond.status_code == 200:
content = respond.json()['files']['tidal-api-key.json']['content']
__API_KEYS__ = json.loads(content)
except:
pass
TIDALDL-PY/tidal_dl/printf.py
+1 -1
View File
@@ -30,7 +30,7 @@ __LOGO__ = '''
https://github.com/yaronzz/Tidal-Media-Downloader
'''
VERSION = '2022.01.21.2'
VERSION = '2022.02.07.1'
class Printf(object):
TIDALDL-PY/tidal_gui/resource/images.py
+1761
View File
File diff suppressed because it is too large Load Diff
TIDALDL-PY/tidal_gui/resource/images.qrc
+37
View File
@@ -0,0 +1,37 @@
<RCC>
<qresource prefix="/">
<file>svg/buymeacoffee.svg</file>
<file>svg/check.svg</file>
<file>svg/down.svg</file>
<file>svg/downHover.svg</file>
<file>svg/github.svg</file>
<file>svg/left.svg</file>
<file>svg/paypal.svg</file>
<file>svg/right.svg</file>
<file>svg/search.svg</file>
<file>svg/search2.svg</file>
<file>svg/upHover.svg</file>
<file>svg/V.svg</file>
<file>svg/leftTab/download.svg</file>
<file>svg/leftTab/downloadHover.svg</file>
<file>svg/leftTab/info.svg</file>
<file>svg/leftTab/search.svg</file>
<file>svg/leftTab/settings.svg</file>
<file>svg/taskItem/cancel.svg</file>
<file>svg/taskItem/delete.svg</file>
<file>svg/taskItem/expand.svg</file>
<file>svg/taskItem/open.svg</file>
<file>svg/taskItem/retry.svg</file>
<file>svg/taskTab/complete.svg</file>
<file>svg/taskTab/download.svg</file>
<file>svg/taskTab/error.svg</file>
<file>svg/windows/close.svg</file>
<file>svg/windows/closeHover.svg</file>
<file>svg/windows/max.svg</file>
<file>svg/windows/min.svg</file>
</qresource>
</RCC>
TIDALDL-PY/updatelog.md
+3
View File
@@ -1,6 +1,9 @@
TYPE tidal-dl
USE pip3 install tidal-dl --upgrade
#### v2022-02-07
- [x] update api key by 1nikolas
#### v2022-01-21
- [x] update api key by @morguldir
- [x] Fix bug of "ReleaseDate"
TIDALDL-PY/upload.sh
+2 -1
View File
@@ -6,6 +6,7 @@ rm MANIFEST.in
rm -rf tidal_dl.egg-info
rm -rf tidal_gui.egg-info
rm -rf tidal_dl_test.egg-info
mkdir exe
# pack
python setup.py sdist bdist_wheel
@@ -44,7 +45,7 @@ rm -rf tidal_dl_test.egg-info
# pack
python setup-gui.py sdist bdist_wheel
# creat exe file
pyinstaller -F tidal_gui/__init__.py
pyinstaller -F tidal_gui/__init__.py -w
# rename exe name
mv dist/__init__.exe exe/tidal-gui.exe