Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Merge main: OCR took settings schema 40, the image aliases move to 41

KnifeLemona90619c27dda
diff --cc src/Filee.Core/Settings/AppSettings.cs
index 0e732dd0,0e732dd0..78ffca50
--- a/src/Filee.Core/Settings/AppSettings.cs
+++ b/src/Filee.Core/Settings/AppSettings.cs
@@@ -112,7 -112,7 +112,7 @@@ public sealed class DonutSetting
public sealed class AppSettings
{
/// <summary>Current schema version. Increase when the format changes and add a migration.</summary>
-- public const int CurrentSchemaVersion = 40;
++ public const int CurrentSchemaVersion = 41;
public int SchemaVersion { get; set; } = CurrentSchemaVersion;
diff --cc src/Filee.Core/Settings/UserDataStore.cs
index eed3daed,048dc125..19a310b4
--- a/src/Filee.Core/Settings/UserDataStore.cs
+++ b/src/Filee.Core/Settings/UserDataStore.cs
@@@ -797,9 -797,13 +797,16 @@@ internal static class SettingsMigration
// v39: PowerShell scripts (.ps1) learn the text donut; custom claims stay put.
if (from < 39)
changed |= LearnExtensions(profiles, out _, ["ps1"]);
- // v40: PNG/JPEG download aliases learn the images donut; custom claims stay put.
- if (from < 40)
+ // v40: "Searchable PDF" (text recognition), after "Compress PDF" as in a new library, on no donut.
+ if (from < 40 && !presets.Any(p => p.Id == "searchable-pdf"))
+ {
+ var at = presets.FindIndex(p => p.Id == "compress-pdf");
+ presets.Insert(at < 0 ? presets.Count : at + 1, BuiltInData.OcrPresets().Single());
+ changed = true;
+ }
++ // v41: PNG/JPEG download aliases learn the images donut; custom claims stay put.
++ if (from < 41)
+ changed |= LearnExtensions(profiles, out _, ["png_large", "jpg_large"]);
return changed;
}
diff --cc tests/Filee.Core.Tests/ImageExtensionAliasTests.cs
index 431514c9,00000000..867a4a68
mode 100644,000000..100644
--- a/tests/Filee.Core.Tests/ImageExtensionAliasTests.cs
+++ b/tests/Filee.Core.Tests/ImageExtensionAliasTests.cs
@@@ -1,78 -1,0 +1,78 @@@
+// PNG/JPEG download aliases are recognised and learnt by image profiles without taking custom claims.
+
+using Filee.Core.Formats;
+using Filee.Core.Presets;
+using Filee.Core.Profiles;
+using Filee.Core.Settings;
+
+namespace Filee.Core.Tests;
+
+public class ImageExtensionAliasTests
+{
+ [Theory]
+ [InlineData("photo.png_large", "png")]
+ [InlineData("photo.jpg_large", "jpg")]
+ [InlineData("photo.PnG_LaRgE", "png")]
+ [InlineData("photo.JpG_LaRgE", "jpg")]
+ public void Large_image_extensions_resolve_to_the_existing_format(string file, string format) =>
+ Assert.Same(FormatRegistry.Get(format), FormatRegistry.Detect(file));
+
+ [Fact]
+ public void An_unknown_large_extension_is_not_detected() =>
+ Assert.Null(FormatRegistry.Detect("file.unknown_large"));
+
+ [Fact]
+ public void Fresh_image_profiles_take_both_aliases()
+ {
+ var profiles = BuiltInData.CreateProfiles();
+
+ Assert.Equal("images", ProfileSelector.Select(profiles, ["photo.png_large", "photo.JpG_LaRgE"])?.Id);
+ }
+
+ [Fact]
- public void Version_39_libraries_learn_both_aliases_once()
++ public void Version_40_libraries_learn_both_aliases_once()
+ {
+ var presets = BuiltInData.CreatePresets();
+ var profiles = BuiltInData.CreateProfiles();
+ var images = profiles.Single(p => p.Id == "images");
+ images.Extensions.RemoveAll(e => e is "png_large" or "jpg_large" or "png");
+
- Assert.True(SettingsMigrations.ApplyToLibrary(39, presets, profiles));
++ Assert.True(SettingsMigrations.ApplyToLibrary(40, presets, profiles));
+
+ Assert.Contains("png_large", images.Extensions);
+ Assert.Contains("jpg_large", images.Extensions);
+ Assert.DoesNotContain("png", images.Extensions);
- Assert.False(SettingsMigrations.ApplyToLibrary(39, presets, profiles));
++ Assert.False(SettingsMigrations.ApplyToLibrary(40, presets, profiles));
+ }
+
+ [Theory]
+ [InlineData("PNG_LARGE", "jpg_large")]
+ [InlineData("JPG_LARGE", "png_large")]
- public void Version_39_libraries_preserve_custom_alias_claims(string claimed, string learned)
++ public void Version_40_libraries_preserve_custom_alias_claims(string claimed, string learned)
+ {
+ using var dir = new TempDir();
+ var store = new UserDataStore(dir.Path);
+ store.Load();
- store.Settings.SchemaVersion = 39;
++ store.Settings.SchemaVersion = 40;
+ foreach (var profile in store.Profiles)
+ profile.Extensions.RemoveAll(e => e is "png_large" or "jpg_large");
+ store.Profiles.Add(new ToolbarProfile { Id = "my-photos", Extensions = [claimed] });
+ store.SaveLibrary();
+ store.SaveSettings();
+
+ var upgraded = new UserDataStore(dir.Path);
+ upgraded.Load();
+
+ var images = upgraded.Profiles.Single(p => p.Id == "images");
+ Assert.Contains(learned, images.Extensions);
+ Assert.False(images.Matches(claimed));
+ Assert.Equal("my-photos", ProfileSelector.Select(upgraded.Profiles, ["photo." + claimed])?.Id);
+ Assert.Equal(AppSettings.CurrentSchemaVersion, upgraded.Settings.SchemaVersion);
+
+ var reloaded = new UserDataStore(dir.Path);
+ reloaded.Load();
+ Assert.Contains(learned, reloaded.Profiles.Single(p => p.Id == "images").Extensions);
+ Assert.Equal("my-photos", Assert.Single(reloaded.Profiles, p => p.Matches(claimed)).Id);
+ Assert.Equal(AppSettings.CurrentSchemaVersion, reloaded.Settings.SchemaVersion);
+ }
+}