upload new version

yaronzz · May 4, 2020 · 9d652ff · 9d652ff
1 parent 0dbd098
commit 9d652ff
Show file tree

Hide file tree

Showing 15 changed files with 172 additions and 167 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.23.0",
+    version="2020.5.4.0",
     license="Apache2",
     description = "Tidal Music Downloader.",
 

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, printWarning, LOG
 
-TIDAL_DL_VERSION = "2020.3.23.0"
+TIDAL_DL_VERSION = "2020.5.4.0"
 
 
 def logIn(username="", password=""):

diff --git a/TIDALDL-PY/updatelog.md b/TIDALDL-PY/updatelog.md
@@ -1,3 +1,6 @@
+#### 2020-05-04
+- Hide password
+
 #### 2020-03-23
 - Fix downloading redirects that can be obtained through the
   /playbackinfopostpaywall method.

diff --git a/TIDALDL-UI/TIDALDL-UI.sln b/TIDALDL-UI/TIDALDL-UI.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TIDALDL-UI", "TIDALDL-UI\TIDALDL-UI.csproj", "{87F39F78-056F-4747-A835-12BA03FE575A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AIGS", "..\..\..\AIGS.git\trunk\AIGS.csproj", "{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -26,16 +24,6 @@ Global
 		{87F39F78-056F-4747-A835-12BA03FE575A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{87F39F78-056F-4747-A835-12BA03FE575A}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
 		{87F39F78-056F-4747-A835-12BA03FE575A}.SingleImage|Any CPU.Build.0 = Release|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
-		{E0F1B398-B4D4-4536-9135-BE2EB077BBB2}.SingleImage|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TIDALDL-UI/TIDALDL-UI/Else/Config.cs b/TIDALDL-UI/TIDALDL-UI/Else/Config.cs
@@ -158,7 +158,7 @@ public static string SearchNum(string Setvalue = null)
 
         public static string Username(string Setvalue = null)
         {
-            return SetOrGetPrivate("username", Setvalue, "");
+            return SetOrGet("username", Setvalue, "");
         }
 
         public static string Password(string Setvalue = null)
@@ -267,7 +267,7 @@ public static List<Property> HistoryAccounts()
             int iNum      = AIGS.Common.Convert.ConverStringToInt(sValue, 0);
             for (int i = 0; i < iNum; i++)
             {
-                string sUser = SetOrGetPrivate("historyuser" + i, null, "", HISTORYGROUP);
+                string sUser = SetOrGet("historyuser" + i, null, "", HISTORYGROUP);
                 string sPwd  = SetOrGetPrivate("historypwd" + i, null, "", HISTORYGROUP);
                 if (sUser.IsNotBlank() && pRet.FindIndex((Property user) => user.Key.ToString() == sUser) < 0)
                     pRet.Add(new Property(sUser, sPwd));
@@ -288,7 +288,7 @@ public static void AddHistoryAccount(string sUsername, string sPassword)
             pArray.Insert(0, new Property(sUsername, sPassword));
             for (int i = 0; i < pArray.Count; i++)
             {
-                SetOrGetPrivate("historyuser" + i, pArray[i].Key.ToString(), "", HISTORYGROUP);
+                SetOrGet("historyuser" + i, pArray[i].Key.ToString(), "", HISTORYGROUP);
                 SetOrGetPrivate("historypwd" + i, pArray[i].Value.ToString(), "", HISTORYGROUP);
             }
             SetOrGet("historyusernum", pArray.Count.ToString(), "", HISTORYGROUP);

diff --git a/TIDALDL-UI/TIDALDL-UI/Pages/InfoView.xaml b/TIDALDL-UI/TIDALDL-UI/Pages/InfoView.xaml
@@ -70,10 +70,11 @@
                           materialDesign:DataGridAssist.ColumnHeaderPadding="4" GridLinesVisibility="Horizontal"
                           VerticalGridLinesBrush="#FFDEDEDE" RowHeaderWidth="80" BorderThickness="0" Height="Auto">
                     <DataGrid.Columns>
-                        <DataGridCheckBoxColumn Binding="{Binding Check}" Header="Check" ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}" EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"/>
+                        <DataGridCheckBoxColumn Binding="{Binding Check}" Header="#" ElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnStyle}" EditingElementStyle="{StaticResource MaterialDesignDataGridCheckBoxColumnEditingStyle}"/>
                         <DataGridTextColumn Header="#" Width="40" Binding="{Binding Number}" IsReadOnly="True"/>
-                        <DataGridTextColumn Header="TITLE" Width="230" Binding="{Binding Title}" IsReadOnly="True"/>
-                        <DataGridTextColumn Header="ALBUM" Width="130" Binding="{Binding AlbumTitle}" IsReadOnly="True"/>
+                        <DataGridTextColumn Header="#" Width="40" Binding="{Binding Flag}" IsReadOnly="True"/>
+                        <DataGridTextColumn Header="TITLE" Width="205" Binding="{Binding Title}" IsReadOnly="True"/>
+                        <DataGridTextColumn Header="ALBUM" Width="115" Binding="{Binding AlbumTitle}" IsReadOnly="True"/>
                         <DataGridTextColumn Header="TIME" Binding="{Binding Duration}" IsReadOnly="True"/>
                     </DataGrid.Columns>
                 </DataGrid>

diff --git a/TIDALDL-UI/TIDALDL-UI/Pages/InfoViewModel.cs b/TIDALDL-UI/TIDALDL-UI/Pages/InfoViewModel.cs
@@ -19,15 +19,17 @@ public class InfoItem : Screen
         public int    Number { get; set; }
         public string Title { get; set; }
         public string Type { get; set; }
+        public string Flag { get; set; }
         public string Duration { get; set; }
         public string AlbumTitle { get; set; }
         public bool   Check { get; set; }
         public object Data { get; set; }
 
-        public InfoItem(int number, string title, string duration, string albumtitle,object data = null, string type="TRACK")
+        public InfoItem(int number, string title, string duration, string albumtitle,object data = null, string type="TRACK", string flag = "")
         {
             Check      = true;
             Number     = number;
+            Flag       = flag;
             Title      = title;
             Type       = type;
             Duration   = duration;
@@ -81,7 +83,7 @@ public object Load(object data)
                 if (plist.Tracks != null)
                 {
                     foreach (Track item in plist.Tracks)
-                        ItemList.Add(new InfoItem(plist.Tracks.IndexOf(item) + 1, item.Title, TimeHelper.ConverIntToString(item.Duration), item.Album.Title, item));
+                        ItemList.Add(new InfoItem(plist.Tracks.IndexOf(item) + 1, item.Title, TimeHelper.ConverIntToString(item.Duration), item.Album.Title, item, flag:TidalTool.getFlag(item)));
                 }
                 if (plist.Videos != null)
                 {
@@ -101,7 +103,7 @@ public object Load(object data)
                 if (artist.Albums != null)
                 {
                     foreach (Album item in artist.Albums)
-                        ItemList.Add(new InfoItem(artist.Albums.IndexOf(item) + 1, item.Title, TimeHelper.ConverIntToString(item.Duration), item.Title, item, "ALBUM"));
+                        ItemList.Add(new InfoItem(artist.Albums.IndexOf(item) + 1, item.Title, TimeHelper.ConverIntToString(item.Duration), item.Title, item, "ALBUM", flag: TidalTool.getFlag(item)));
                 }
             }
             else if (data.GetType() == typeof(Album))
@@ -116,7 +118,7 @@ public object Load(object data)
                 if (album.Tracks != null)
                 {
                     foreach (Track item in album.Tracks)
-                        ItemList.Add(new InfoItem(item.TrackNumber, item.Title, TimeHelper.ConverIntToString(item.Duration), item.Album.Title, item));
+                        ItemList.Add(new InfoItem(item.TrackNumber, item.Title, TimeHelper.ConverIntToString(item.Duration), item.Album.Title, item, flag: TidalTool.getFlag(item)));
                 }
                 if (album.Videos != null)
                 {

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.15")]
-[assembly: AssemblyFileVersion("1.1.0.15")]
+[assembly: AssemblyVersion("1.1.0.16")]
+[assembly: AssemblyFileVersion("1.1.0.16")]
diff --git a/TIDALDL-UI/TIDALDL-UI/TIDALDL-UI.csproj.user b/TIDALDL-UI/TIDALDL-UI/TIDALDL-UI.csproj.user
@@ -2,5 +2,13 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>zh-CN</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
   </PropertyGroup>
 </Project>
diff --git a/TIDALDL-UI/TIDALDL-UI/updateLog.md b/TIDALDL-UI/TIDALDL-UI/updateLog.md
@@ -1,4 +1,7 @@
-- Encrypt user-password
+#### v1.1.0.16
+- hide password
+- Use track number(settings)
+- Album\Artist Info page add column-quality 'M'
 
 #### v1.1.0.15
 - Fix bug of Multithreading-Download model

diff --git a/TIDALDL-UI/packages/AIGS/AIGS.dll b/TIDALDL-UI/packages/AIGS/AIGS.dll
diff --git a/TIDALDL-UI/packages/Costura.Fody.4.1.0/lib/net40/Costura.xml b/TIDALDL-UI/packages/Costura.Fody.4.1.0/lib/net40/Costura.xml