diff --git a/TIDALDL-UI/TIDALDL-UI.sln b/TIDALDL-UI/TIDALDL-UI.sln
index 29681e6a..222617ce 100644
--- a/TIDALDL-UI/TIDALDL-UI.sln
+++ b/TIDALDL-UI/TIDALDL-UI.sln
@@ -1,12 +1,10 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+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,18 +24,11 @@ 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
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {EE9828BC-5446-4422-83D6-9103517072A3}
+ EndGlobalSection
EndGlobal
diff --git a/TIDALDL-UI/TIDALDL-UI/App.config b/TIDALDL-UI/TIDALDL-UI/App.config
index fb5350eb..89222715 100644
--- a/TIDALDL-UI/TIDALDL-UI/App.config
+++ b/TIDALDL-UI/TIDALDL-UI/App.config
@@ -7,7 +7,7 @@
-
+
diff --git a/TIDALDL-UI/TIDALDL-UI/Else/DownloadItem.cs b/TIDALDL-UI/TIDALDL-UI/Else/DownloadItem.cs
index 7233830e..5956d352 100644
--- a/TIDALDL-UI/TIDALDL-UI/Else/DownloadItem.cs
+++ b/TIDALDL-UI/TIDALDL-UI/Else/DownloadItem.cs
@@ -220,7 +220,7 @@ public void DownloadTrack()
if (!TidalTool.ConvertMp4ToM4a(FilePath, out sNewName))
{
Errlabel = "Convert mp4 to m4a failed!";
- ErrlabelHeight = 15;
+ goto ERR_RETURN;
}
else
FilePath = sNewName;
diff --git a/TIDALDL-UI/TIDALDL-UI/Pages/LoginViewModel.cs b/TIDALDL-UI/TIDALDL-UI/Pages/LoginViewModel.cs
index cd2ea2d9..0ad60b1f 100644
--- a/TIDALDL-UI/TIDALDL-UI/Pages/LoginViewModel.cs
+++ b/TIDALDL-UI/TIDALDL-UI/Pages/LoginViewModel.cs
@@ -105,7 +105,7 @@ public async void Confirm()
TidalTool.PROXY = ProxyEnable ? new HttpHelper.ProxyInfo(ProxyHost, ProxyPort, ProxyUser, ProxyPwd) : null;
bool bRet = await Task.Run(() => { return TidalTool.login(Username, Password);});
if (!bRet)
- Errlabel = "Login Err!";
+ Errlabel = "Login Err! " + TidalTool.loginErrlabel;
else
{
//DEBUG
diff --git a/TIDALDL-UI/TIDALDL-UI/Properties/AssemblyInfo.cs b/TIDALDL-UI/TIDALDL-UI/Properties/AssemblyInfo.cs
index 3d17fd47..3f51a321 100644
--- 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.10")]
-[assembly: AssemblyFileVersion("1.1.0.10")]
+[assembly: AssemblyVersion("1.1.0.11")]
+[assembly: AssemblyFileVersion("1.1.0.11")]
diff --git a/TIDALDL-UI/TIDALDL-UI/TIDALDL-UI.csproj b/TIDALDL-UI/TIDALDL-UI/TIDALDL-UI.csproj
index fe56a115..870a91b4 100644
--- a/TIDALDL-UI/TIDALDL-UI/TIDALDL-UI.csproj
+++ b/TIDALDL-UI/TIDALDL-UI/TIDALDL-UI.csproj
@@ -1,7 +1,7 @@
-
-
+
+
Debug
@@ -76,17 +76,17 @@
..\packages\AIGS\AIGS.dll
-
- ..\packages\Costura.Fody.3.3.0\lib\net40\Costura.dll
+
+ ..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll
-
- ..\packages\SharpZipLib.1.1.0\lib\net45\ICSharpCode.SharpZipLib.dll
+
+ ..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll
-
- ..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll
+
+ ..\packages\MaterialDesignColors.1.2.2\lib\net45\MaterialDesignColors.dll
-
- ..\packages\MaterialDesignThemes.2.5.1\lib\net45\MaterialDesignThemes.Wpf.dll
+
+ ..\packages\MaterialDesignThemes.3.0.1\lib\net45\MaterialDesignThemes.Wpf.dll
@@ -99,11 +99,11 @@
..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll
-
- ..\packages\PropertyChanged.Fody.2.6.0\lib\net452\PropertyChanged.dll
+
+ ..\packages\PropertyChanged.Fody.3.2.4\lib\net40\PropertyChanged.dll
-
- ..\packages\Stylet.1.1.22\lib\net45\Stylet.dll
+
+ ..\packages\Stylet.1.3.0\lib\net45\Stylet.dll
@@ -144,6 +144,10 @@
SearchView.xaml
+
+ ShellView.xaml
+
+
@@ -235,6 +239,10 @@
MSBuild:Compile
Designer
+
+ MSBuild:Compile
+ Designer
+
@@ -269,13 +277,15 @@
+
- 此项目引用这台计算机上缺少的 NuGet 程序包。使用 NuGet 程序包还原可下载这些程序包。有关详细信息，请参阅 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
+ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/TIDALDL-UI/TIDALDL-UI/Tidal/TidalTool.cs b/TIDALDL-UI/TIDALDL-UI/Tidal/TidalTool.cs
index 361d56bd..34f1dc99 100644
--- a/TIDALDL-UI/TIDALDL-UI/Tidal/TidalTool.cs
+++ b/TIDALDL-UI/TIDALDL-UI/Tidal/TidalTool.cs
@@ -10,6 +10,7 @@
using TagLib;
using TIDALDL_UI.Else;
using System.Windows.Data;
+using System.Text.RegularExpressions;
namespace Tidal
{
@@ -47,6 +48,7 @@ public static void logout()
ISLOGIN = false;
}
+ public static string loginErrlabel = "";
public static bool login(string UserName, string Password)
{
if (ISLOGIN)
@@ -67,8 +69,12 @@ public static bool login(string UserName, string Password)
if (ISLOGIN)
return true;
if (Errmsg.IsNotBlank())
+ {
+ loginErrlabel = AIGS.Helper.JsonHelper.GetValue(Errmsg, "userMessage");
+ if (loginErrlabel == null)
+ loginErrlabel = Errmsg;
return false;
-
+ }
if (i == 0)
SessID1 = JsonHelper.GetValue(sRet, "sessionId");
else
@@ -690,10 +696,17 @@ public static string getAlbumFolder(string basePath, Album album)
public static string getAlbumCoverPath(string basePath,Album album)
{
- string sRet = string.Format("{0}/Album/{1}/{2}/{2}.jpg", basePath, formatPath(album.Artist.Name), formatPath(album.Title));
+ string sAlbumDir = getAlbumFolder(basePath, album);
+ string title = Regex.Replace(album.Title.Replace("（", "(").Replace("）", ")"), @"\([^\(]*\)", "");
+ string sRet = string.Format("{0}/{1}.jpg", sAlbumDir, formatPath(title));
+ if (sRet.Length >= 260)
+ {
+ int iLen = sRet.Length - 260;
+ sRet = string.Format("{0}/{1}.jpg", sAlbumDir, formatPath(title).Substring(0, formatPath(title).Length - iLen));
+ }
return Path.GetFullPath(sRet);
}
-
+
public static string getTrackPath(string basePath, Album album, Track track, string sdlurl, bool hyphen=false, Playlist plist=null, string trackTitle = null, bool artistBeforeTitle = false)
{
string sArtistStr = "";
diff --git a/TIDALDL-UI/TIDALDL-UI/packages.config b/TIDALDL-UI/TIDALDL-UI/packages.config
index 16a79e45..186cf2ef 100644
--- a/TIDALDL-UI/TIDALDL-UI/packages.config
+++ b/TIDALDL-UI/TIDALDL-UI/packages.config
@@ -1,13 +1,13 @@
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/TIDALDL-UI/TIDALDL-UI/updateLog.md b/TIDALDL-UI/TIDALDL-UI/updateLog.md
index 5dc988d4..25ea8fde 100644
--- a/TIDALDL-UI/TIDALDL-UI/updateLog.md
+++ b/TIDALDL-UI/TIDALDL-UI/updateLog.md
@@ -1,4 +1,8 @@
-#### v1.1.0.10
+#### v1.1.0.11
+- Fix bug of download artwork
+- Show errlabel when login err
+
+#### v1.1.0.10
- Get ep&singles
- Check if song is downloaded already
- Fix bug of login