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.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
Merge main into feature/clip-trim (schema 44, after FITS)
KnifeLemoncde1535b7ce0
diff --cc src/Filee.Core/Presets/BuiltInData.csindex 4319e501,07d58294..003101cc--- a/src/Filee.Core/Presets/BuiltInData.cs+++ b/src/Filee.Core/Presets/BuiltInData.cs@@@ -120,19 -119,6 +120,19 @@@ public static class BuiltInDatnew() { Id = "motion-photo-android", NameKey = "preset.motion_photo_android", TargetFormat = "jpg", Media = { LivePhoto = LivePhotoKind.Android } },];+ /// <summary>- /// "Cut a clip" (added in settings schema 43): a part of a video, chosen on a timeline, as a file of its own. First on++ /// "Cut a clip" (added in settings schema 44): a part of a video, chosen on a timeline, as a file of its own. First on+ /// the back of the video donut, as "Crop" is on the images donut.+ /// </summary>+ public static List<Preset> ClipPresets() =>+ [+ new()+ {+ Id = "tool-clip", NameKey = "preset.clip", TargetFormat = SameAsSource,+ Kind = PresetKind.Tool, Tool = Preset.ClipTool, Output = { FileNamePattern = "{name}_clip" },+ },+ ];+/// <summary>/// "Trim transparent borders" (issue #332, added in settings schema 33): a copy cropped to the visible pixels, in the/// same format. On the images donut's back face after "Remove background".diff --cc src/Filee.Core/Settings/AppSettings.csindex 65c287f4,65c287f4..f9baf498--- a/src/Filee.Core/Settings/AppSettings.cs+++ b/src/Filee.Core/Settings/AppSettings.cs@@@ -123,7 -123,7 +123,7 @@@ public sealed class DonutSettingpublic sealed class AppSettings{/// <summary>Current schema version. Increase when the format changes and add a migration.</summary>-- public const int CurrentSchemaVersion = 43;++ public const int CurrentSchemaVersion = 44;public int SchemaVersion { get; set; } = CurrentSchemaVersion;diff --cc src/Filee.Core/Settings/UserDataStore.csindex 603cf68f,8c9d1f46..f73093a7--- a/src/Filee.Core/Settings/UserDataStore.cs+++ b/src/Filee.Core/Settings/UserDataStore.cs@@@ -836,13 -836,10 +836,17 @@@ internal static class SettingsMigrationchanged = true;}}- // v43: "Cut a clip" (a part of a video as a file of its own), after "Motion Photo (Android)" as in a new library,+ // v43: FITS astronomy pictures (.fits, .fts) learn the images donut; custom claims stay put. (Schema 43 may be+ // renumbered if another change takes it first.)+ if (from < 43)+ changed |= LearnExtensions(profiles, out _, ["fits", "fts"]);++ // v44: "Cut a clip" (a part of a video as a file of its own), after "Motion Photo (Android)" as in a new library,+ // and first on the back of the video donut in place of FLAC (which stays in the library), when the user+ // hasn't put it elsewhere on the donut and the face has room.- // Present already but saved since by a Filee before 43: that one dropped the tool's name, which made it a++ // Present already but saved since by a Filee before 44: that one dropped the tool's name, which made it a+ // crop, so it is put back. The user's own changes (name, file name pattern) stay.- if (from < 43)++ if (from < 44)+ changed |= AddClipTool(presets, profiles);return changed;}diff --cc tests/Filee.Core.Tests/ClipToolTests.csindex 1a189767,00000000..bb998eeamode 100644,000000..100644--- a/tests/Filee.Core.Tests/ClipToolTests.cs+++ b/tests/Filee.Core.Tests/ClipToolTests.cs@@@ -1,283 -1,0 +1,283 @@@+// "Cut a clip": the range kept inside the video, the times as shown and as FFmpeg reads them, the conversion the tool- // becomes, and the preset arriving in libraries from before it (settings schema 43).++// becomes, and the preset arriving in libraries from before it (settings schema 44).++using System.Globalization;+using System.Text.Json;+using Filee.Core.Conversion;+using Filee.Core.Presets;+using Filee.Core.Profiles;+using Filee.Core.Settings;++namespace Filee.Core.Tests;++public class ClipToolTests+{+ // ───────────────────────── Times ─────────────────────────++ [Theory]+ [InlineData(0, "0:00.0")]+ [InlineData(7.5, "0:07.5")]+ [InlineData(7.54, "0:07.5")]+ [InlineData(7.55, "0:07.6")]+ [InlineData(59.96, "1:00.0")]+ [InlineData(245, "4:05.0")]+ [InlineData(599.9, "9:59.9")]+ [InlineData(3725.3, "1:02:05.3")]+ [InlineData(-3, "0:00.0")]+ [InlineData(double.NaN, "0:00.0")]+ public void Times_show_as_minutes_seconds_and_tenths(double seconds, string expected) =>+ Assert.Equal(expected, ClipRange.Display(seconds));++ [Theory]+ [InlineData("ru")]+ [InlineData("ar")]+ [InlineData("de")]+ public void Times_never_take_the_languages_decimal_comma(string culture)+ {+ var before = CultureInfo.CurrentCulture;+ try+ {+ CultureInfo.CurrentCulture = new CultureInfo(culture);+ Assert.Equal("1:05.3", ClipRange.Display(65.3));+ Assert.Equal("65.300", ClipRange.Ffmpeg(65.3));+ }+ finally+ {+ CultureInfo.CurrentCulture = before;+ }+ }++ [Theory]+ [InlineData(0, "0.000")]+ [InlineData(12.3456, "12.346")]+ [InlineData(600, "600.000")]+ [InlineData(-1, "0.000")]+ [InlineData(double.PositiveInfinity, "0.000")]+ public void Ffmpeg_reads_seconds_with_three_decimals(double seconds, string expected) =>+ Assert.Equal(expected, ClipRange.Ffmpeg(seconds));++ // ───────────────────────── The range ─────────────────────────++ [Fact]+ public void A_clip_inside_the_video_stays_as_it_is() =>+ Assert.Equal(new ClipRange(12.5, 42.5), ClipRange.Clamp(12.5, 42.5, 600));++ [Fact]+ public void The_end_never_goes_past_the_video()+ {+ var clip = ClipRange.Clamp(580, 640, 600);+ Assert.Equal(new ClipRange(580, 600), clip);+ Assert.Equal(20, clip.Length);+ }++ [Fact]+ public void The_start_is_never_before_the_video_or_after_the_end()+ {+ Assert.Equal(new ClipRange(0, 10), ClipRange.Clamp(-5, 10, 600));+ // Given the wrong way round: swapped.+ Assert.Equal(new ClipRange(10, 30), ClipRange.Clamp(30, 10, 600));+ }++ [Fact]+ public void A_clip_is_never_shorter_than_the_least_length()+ {+ Assert.Equal(new ClipRange(5, 5 + ClipRange.MinLength), ClipRange.Clamp(5, 5, 600));+ // At the very end it grows backwards.+ var atEnd = ClipRange.Clamp(600, 600, 600);+ Assert.Equal(600, atEnd.End);+ Assert.Equal(600 - ClipRange.MinLength, atEnd.Start, 6);+ // Past the end altogether: the video's last moment.+ var past = ClipRange.Clamp(700, 800, 600);+ Assert.Equal(600, past.End);+ Assert.True(past.Start < past.End);+ }++ [Fact]+ public void Without_a_known_duration_only_the_start_is_kept_at_zero()+ {+ Assert.Equal(new ClipRange(0, 30), ClipRange.Clamp(-1, 30, null));+ Assert.Equal(new ClipRange(100, 130), ClipRange.Clamp(100, 130, 0));+ Assert.Equal(new ClipRange(4, 4 + ClipRange.MinLength), ClipRange.Clamp(4, double.NaN, null));+ Assert.Equal(new ClipRange(0, 600), ClipRange.Clamp(double.NaN, double.NaN, 600));+ }++ // ───────────────────────── The conversion ─────────────────────────++ private static Preset Tool() => BuiltInData.CreatePresets().Single(p => p.Id == "tool-clip");++ [Fact]+ public void The_built_in_tool_names_its_clips_name_clip_and_copies_by_default()+ {+ var tool = Tool();+ Assert.True(tool.IsTool);+ Assert.True(tool.IsClipTool);+ Assert.False(tool.IsCropTool);+ Assert.Equal("preset.clip", tool.NameKey);+ Assert.Equal("{name}_clip", tool.Output.FileNamePattern);+ Assert.False(tool.Media.ExactCut);+ Assert.Null(tool.Media.Clip);+ // The crop tool stays the crop, also as saved before tools had names.+ var crop = BuiltInData.CreatePresets().Single(p => p.Id == "tool-crop");+ Assert.True(crop.IsCropTool);+ Assert.False(crop.IsClipTool);+ Assert.True(new Preset { Kind = PresetKind.Tool, Tool = "crop" }.IsCropTool);+ // A tool from a newer Filee is neither.+ var unknown = new Preset { Kind = PresetKind.Tool, Tool = "stabilize" };+ Assert.False(unknown.IsCropTool || unknown.IsClipTool);+ }++ [Fact]+ public void The_tool_becomes_a_conversion_of_the_clip_into_the_target()+ {+ var tool = Tool();+ tool.Name = "Highlights";+ tool.Media.ExactCut = true;+ tool.Media.Quality = MediaQuality.Small;+ tool.Media.LivePhoto = LivePhotoKind.Apple; // a hand-edited file: never a Live Photo of the clip++ var conversion = ClipTool.ConversionOf(tool, "mkv", new ClipRange(12.5, 42.5));++ Assert.Equal(PresetKind.Convert, conversion.Kind);+ Assert.False(conversion.IsTool);+ Assert.Null(conversion.Tool);+ Assert.Equal("mkv", conversion.TargetFormat);+ var part = Assert.Single(conversion.Media.Clip!.Parts);+ Assert.Equal((12.5, 42.5), (part.Start, part.End));+ Assert.True(conversion.Media.ExactCut);+ Assert.Equal(MediaQuality.Small, conversion.Media.Quality);+ Assert.Equal(LivePhotoKind.None, conversion.Media.LivePhoto);+ Assert.Equal(("tool-clip", "Highlights", "{name}_clip"), (conversion.Id, conversion.Name, conversion.Output.FileNamePattern));+ Assert.True(conversion.CutsClipOf("mp4"));+ Assert.False(conversion.CutsClipOf("mp3")); // only videos+ // The tool itself is untouched.+ Assert.True(tool.IsClipTool);+ Assert.Null(tool.Media.Clip);+ Assert.False(new Preset { TargetFormat = "mp4" }.CutsClipOf("mp4"));+ }++ [Fact]+ public void A_clip_keeps_the_videos_format_where_one_engine_writes_it_else_mp4()+ {+ var videos = new FakeConverter("ffmpeg", new ConversionEdge("mp4", "mp4"), new ConversionEdge("mkv", "mkv"), new ConversionEdge("mkv", "mp4"),+ new ConversionEdge("rm", "mp4"));+ var planner = new ConverterCatalog([videos]).CreatePlanner();++ Assert.Equal("mp4", ClipTool.TargetFor("mp4", planner));+ Assert.Equal("mkv", ClipTool.TargetFor("mkv", planner));+ Assert.Equal("mp4", ClipTool.TargetFor("rm", planner)); // RealVideo can't be written+ Assert.True(ClipTool.CanCut("rm", planner));+ Assert.False(ClipTool.CanCut("mov", planner)); // no engine reads it here+ Assert.False(ClipTool.CanCut("mp3", planner)); // not a video+ }++ [Fact]+ public void Clip_options_survive_saving_and_the_times_never_reach_a_saved_tool()+ {+ var tool = Tool();+ tool.Media.ExactCut = true;+ var json = JsonSerializer.Serialize(new List<Preset> { tool }, FileeJsonContext.Default.ListPreset);+ Assert.Contains("\"tool\": \"clip\"", json);+ Assert.DoesNotContain("\"clip\":", json); // the times of a clip, never on the tool++ var read = JsonSerializer.Deserialize(json, FileeJsonContext.Default.ListPreset)!.Single();+ Assert.True(read.IsClipTool);+ Assert.True(read.Media.ExactCut);++ // A conversion of a clip (kept in the history for "Retry") keeps its times.+ var conversion = ClipTool.ConversionOf(read, "mp4", new ClipRange(1, 2));+ var again = JsonSerializer.Deserialize(JsonSerializer.Serialize(new List<Preset> { conversion }, FileeJsonContext.Default.ListPreset),+ FileeJsonContext.Default.ListPreset)!.Single();+ Assert.Equal((1.0, 2.0), (again.Media.Clip!.Parts[0].Start, again.Media.Clip.Parts[0].End));+ // Other presets don't write a tool at all.+ Assert.DoesNotContain("\"tool\"", JsonSerializer.Serialize(new List<Preset> { new() { TargetFormat = "png" } }, FileeJsonContext.Default.ListPreset));+ }+- // ───────────────────────── Settings schema 43 ─────────────────────────++ // ───────────────────────── Settings schema 44 ─────────────────────────++ [Fact]+ public void A_new_library_has_the_clip_tool_first_behind_the_video_donut()+ {+ var presets = BuiltInData.CreatePresets();+ var clip = presets.Single(p => p.Id == "tool-clip");+ Assert.Equal("motion-photo-android", presets[presets.IndexOf(clip) - 1].Id);+ var video = BuiltInData.CreateProfiles().Single(p => p.Id == "video");+ Assert.Equal("tool-clip", video.BackPresetIds![0]);+ Assert.DoesNotContain("tool-clip", video.PresetIds);+ Assert.DoesNotContain("to-flac", video.BackPresetIds);+ Assert.Contains(presets, p => p.Id == "to-flac");+ Assert.InRange(video.BackPresetIds.Count, 1, ToolbarProfile.MaxSlices);+ }++ [Fact]- public void Version_42_libraries_get_the_clip_tool_and_it_goes_behind_the_video_donut()++ public void Version_43_libraries_get_the_clip_tool_and_it_goes_behind_the_video_donut()+ {+ var presets = BuiltInData.CreatePresets();+ presets.RemoveAll(p => p.Id == "tool-clip");+ var profiles = BuiltInData.CreateProfiles();+ var video = profiles.Single(p => p.Id == "video");- // The back face of 42: FLAC after WAV, no clip tool.++ // The back face of 43: FLAC after WAV, no clip tool.+ video.BackPresetIds!.Remove("tool-clip");+ video.BackPresetIds.Insert(video.BackPresetIds.IndexOf("to-wav") + 1, "to-flac");+- Assert.True(SettingsMigrations.ApplyToLibrary(42, presets, profiles));++ Assert.True(SettingsMigrations.ApplyToLibrary(43, presets, profiles));++ Assert.Equal(BuiltInData.CreatePresets().Select(p => p.Id), presets.Select(p => p.Id));+ Assert.True(presets.Single(p => p.Id == "tool-clip").IsClipTool);+ Assert.Equal(BuiltInData.CreateProfiles().Single(p => p.Id == "video").BackPresetIds, video.BackPresetIds);- Assert.False(SettingsMigrations.ApplyToLibrary(42, presets, profiles)); // once only++ Assert.False(SettingsMigrations.ApplyToLibrary(43, presets, profiles)); // once only++ // A full back face makes room by giving up FLAC; one the user filled up without FLAC, or with the tool on the+ // front, stays as it is.+ var withFlac = BuiltInData.CreateProfiles();+ var withFlacBack = withFlac.Single(p => p.Id == "video").BackPresetIds!;+ withFlacBack.Remove("tool-clip");+ withFlacBack.Add("to-flac");+ while (withFlacBack.Count < ToolbarProfile.MaxSlices)+ withFlacBack.Add("to-mp3");- SettingsMigrations.ApplyToLibrary(42, BuiltInData.CreatePresets(), withFlac);++ SettingsMigrations.ApplyToLibrary(43, BuiltInData.CreatePresets(), withFlac);+ Assert.Equal("tool-clip", withFlacBack[0]);+ Assert.DoesNotContain("to-flac", withFlacBack);+ Assert.Equal(ToolbarProfile.MaxSlices, withFlacBack.Count);++ var full = BuiltInData.CreateProfiles();+ var fullBack = full.Single(p => p.Id == "video").BackPresetIds!;+ fullBack.Remove("tool-clip");+ while (fullBack.Count < ToolbarProfile.MaxSlices)+ fullBack.Add("to-mp3");+ var before = fullBack.ToList();- SettingsMigrations.ApplyToLibrary(42, BuiltInData.CreatePresets(), full);++ SettingsMigrations.ApplyToLibrary(43, BuiltInData.CreatePresets(), full);+ Assert.Equal(before, fullBack);++ var front = BuiltInData.CreateProfiles();+ var frontVideo = front.Single(p => p.Id == "video");+ frontVideo.BackPresetIds!.Remove("tool-clip");+ frontVideo.PresetIds[^1] = "tool-clip";- SettingsMigrations.ApplyToLibrary(42, BuiltInData.CreatePresets(), front);++ SettingsMigrations.ApplyToLibrary(43, BuiltInData.CreatePresets(), front);+ Assert.DoesNotContain("tool-clip", frontVideo.BackPresetIds);+ }++ [Fact]+ public void Back_from_an_older_Filee_the_clip_tool_cuts_clips_again_and_keeps_the_users_changes()+ {- // A Filee from 26 to 42 reads the unknown "tool" as nothing (a crop) and saves it so.++ // A Filee from 26 to 43 reads the unknown "tool" as nothing (a crop) and saves it so.+ var presets = BuiltInData.CreatePresets();+ var clip = presets.Single(p => p.Id == "tool-clip");+ clip.Tool = null;+ clip.Name = "Highlights";+ clip.Output.FileNamePattern = "{name}_best";+ Assert.True(clip.IsCropTool);+- Assert.True(SettingsMigrations.ApplyToLibrary(42, presets, BuiltInData.CreateProfiles()));++ Assert.True(SettingsMigrations.ApplyToLibrary(43, presets, BuiltInData.CreateProfiles()));++ Assert.True(clip.IsClipTool);+ Assert.Equal(("Highlights", "{name}_best"), (clip.Name, clip.Output.FileNamePattern));+ Assert.Single(presets, p => p.Id == "tool-clip");++ // A Filee before 26 read it as a group.+ clip.Kind = PresetKind.Group;+ clip.TargetFormat = Preset.GroupTarget;- Assert.True(SettingsMigrations.ApplyToLibrary(42, presets, BuiltInData.CreateProfiles()));++ Assert.True(SettingsMigrations.ApplyToLibrary(43, presets, BuiltInData.CreateProfiles()));+ Assert.True(clip.IsClipTool);+ Assert.Equal(BuiltInData.SameAsSource, clip.TargetFormat);+ }+}diff --cc tests/Filee.Core.Tests/MediaToolTests.csindex 0c69c915,b8ba6db9..7b1f4dbc--- a/tests/Filee.Core.Tests/MediaToolTests.cs+++ b/tests/Filee.Core.Tests/MediaToolTests.cs@@@ -145,8 -145,7 +145,8 @@@ public class MediaToolTestAssert.True(SettingsMigrations.ApplyToLibrary(36, presets, profiles));- // "Cut a clip" (schema 43) comes in first as well.- Assert.Equal(["mp4-av1", "to-wav", "compress-video", "merge-videos", "extract-audio", "zip-all"], video.BackPresetIds);++ // "Cut a clip" (schema 44) comes in first as well.+ Assert.Equal(["tool-clip", "mp4-av1", "to-wav", "compress-video", "merge-videos", "extract-audio", "zip-all"], video.BackPresetIds);}[Fact]