upload new version(cli)

yaronzz · Jul 3, 2020 · 6ada0fb · 6ada0fb
1 parent e1375ae
commit 6ada0fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/TIDALDL-PY/exe/tidal-dl.exe b/TIDALDL-PY/exe/tidal-dl.exe
diff --git a/TIDALDL-PY/setup.py b/TIDALDL-PY/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 setup(
     name = 'tidal-dl',
-    version="2020.6.29.0",
+    version="2020.7.3.0",
     license="Apache2",
     description = "Tidal Music Downloader.",
 
@@ -11,7 +11,7 @@
     packages = find_packages(),
     include_package_data = True,
     platforms = "any",
-    install_requires=["aigpy>=2020.6.29.1", "requests", "ffmpeg",
+    install_requires=["aigpy>=2020.7.3.0", "requests", "ffmpeg",
                       "pycryptodome", "pydub"],
     entry_points={'console_scripts': [ 'tidal-dl = tidal_dl:main', ]}
 )
diff --git a/TIDALDL-PY/tidal_dl/download.py b/TIDALDL-PY/tidal_dl/download.py
@@ -74,6 +74,7 @@ def __thradfunc_dl(self, paraList):
         index = None
         coverpath = None
         err = None
+        ignoreCertificate = False
 
         if 'redownload' in paraList:
             redownload = paraList['redownload']
@@ -102,7 +103,7 @@ def __thradfunc_dl(self, paraList):
             try:
                 while count > 0:
                     count = count - 1
-                    check, err = netHelper.downloadFileRetErr(paraList['url'], paraList['path']+'.part', showprogress=showprogress, stimeout=20, ignoreCertificate=True)
+                    check, err = netHelper.downloadFileRetErr(paraList['url'], paraList['path']+'.part', showprogress=showprogress, stimeout=20, ignoreCertificate=ignoreCertificate)
                     if check is True:
                         if paraList['key'] == '':
                             # unencrypted -> just move into place
@@ -114,6 +115,9 @@ def __thradfunc_dl(self, paraList):
                             decrypt_file(paraList['path']+'.part', paraList['path'], key, nonce)
                             os.remove(paraList['path']+'.part')
                         break
+                    else:
+                        ignoreCertificate = True
+
                 if check:
                     bIsSuccess = True
                     if self.tool.isNeedCovertToM4a(paraList['path']):
@@ -161,9 +165,14 @@ def __creatAlbumDir(self, albumInfo, quality='LOW'):
         if self.config.addAlbumidbeforefolder == 'True':
             title = '[' + str(albumInfo['id']) + '] ' + title
 
-        # add quality[M] labels
+        # add quality[M] labels and explicit[E] labels
+        flag = ''
         if 'audioQuality' in albumInfo and albumInfo['audioQuality'] == 'HI_RES' and quality == 'HI_RES':
-            title = '[M] '+title
+            flag = 'M'
+        if 'explicit' in albumInfo and albumInfo['explicit']:
+            flag += 'E'
+        if flag != '':
+            title = '[' + flag + '] '+ title
 
         targetDir = self.config.outputdir + "/Album/" + author + '/' + title
         targetDir = os.path.abspath(targetDir)
@@ -174,7 +183,7 @@ def __creatAlbumDir(self, albumInfo, quality='LOW'):
         numOfVolumes = int(albumInfo['numberOfVolumes'])
         if numOfVolumes > 1:
             while count < numOfVolumes + 1:
-                volumeDir = targetDir + "/Volume" + str(count)
+                volumeDir = targetDir + "/CD" + str(count)
                 pathHelper.mkdirs(volumeDir)
                 count = count + 1
         return targetDir
@@ -213,7 +222,7 @@ def __getAlbumSongSavePath(self, targetDir, albumInfo, item, extension):
         seq = item['volumeNumber']
         path = targetDir + "/"
         if int(albumInfo['numberOfVolumes']) > 1:
-            path += 'Volume' + str(seq) + "/"
+            path += 'CD' + str(seq) + "/"
 
         maxlen = 255
         if systemHelper.isLinux():

diff --git a/TIDALDL-PY/updatelog.md b/TIDALDL-PY/updatelog.md
@@ -2,8 +2,10 @@ TYPE tidal-dl
 USE  pip3 install tidal-dl --upgrade
 DESC This version requires some tests, there may be many problems
 
-- [] Add label [E] before albumtitle #264
-- [] Volume to CD
+### 2020-07-03
+- Add label [E] before albumtitle #264
+- Volume to CD
+- Fix bug of ssl
 
 ### 2020-06-28
 - Fix bug of download-playlist