diff --git a/App.config b/App.config index 7febd9f..2096945 100644 --- a/App.config +++ b/App.config @@ -7,7 +7,7 @@ - + diff --git a/Form1.cs b/Form1.cs index f05b1d0..16a65b4 100644 --- a/Form1.cs +++ b/Form1.cs @@ -401,8 +401,15 @@ public static void DownloadAlbum(string sUrl) { //Trim spaces and dots! szAlbumName = string - .Join("_", WebUtility.HtmlDecode(albumNameNode.InnerHtml).Split(Path.GetInvalidFileNameChars())) + .Join("_", WebUtility.HtmlDecode(albumNameNode.Text()).Split(Path.GetInvalidFileNameChars())) .Trim(new[] { ' ', '.' }); + //'info' hack. Remove the last words from inner child + if (albumNameNode.Children != null && albumNameNode.Children.Length > 0 && + szAlbumName.Length >= albumNameNode.Children[0].Text().Length) + { + szAlbumName = szAlbumName.Substring(0, szAlbumName.Length - albumNameNode.Children[0].Text().Length); + } + } else { diff --git a/KhinsiderDownloader.csproj b/KhinsiderDownloader.csproj index d9cf7e1..c547c67 100644 --- a/KhinsiderDownloader.csproj +++ b/KhinsiderDownloader.csproj @@ -39,8 +39,8 @@ icon.ico - - packages\AngleSharp.0.15.0\lib\net472\AngleSharp.dll + + packages\AngleSharp.1.0.7\lib\net472\AngleSharp.dll packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll @@ -60,12 +60,12 @@ packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll + + packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll packages\System.Text.Encodings.Web.5.0.0\lib\net461\System.Text.Encodings.Web.dll diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 7405bf3..fcf17d8 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.7.4.2")] -[assembly: AssemblyFileVersion("2.7.4.2")] +[assembly: AssemblyVersion("2.7.4.5")] +[assembly: AssemblyFileVersion("2.7.4.5")] diff --git a/packages.config b/packages.config index 26459fe..e80f560 100644 --- a/packages.config +++ b/packages.config @@ -1,13 +1,13 @@  - + - - + +