Release 1.8.5 (#90)

DSPaul · Feb 16, 2025 · 57255cb · 57255cb
2 parents fc126ef + e909177
commit 57255cb
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 26 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,12 @@
 # CHANGELOG
-## COMPASS v1.8.4 (12 February 2025)
+## COMPASS v1.8.5 (16 February 2025)
+
+### Fixes
+- Fix transparency issues then generating thumbnail from pdf (thanks @anthony-bernaert)
+- Fix issues with downloading cover for google drive files
+- Fix title scraped from websites containing html codes
+- Fix crash when selecting an item with a corrupt cover art file
+## COMPASS v1.8.4 (12 February 2025)
 
 ### Fixes
 - Fix crash when trying to import an unauthorized folder

diff --git a/Deployment/install.iss b/Deployment/install.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "COMPASS"
-#define MyAppVersion "1.8.4"
+#define MyAppVersion "1.8.5"
 #define MyAppPublisher "Paul De Smul"
 #define MyAppURL "https://www.compassapp.info"
 #define MyAppExeName "COMPASS.exe"

diff --git a/src/COMPASS.csproj b/src/COMPASS.csproj
@@ -15,8 +15,6 @@
   <ItemGroup>
     <None Remove="Media\CompassLogo.png" />
     <None Remove="gs\gsdll64.dll" />
-    <None Remove="gs\gsdll64.lib" />
-    <None Remove="gs\gswin64.exe" />
     <None Remove="gs\gswin64c.exe" />
   </ItemGroup>
 
@@ -28,14 +26,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
 
-    <Content Include="gs\gsdll64.lib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-
-    <Content Include="gs\gswin64.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-
     <Content Include="gs\gswin64c.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs
@@ -40,7 +40,7 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-[assembly: AssemblyVersion("1.8.4")]
+[assembly: AssemblyVersion("1.8.5")]
 [assembly: System.Runtime.Versioning.SupportedOSPlatform("windows")]
 
 
diff --git a/src/Services/IOService.cs b/src/Services/IOService.cs
@@ -32,6 +32,8 @@ public static class IOService
         public static async Task<byte[]> DownloadFileAsync(string uri)
         {
             using HttpClient client = new();
+            // Set headers to mimic a browser, gets around some auth issues
+            client.DefaultRequestHeaders.UserAgent.ParseAdd("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36");
 
             if (!Uri.TryCreate(uri, UriKind.Absolute, out Uri? _)) throw new InvalidOperationException("URI is invalid.");
             try

diff --git a/src/ViewModels/Sources/GenericOnlineSourceViewModel.cs b/src/ViewModels/Sources/GenericOnlineSourceViewModel.cs
@@ -6,6 +6,7 @@
 using HtmlAgilityPack;
 using System;
 using System.Diagnostics;
+using System.Net;
 using System.Threading.Tasks;
 
 namespace COMPASS.ViewModels.Sources
@@ -36,17 +37,17 @@ public override async Task<CodexDto> GetMetaData(SourceSet sources)
             CodexDto codex = new();
 
             // Title 
-            codex.Title = src.SelectSingleNode("//meta[@property='og:title']")?.GetAttributeValue("content", null) ?? codex.Title;
+            codex.Title = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:title']")?.GetAttributeValue("content", null) ?? codex.Title);
 
             // Authors
-            string? author = src.SelectSingleNode("//meta[@property='og:author']")?.GetAttributeValue("content", String.Empty);
+            string? author = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:author']")?.GetAttributeValue("content", String.Empty));
             if (!String.IsNullOrEmpty(author))
             {
                 codex.Authors = new() { author };
             }
 
             // Description
-            codex.Description = src.SelectSingleNode("//meta[@property='og:description']")?.GetAttributeValue("content", null) ?? codex.Description;
+            codex.Description = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:description']")?.GetAttributeValue("content", null) ?? codex.Description);
 
             // Tags
             foreach (var folderTagPair in TargetCollection.Info.FolderTagPairs)

diff --git a/src/ViewModels/Sources/GoogleDriveSourceViewModel.cs b/src/ViewModels/Sources/GoogleDriveSourceViewModel.cs
@@ -41,11 +41,26 @@ public override async Task<bool> FetchCover(Codex codex)
                 HtmlNode? src = doc?.DocumentNode;
                 if (src is null) return false;
 
-                string imgURL = src.SelectSingleNode("//meta[@property='og:image']").GetAttributeValue("content", String.Empty);
-                //cut of "=W***-h***-p" from URL that crops the image if it is present
-                if (imgURL.Contains('=')) imgURL = imgURL.Split('=')[0];
-                await CoverService.SaveCover(imgURL, codex);
-                return true;
+                string imgURL = "";
+                if (src.SelectSingleNode("//meta[@property='og:image']") is HtmlNode imgNode)
+                {
+                    imgURL = imgNode.GetAttributeValue("content", String.Empty);
+                    //cut of "=W***-h***-p" from URL that crops the image if it is present
+                    if (imgURL.Contains('=')) imgURL = imgURL.Split('=')[0];
+                }
+
+                else if (src.SelectSingleNode("//link[@id='texmex-thumb']") is HtmlNode linkNode)
+                {
+                    imgURL = linkNode.GetAttributeValue("href", String.Empty);
+                }
+
+                if (!string.IsNullOrEmpty(imgURL))
+                {
+                    await CoverService.SaveCover(imgURL, codex);
+                    return true;
+                }
+
+                return false;
             }
             catch (Exception ex)
             {

diff --git a/src/ViewModels/Sources/PdfSourceViewModel.cs b/src/ViewModels/Sources/PdfSourceViewModel.cs
@@ -93,8 +93,10 @@ public override async Task<bool> FetchCover(Codex codex)
                 {
                     await image.ReadAsync(codex.Sources.Path, ReadSettings);
                     image.Format = MagickFormat.Png;
-                    image.BackgroundColor = new MagickColor("#000000"); //set background color as transparent
-                    image.Trim(); //cut off all transparency
+
+                    //some pdf's are transparent, expecting a white page underneath
+                    image.BackgroundColor = new MagickColor("#FFFFFF");
+                    image.Alpha(AlphaOption.Remove);
 
                     await image.WriteAsync(codex.CoverArt);
                     CoverService.CreateThumbnail(codex, image);

diff --git a/src/Views/CodexInfoView.xaml b/src/Views/CodexInfoView.xaml
@@ -80,7 +80,7 @@
                             Width="200" Height="270" Margin="10">
                         <Border.Background>
                             <ImageBrush ImageSource="{Binding CoverArt, IsAsync=True ,Converter={StaticResource UriToBitmapConverter}, 
-                                Mode=OneWay, TargetNullValue=Media\\CoverPlaceholder.png}"/>
+                                ConverterParameter=True, Mode=OneWay, TargetNullValue=Media\\CoverPlaceholder.png}"/>
                         </Border.Background>
                         <Border.Effect>
                             <DropShadowEffect BlurRadius="10" ShadowDepth="0"/>

diff --git a/src/gs/gsdll64.dll b/src/gs/gsdll64.dll
diff --git a/src/gs/gsdll64.lib b/src/gs/gsdll64.lib
diff --git a/src/gs/gswin64.exe b/src/gs/gswin64.exe
diff --git a/src/gs/gswin64c.exe b/src/gs/gswin64c.exe
diff --git a/versionInfo.xml b/versionInfo.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.8.4</version>
-  <url>https://github.com/DSPAUL/COMPASS/releases/download/v1.8.4/COMPASS_Setup_1.8.4.exe</url>
+  <version>1.8.5</version>
+  <url>https://github.com/DSPAUL/COMPASS/releases/download/v1.8.5/COMPASS_Setup_1.8.5.exe</url>
   <mandatory>false</mandatory>
 </item>