Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Create Installer

permissions:
contents: read
actions: read

on:
workflow_dispatch:
inputs:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: build and test

permissions:
contents: read
actions: read

on:
pull_request:
branches: [ main ]
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ Deployment/changes.md
*.coverage
Tests/coverage.cobertura.xml
Tests/report
/Tests/TestResults
1,274 changes: 639 additions & 635 deletions Changelog.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Deployment/install.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "COMPASS"
#define MyAppVersion "1.8.6"
#define MyAppVersion "1.8.7"
#define MyAppPublisher "Paul De Smul"
#define MyAppURL "https://www.compassapp.info"
#define MyAppExeName "COMPASS.exe"
Expand Down
20 changes: 10 additions & 10 deletions src/COMPASS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,28 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Autofac" Version="8.2.1" />
<PackageReference Include="Autofac" Version="8.3.0" />
<PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="DotNetSeleniumExtras.WaitHelpers" Version="3.11.0" />
<PackageReference Include="FuzzySharp" Version="2.0.2" />
<PackageReference Include="gong-wpf-dragdrop" Version="4.0.0" />
<PackageReference Include="HtmlAgilityPack" Version="1.12.0" />
<PackageReference Include="itext7" Version="9.1.0" />
<PackageReference Include="itext7.bouncy-castle-adapter" Version="9.1.0" />
<PackageReference Include="log4net" Version="3.0.4" />
<PackageReference Include="HtmlAgilityPack" Version="1.12.1" />
<PackageReference Include="itext7" Version="9.2.0" />
<PackageReference Include="itext7.bouncy-castle-adapter" Version="9.2.0" />
<PackageReference Include="log4net" Version="3.1.0" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.6.0" />
<PackageReference Include="Magick.NET.SystemDrawing" Version="8.0.6" />
<PackageReference Include="MaterialDesignThemes" Version="4.9.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.10.0.20241108" />
<PackageReference Include="OpenCvSharp4.Windows" Version="4.10.0.20241108" />
<PackageReference Include="OpenCvSharp4.Extensions" Version="4.11.0.20250507" />
<PackageReference Include="OpenCvSharp4.Windows" Version="4.11.0.20250507" />
<PackageReference Include="ScrapySharp" Version="3.0.0" />
<PackageReference Include="Selenium.Support" Version="4.31.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.31.0" />
<PackageReference Include="Selenium.Support" Version="4.33.0" />
<PackageReference Include="Selenium.WebDriver" Version="4.33.0" />
<PackageReference Include="SharpCompress" Version="0.39.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.3" />
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
<PackageReference Include="VirtualizingWrapPanel" Version="2.1.1" />
<PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
<PackageReference Include="ZXing.Net" Version="0.16.10" />
Expand Down
7 changes: 7 additions & 0 deletions src/Models/CodexCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ public void InitAsNew()
CreateDirectories();
}

public void Unload()
{
_loadedCodices = false;
_loadedInfo = false;
_loadedTags = false;
}

public void CreateDirectories()
{
try
Expand Down
2 changes: 1 addition & 1 deletion src/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
// app, or any theme specific resource dictionaries)
)]

[assembly: AssemblyVersion("1.8.6")]
[assembly: AssemblyVersion("1.8.7")]
[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows")]


1 change: 1 addition & 0 deletions src/ViewModels/CollectionViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public CodexCollection CurrentCollection
}
//save prev collection before switching
_currentCollection?.Save();
_currentCollection?.Unload();
SetProperty(ref _currentCollection!, value);
}
}
Expand Down
9 changes: 8 additions & 1 deletion src/ViewModels/FilterViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,14 @@ public void RemoveCodex(Codex c)
_excludedCodices.Remove(c);

//Changes to CollectionView Should always be done from dispatcher thread
App.SafeDispatcher.BeginInvoke(() => FilteredCodices?.Remove(c));
App.SafeDispatcher.BeginInvoke(() =>
{
try
{
FilteredCodices?.Remove(c);
}
catch { }
});
}

#endregion
Expand Down
2 changes: 1 addition & 1 deletion src/ViewModels/Sources/DndBeyondSourceViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public override async Task<bool> FetchCover(Codex codex)
HtmlNode? src = doc?.DocumentNode;
if (src is null) return false;

string imgURL = src.SelectSingleNode("//img[@class='product-hero-avatar__image']").GetAttributeValue("content", String.Empty);
string imgURL = src.SelectSingleNode("//img[@class='product-hero-avatar__image']")?.GetAttributeValue("content", String.Empty) ?? string.Empty;

//download the file
await CoverService.SaveCover(imgURL, codex);
Expand Down
4 changes: 2 additions & 2 deletions src/ViewModels/Sources/GenericOnlineSourceViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public override async Task<CodexDto> GetMetaData(SourceSet sources)
CodexDto codex = new();

// Title
codex.Title = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:title']")?.GetAttributeValue("content", null) ?? codex.Title);
codex.Title = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:title']")?.GetAttributeValue("content", codex.Title) ?? codex.Title);

// Authors
string? author = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:author']")?.GetAttributeValue("content", String.Empty));
Expand All @@ -47,7 +47,7 @@ public override async Task<CodexDto> GetMetaData(SourceSet sources)
}

// Description
codex.Description = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:description']")?.GetAttributeValue("content", null) ?? codex.Description);
codex.Description = WebUtility.HtmlDecode(src.SelectSingleNode("//meta[@property='og:description']")?.GetAttributeValue("content", codex.Description) ?? codex.Description);

// Tags
foreach (var folderTagPair in TargetCollection.Info.FolderTagPairs)
Expand Down
4 changes: 2 additions & 2 deletions versionInfo.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.8.6</version>
<url>https://github.com/DSPAUL/COMPASS/releases/download/v1.8.6/COMPASS_Setup_1.8.6.exe</url>
<version>1.8.7</version>
<url>https://github.com/DSPAUL/COMPASS/releases/download/v1.8.7/COMPASS_Setup_1.8.7.exe</url>
<mandatory>false</mandatory>
</item>