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
2 changes: 1 addition & 1 deletion docs/ENGINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Filee chooses engines automatically. Settings → *Engines* shows their status,
| PDFsharp | built in (library) | images → PDF, merge, split, page ranges, page organising, lossless rotate and crop-box edits, spreadsheet print-studio assembly, **compression** (smaller PDFs, see below), PDFs without their metadata |
| PDFium | built in (library) | PDF → images (multi-page TIFF/GIF supported) |
| Unhwp | built in (library) | HWP/HWPX → TXT, Markdown, HTML (pictures in a `<name>_files` folder next to the Markdown, embedded in the HTML) |
| Text & Markdown (Markdig) | built in (library) | **Markdown → HTML, TXT**; **TXT, LOG, PY, PAC, BAT, COMMAND, LUA, CSS, PS1, SQL → UTF-8 TXT**, preserving source text without running scripts (and → PDF / DOCX through the HWPX writer, rhwp or LibreOffice) |
| Text & Markdown (Markdig) | built in (library) | **Markdown → HTML, TXT**; **TXT, LOG, PY, PAC, BAT, CMD, COMMAND, LUA, CSS, PS1, SQL, AHK, INI, RSC → UTF-8 TXT**, preserving source text without running scripts (and → PDF / DOCX through the HWPX writer, rhwp or LibreOffice) |
| Spreadsheets (ExcelDataReader for XLS) | built in (library) | **XLSX, XLS, ODS, CSV, TSV → XLSX, ODS, CSV, TSV** (one CSV / TSV per sheet) |
| Office Open XML | built in | **DOCM / DOTX / DOTM ↔ DOCX, XLSM / XLTX ↔ XLSX, PPTM / POTX / POTM / PPSX ↔ PPTX** (macros removed for macro-free types) |
| Fonts | built in | **TTF, OTF, WOFF, WOFF2, EOT ↔ each other**; **FON (NE monochrome FNT v2/v3, supported single-byte charsets) → TTF, OTF, WOFF, WOFF2, EOT only**; CFF (PostScript) outlines become TrueType for TTF and EOT |
Expand Down
7 changes: 4 additions & 3 deletions src/Filee.Core/Formats/FormatRegistry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,10 @@ public static class FormatRegistry
new("sda", "SDA", FormatCategory.Presentation, ["sda", "sdd"], Writable: false),

// Plain text / markup
// Text logs, source/proxy scripts and style sheets are read as plain text, never executed (issues #273, #284, #254,
// #388, #368, #607).
new("txt", "TXT", FormatCategory.Text, ["txt", "log", "py", "pac", "bat", "command", "lua", "css", "ps1", "sql"]),
// Text logs, source/proxy scripts, style sheets and settings files are read as plain text, never executed (issues
// #273, #284, #254, #388, #368, #607, #536, #630, #661, #660).
new("txt", "TXT", FormatCategory.Text,
["txt", "log", "py", "pac", "bat", "cmd", "command", "lua", "css", "ps1", "sql", "ahk", "ini", "rsc"]),
new("md", "Markdown", FormatCategory.Text, ["md", "markdown"]),
new("html", "HTML", FormatCategory.Text, ["html", "htm", "xhtml"]),
// A web page saved with its pictures in one MIME file (Chrome, Edge, Word); read as the page it holds.
Expand Down
2 changes: 1 addition & 1 deletion src/Filee.Core/Settings/AppSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static bool IsFlipKeyAllowed(string key, IEnumerable<TriggerGesture> gest
public sealed class AppSettings
{
/// <summary>Current schema version. Increase when the format changes and add a migration.</summary>
public const int CurrentSchemaVersion = 48;
public const int CurrentSchemaVersion = 49;

public int SchemaVersion { get; set; } = CurrentSchemaVersion;

Expand Down
4 changes: 4 additions & 0 deletions src/Filee.Core/Settings/UserDataStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -889,6 +889,10 @@ public static bool ApplyToLibrary(int from, List<Preset> presets, List<ToolbarPr
// v48: fragmented MP4 pieces (.m4s) learn the video donut; custom claims stay put.
if (from < 48)
changed |= LearnExtensions(profiles, out _, ["m4s"]);
// v49: SQL (#607, which came without a migration), AutoHotkey, INI, RouterOS exports and .cmd batch scripts learn
// the text donut; custom claims stay put. (Schema 49 may be renumbered if another change takes it first.)
if (from < 49)
changed |= LearnExtensions(profiles, out _, ["sql", "ahk", "ini", "rsc", "cmd"]);
return changed;
}

Expand Down
27 changes: 25 additions & 2 deletions tests/Filee.Core.Tests/ScriptTextTests.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Lua and PowerShell scripts and CSS style sheets are plain text (issues #388, #368, #442): recognised, and learnt by
// existing text donuts.
// Lua, PowerShell, AutoHotkey and batch scripts, SQL, INI files, RouterOS exports and CSS style sheets are plain text
// (issues #388, #368, #442, #607, #536, #630, #661, #660): recognised, and learnt by existing text donuts.

using Filee.Core.Formats;
using Filee.Core.Presets;
Expand All @@ -14,6 +14,11 @@ public class ScriptTextTests
[InlineData("init.lua")]
[InlineData("site.css")]
[InlineData("Backup.ps1")]
[InlineData("Hotkeys.AHK")]
[InlineData("desktop.ini")]
[InlineData("router-export.rsc")]
[InlineData("install.cmd")]
[InlineData("query.sql")]
public void Scripts_and_style_sheets_are_text(string name) => Assert.Equal("txt", FormatRegistry.Detect(name)?.Id);

[Fact]
Expand Down Expand Up @@ -46,4 +51,22 @@ public void Version_38_text_donuts_learn_powershell_scripts()
Assert.Contains("ps1", profiles.Single(p => p.Id == "text").Extensions);
Assert.False(SettingsMigrations.ApplyToLibrary(39, presets, profiles));
}

[Fact]
public void Version_48_text_donuts_learn_sql_ahk_ini_rsc_and_cmd_without_taking_custom_claims()
{
string[] added = ["sql", "ahk", "ini", "rsc", "cmd"];
var presets = BuiltInData.CreatePresets();
var profiles = BuiltInData.CreateProfiles();
foreach (var profile in profiles)
profile.Extensions.RemoveAll(added.Contains);
profiles.Insert(0, new ToolbarProfile { Id = "my-router", Name = "Router", Extensions = ["rsc"] });

Assert.True(SettingsMigrations.ApplyToLibrary(48, presets, profiles));

var text = profiles.Single(p => p.Id == "text").Extensions;
Assert.All(added.Where(e => e != "rsc"), e => Assert.Contains(e, text));
Assert.DoesNotContain("rsc", text); // the user's own donut has it
Assert.False(SettingsMigrations.ApplyToLibrary(48, presets, profiles));
}
}
Loading