fixed bug of 'Asset is not ready for playback'

yaronzz · Mar 11, 2020 · ed6de44 · ed6de44 · vad62 · Mar 11, 2020
1 parent 18a84be
commit ed6de44
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 6 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.3.10.0",
+    version="2020.3.11.0",
     license="Apache2",
     description = "Tidal Music Download.",
 

diff --git a/TIDALDL-PY/tidal_dl/__init__.py b/TIDALDL-PY/tidal_dl/__init__.py
@@ -11,7 +11,7 @@
 from tidal_dl.download import Download
 from tidal_dl.printhelper import printMenu, printChoice2, printErr, printWarring, LOG
 
-TIDAL_DL_VERSION = "2020.3.10.0"
+TIDAL_DL_VERSION = "2020.3.11.0"
 
 
 def logIn(username="", password=""):

diff --git a/TIDALDL-PY/tidal_dl/tidal.py b/TIDALDL-PY/tidal_dl/tidal.py
@@ -44,7 +44,7 @@ def _get(self, url, params={}):
         retry = 3
         sessionid = self.config.sessionid
         if 'soundQuality' in params: 
-            if params['soundQuality'] == 'LOSSLESS' or params['soundQuality'] == 'DOLBY_ATMOS':
+            if params['soundQuality'] == 'LOSSLESS':
                 sessionid = self.config.sessionid2
 
         while retry > 0:
@@ -58,6 +58,9 @@ def _get(self, url, params={}):
                     params=params).json()
                 if 'status' in resp and resp['status'] == 404 and resp['subStatus'] == 2001:
                     self.errmsg = '{}. This might be region-locked.'.format(resp['userMessage'])
+                elif 'status' in resp and resp['status'] == 401 and resp['subStatus'] == 4005: #'Asset is not ready for playback'
+                    sessionid = self.config.sessionid2
+                    continue
                 elif 'status' in resp and not resp['status'] == 200:
                     self.errmsg = '{}. Get operation err!'.format(resp['userMessage'])
                     # self.errmsg = "Get operation err!"

diff --git a/TIDALDL-PY/updatelog.md b/TIDALDL-PY/updatelog.md
@@ -1,3 +1,6 @@
+#### 2020-03-11
+- Fix bug of 'Asset is not ready for playback'
+
 #### 2020-03-10
 - Update token
 

diff --git a/TIDALDL-UI/TIDALDL-UI/Pages/AboutView.xaml b/TIDALDL-UI/TIDALDL-UI/Pages/AboutView.xaml
@@ -28,7 +28,7 @@
                 <Grid Height="282" Grid.Row="1">
                     <Image Margin="94,13,93,177" Source="pack://application:,,,/resource/tidal.jpg" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                     <Label Content="TIDAL-GUI" Margin="103,105,102,151" HorizontalAlignment="Center" FontWeight="Bold" Width="74"/>
-                    <Label Content="Copyright 2019 Yaron Inc." Margin="54,131,61,124" HorizontalAlignment="Center"/>
+                    <Label Content="Copyright 2019-2020 Yaron Inc." Margin="54,131,57,124" HorizontalAlignment="Center" Width="168"/>
                     <Label Content="All Rights Reserved." Margin="77,158,77,100" HorizontalAlignment="Center" Width="125"/>
                     <Label Content="{Binding Version}" Margin="77,182,77,76" HorizontalAlignment="Center" Width="125" HorizontalContentAlignment="Center"/>
                     <Button Margin="127,211,122,41" HorizontalAlignment="Center" 

diff --git a/TIDALDL-UI/TIDALDL-UI/Properties/AssemblyInfo.cs b/TIDALDL-UI/TIDALDL-UI/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.13")]
-[assembly: AssemblyFileVersion("1.1.0.13")]
+[assembly: AssemblyVersion("1.1.0.14")]
+[assembly: AssemblyFileVersion("1.1.0.14")]
diff --git a/TIDALDL-UI/TIDALDL-UI/Tidal/TidalTool.cs b/TIDALDL-UI/TIDALDL-UI/Tidal/TidalTool.cs
@@ -140,6 +140,7 @@ static string get(string Path, out string Errmsg, Dictionary<string, string> Par
             if (Paras != null && Paras.ContainsKey("soundQuality") && Paras["soundQuality"].ToLower() == "lossless")
                 sSessionID = SESSIONID_PHONE;
 
+        POINT_RETURN:
             string sRet = (string)HttpHelper.GetOrPost(URL + Path + sParams, out Errmsg, Header: "X-Tidal-SessionId:" + sSessionID, Retry: RetryNum, IsErrResponse: true, Proxy: PROXY);
             if (!string.IsNullOrEmpty(Errmsg))
             {
@@ -148,6 +149,11 @@ static string get(string Path, out string Errmsg, Dictionary<string, string> Par
                 string sMessage = JsonHelper.GetValue(Errmsg, "userMessage");
                 if (sStatus.IsNotBlank() && sStatus == "404" && sSubStatus == "2001")
                     Errmsg = sMessage + ". This might be region-locked.";
+                else if (sStatus.IsNotBlank() && sStatus == "401" && sSubStatus == "4005")//'Asset is not ready for playback'
+                {
+                    sSessionID = SESSIONID_PHONE;
+                    goto POINT_RETURN;
+                }
                 else if (sStatus.IsNotBlank() && sStatus != "200")
                     Errmsg = sMessage + ". Get operation err!";
                 return null;