Fix Some Bug

yaronzz · Jul 12, 2019 · dc4d927 · dc4d927
1 parent 4209cab
commit dc4d927
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/TIDALDL-PY/exe/tidal-dl.exe b/TIDALDL-PY/exe/tidal-dl.exe
diff --git a/TIDALDL-PY/tidal_dl/__init__.py b/TIDALDL-PY/tidal_dl/__init__.py
@@ -10,9 +10,9 @@
 from tidal_dl.tidal import TidalConfig
 from tidal_dl.tidal import TidalAccount
 from tidal_dl.download import Download
-from tidal_dl.printhelper import printMenu,printChoice,printErr
+from tidal_dl.printhelper import printMenu,printChoice2,printErr
 
-TIDAL_DL_VERSION="2019.7.11.1"
+TIDAL_DL_VERSION="2019.7.12.0"
 
 def logIn(username = "", password = ""):
     if username == "" or password == "":
@@ -118,7 +118,7 @@ def main(argv=None):
     print("====================================================")
     while True:
         printMenu()
-        choice = printChoice("Enter Choice:", False, 99)
+        strchoice,choice = printChoice2("Enter Choice:", 99)
         if choice == 0:
             return
         elif choice == 1:
@@ -140,7 +140,7 @@ def main(argv=None):
         elif choice == 8:
             dl.downloadArtistAlbum()
         else:
-            dl.downloadUrl(choice)
+            dl.downloadUrl(strchoice)
 
 def debug():
     # cf = TidalConfig()

diff --git a/TIDALDL-PY/tidal_dl/printhelper.py b/TIDALDL-PY/tidal_dl/printhelper.py
@@ -24,6 +24,13 @@ def printChoice(string, isInt=False, default=None):
         return cmdHelper.myinput(tmpstr)
     else:
         return cmdHelper.myinputInt(tmpstr, default)
+def printChoice2(string, default=None):
+    ret = printChoice(string, False, default)
+    try:
+        iret = int(ret)
+        return ret, iret
+    except:
+        return ret, default
 def printMenu():
     if systemHelper.isLinux():
         print("=====================Choice=========================")

diff --git a/TIDALDL-PY/updatelog.log b/TIDALDL-PY/updatelog.log
@@ -1,3 +1,6 @@
+======2019-07-12=============================
+1\ Fix Some Bug
+
 ======2019-07-11=============================
 1\ Add Func:Download By Url