diff --git a/TIDALDL-PY/exe/tidal-dl.exe b/TIDALDL-PY/exe/tidal-dl.exe
index 2d30df3..9f603ca 100644
Binary files a/TIDALDL-PY/exe/tidal-dl.exe and b/TIDALDL-PY/exe/tidal-dl.exe differ
diff --git a/TIDALDL-PY/requirements.txt b/TIDALDL-PY/requirements.txt
index 455272c..10db148 100644
--- a/TIDALDL-PY/requirements.txt
+++ b/TIDALDL-PY/requirements.txt
@@ -4,5 +4,5 @@ prettytable==0.7.2
mutagen==1.45.1
psutil==5.7.3
pycryptodome==3.9.9
-aigpy==2022.01.18.2
+aigpy==2022.01.20.1
lyricsgenius==3.0.1
diff --git a/TIDALDL-PY/setup.py b/TIDALDL-PY/setup.py
index 54ff200..4939bee 100644
--- a/TIDALDL-PY/setup.py
+++ b/TIDALDL-PY/setup.py
@@ -13,7 +13,7 @@ setup(
packages=find_packages(exclude=['tidal_gui*']),
include_package_data=False,
platforms="any",
- install_requires=["aigpy>=2022.01.18.2", "requests>=2.22.0",
+ install_requires=["aigpy>=2022.01.20.1", "requests>=2.22.0",
"pycryptodome", "pydub", "prettytable", "lyricsgenius"],
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 4adc183..ab7347b 100644
--- a/TIDALDL-PY/tidal_dl/__init__.py
+++ b/TIDALDL-PY/tidal_dl/__init__.py
@@ -8,6 +8,7 @@
@Contact : yaronhuang@foxmail.com
@Desc :
'''
+import base64
import getopt
import logging
import ssl
@@ -194,11 +195,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)
+ # 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.")
diff --git a/TIDALDL-PY/tidal_dl/apiKey.py b/TIDALDL-PY/tidal_dl/apiKey.py
index 1f8b8a7..66534f7 100644
--- a/TIDALDL-PY/tidal_dl/apiKey.py
+++ b/TIDALDL-PY/tidal_dl/apiKey.py
@@ -10,23 +10,39 @@
"""
__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': 'True',
},
]
@@ -35,6 +51,7 @@ __ERROR_KEY__ = {
'formats': '',
'clientId': '',
'clientSecret': '',
+ 'valid': 'False',
},
diff --git a/TIDALDL-PY/tidal_dl/printf.py b/TIDALDL-PY/tidal_dl/printf.py
index e0a3212..13e0572 100644
--- a/TIDALDL-PY/tidal_dl/printf.py
+++ b/TIDALDL-PY/tidal_dl/printf.py
@@ -30,7 +30,7 @@ __LOGO__ = '''
https://github.com/yaronzz/Tidal-Media-Downloader
'''
-VERSION = '2022.01.18.2'
+VERSION = '2022.01.21.1'
class Printf(object):
@@ -281,9 +281,15 @@ class Printf(object):
print("-------------API-KEYS---------------")
LANG = getLang()
tb = prettytable.PrettyTable()
- tb.field_names = [aigpy.cmd.green('Index'), aigpy.cmd.green('Platform'), aigpy.cmd.green('Formats'), ]
+ tb.field_names = [aigpy.cmd.green('Index'),
+ aigpy.cmd.green('Valid'),
+ aigpy.cmd.green('Platform'),
+ aigpy.cmd.green('Formats'), ]
tb.align = 'l'
for index, item in enumerate(items):
- tb.add_row([str(index), item["platform"], item["formats"]])
+ tb.add_row([str(index),
+ aigpy.cmd.green('True') if item["valid"] == "True" else aigpy.cmd.red('False'),
+ item["platform"],
+ item["formats"]])
print(tb)
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/V.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/V.svg
deleted file mode 100644
index 5bdc765..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/V.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/__init__.py b/TIDALDL-PY/tidal_gui/resource/svg - 原/__init__.py
deleted file mode 100644
index fd40910..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/__init__.py
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/buymeacoffee.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/buymeacoffee.svg
deleted file mode 100644
index f231fb3..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/buymeacoffee.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/check.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/check.svg
deleted file mode 100644
index 3bfad7e..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/check.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/down.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/down.svg
deleted file mode 100644
index aaedf37..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/down.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/downHover.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/downHover.svg
deleted file mode 100644
index 2fc7c26..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/downHover.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/github.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/github.svg
deleted file mode 100644
index d176dd1..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/github.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/left.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/left.svg
deleted file mode 100644
index cb55090..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/left.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/download.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/download.svg
deleted file mode 100644
index 7e1ccad..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/download.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/downloadHover.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/downloadHover.svg
deleted file mode 100644
index a0718a6..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/downloadHover.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/info.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/info.svg
deleted file mode 100644
index 78fb6e5..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/info.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/search.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/search.svg
deleted file mode 100644
index 9cf2416..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/search.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/settings.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/settings.svg
deleted file mode 100644
index ff71fe2..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/leftTab/settings.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/paypal.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/paypal.svg
deleted file mode 100644
index e91041d..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/paypal.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/right.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/right.svg
deleted file mode 100644
index 352e296..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/right.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/search.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/search.svg
deleted file mode 100644
index fe03660..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/search.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/search2.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/search2.svg
deleted file mode 100644
index b801741..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/search2.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/cancel.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/cancel.svg
deleted file mode 100644
index 3696dee..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/cancel.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/delete.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/delete.svg
deleted file mode 100644
index 7019a8d..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/delete.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/expand.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/expand.svg
deleted file mode 100644
index 3b7a650..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/expand.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/open.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/open.svg
deleted file mode 100644
index 3396540..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/open.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/retry.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/retry.svg
deleted file mode 100644
index 174202b..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskItem/retry.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/complete.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/complete.svg
deleted file mode 100644
index ca50052..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/complete.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/download.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/download.svg
deleted file mode 100644
index 96a2ae2..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/download.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/error.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/error.svg
deleted file mode 100644
index 2065ba1..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/taskTab/error.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/upHover.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/upHover.svg
deleted file mode 100644
index d7e66be..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/upHover.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/close.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/close.svg
deleted file mode 100644
index d06198c..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/close.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/closeHover.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/closeHover.svg
deleted file mode 100644
index 0cb0e59..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/closeHover.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/max.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/max.svg
deleted file mode 100644
index 016e62b..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/max.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/min.svg b/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/min.svg
deleted file mode 100644
index a180f19..0000000
--- a/TIDALDL-PY/tidal_gui/resource/svg - 原/windows/min.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/TIDALDL-PY/updatelog.md b/TIDALDL-PY/updatelog.md
index 2377655..9faecb8 100644
--- a/TIDALDL-PY/updatelog.md
+++ b/TIDALDL-PY/updatelog.md
@@ -1,6 +1,13 @@
TYPE tidal-dl
USE pip3 install tidal-dl --upgrade
+#### v2022-01-21
+- [x] update api key by @Dniel97
+
+#### v2022-01-18
+- [X] Gui: search view
+- [X] Gui: download view
+
#### v2022-01-11
- [X] Settings: add type-folder(eg Album/Video/Playlist)
- [x] Album folder format support: {None}