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.

fix(presets): offer same-format picture edits for images only (#565)

SeoJCalive652626ecfb12
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.json
index 2381df77..630e4067 100644
--- a/src/Filee.App/Assets/i18n/ar.json
+++ b/src/Filee.App/Assets/i18n/ar.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "أخبرنا بالصيغة التي تحتاجها.\nتساعد الطلبات في تحديد الصيغ التي سيدعمها Filee لاحقًا.\nلا يمكن تحويل الملفات المشفّرة أو المحمية من النسخ (DRM)، مهما كانت صيغتها.",
"error.no_route": "لا يوجد محرك يستطيع إجراء هذا التحويل",
"error.cannot_turn": "التدوير والانعكاس متاحان للصور فقط",
+ "error.images_only": "متاح للصور فقط",
"error.no_transparency": "هذا التنسيق لا يدعم الشفافية، لذا لا يوجد ما يُقص",
"error.ocr_language_download": "تعذّر تنزيل لغة التعرّف الضوئي OCR",
"error.ocr_needs_tesseract": "لا يستطيع Apple Vision قراءة هذه اللغة. ثبّت Tesseract من الإعدادات ← المحركات",
diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.json
index 6e770d91..66301d66 100644
--- a/src/Filee.App/Assets/i18n/de.json
+++ b/src/Filee.App/Assets/i18n/de.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "Sag uns, welches Format du brauchst.\nDie Anfragen bestimmen, welche Formate Filee als Nächstes unterstützt.\nVerschlüsselte oder kopiergeschützte Dateien (DRM) lassen sich unabhängig vom Format nicht konvertieren.",
"error.no_route": "Kein Modul kann diese Konvertierung ausführen",
"error.cannot_turn": "Drehen und Spiegeln ist nur bei Bildern möglich",
+ "error.images_only": "Nur bei Bildern möglich",
"error.no_transparency": "Dieses Format unterstützt keine Transparenz. Es gibt daher keine transparenten Ränder zum Abschneiden",
"error.ocr_language_download": "Die OCR-Sprache konnte nicht heruntergeladen werden",
"error.ocr_needs_tesseract": "Apple Vision kann diese Sprache nicht lesen. Installiere Tesseract unter Einstellungen → Module",
diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.json
index 4e2adbbf..68e56815 100644
--- a/src/Filee.App/Assets/i18n/en.json
+++ b/src/Filee.App/Assets/i18n/en.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "Tell us which format you need.\nRequests decide what Filee supports next.\nEncrypted or copy-protected (DRM) files can't be converted, whatever the format.",
"error.no_route": "No engine can do this conversion",
"error.cannot_turn": "Rotate and flip work on images only",
+ "error.images_only": "Works on images only",
"error.no_transparency": "This format has no transparency, so there's nothing to trim",
"error.ocr_language_download": "Couldn't download the OCR language",
"error.ocr_needs_tesseract": "Apple Vision can't read this language. Install Tesseract in Settings → Engines",
diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.json
index 3ca5f061..98f02b0e 100644
--- a/src/Filee.App/Assets/i18n/es.json
+++ b/src/Filee.App/Assets/i18n/es.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "Cuéntanos qué formato necesitas.\nLas solicitudes determinan qué formatos admitirá Filee a continuación.\nLos archivos cifrados o con protección de copia (DRM) no se pueden convertir, sea cual sea su formato.",
"error.no_route": "Ningún motor puede hacer esta conversión",
"error.cannot_turn": "Rotar y voltear solo funcionan con imágenes",
+ "error.images_only": "Solo funciona con imágenes",
"error.no_transparency": "Este formato no tiene transparencia, así que no hay nada que recortar",
"error.ocr_language_download": "No se pudo descargar el idioma de OCR",
"error.ocr_needs_tesseract": "Apple Vision no puede leer este idioma. Instala Tesseract en Ajustes → Motores",
diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.json
index a4add3cb..4da2b65f 100644
--- a/src/Filee.App/Assets/i18n/fr.json
+++ b/src/Filee.App/Assets/i18n/fr.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "Dites-nous de quel format vous avez besoin.\nLes demandes décident de ce que Filee prendra en charge ensuite.\nLes fichiers chiffrés ou protégés contre la copie (DRM) ne peuvent pas être convertis, quel que soit le format.",
"error.no_route": "Aucun moteur ne peut effectuer cette conversion",
"error.cannot_turn": "La rotation et le retournement ne s'appliquent qu'aux images",
+ "error.images_only": "Ne s'applique qu'aux images",
"error.no_transparency": "Ce format n'a pas de transparence : il n'y a rien à rogner",
"error.ocr_language_download": "Impossible de télécharger la langue de l'OCR",
"error.ocr_needs_tesseract": "Apple Vision ne lit pas cette langue. Installez Tesseract dans Paramètres → Moteurs",
diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.json
index 41ac49b1..2b6a60c8 100644
--- a/src/Filee.App/Assets/i18n/hi.json
+++ b/src/Filee.App/Assets/i18n/hi.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "हमें बताएँ कि आपको कौन-सा फ़ॉर्मैट चाहिए।\nअनुरोधों से तय होता है कि Filee आगे क्या समर्थन करेगा।\nएन्क्रिप्टेड या कॉपी-सुरक्षित (DRM) फ़ाइलें किसी भी फ़ॉर्मैट में कन्वर्ट नहीं की जा सकतीं।",
"error.no_route": "कोई भी इंजन यह कन्वर्ज़न नहीं कर सकता",
"error.cannot_turn": "घुमाना और पलटना केवल इमेज पर काम करता है",
+ "error.images_only": "केवल इमेज पर काम करता है",
"error.no_transparency": "इस फ़ॉर्मैट में पारदर्शिता नहीं है, इसलिए काटने को कुछ नहीं है",
"error.ocr_language_download": "OCR भाषा डाउनलोड नहीं हो सकी",
"error.ocr_needs_tesseract": "Apple Vision यह भाषा नहीं पढ़ सकता। सेटिंग्स → इंजन में Tesseract इंस्टॉल करें",
diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.json
index fdac2598..b336a794 100644
--- a/src/Filee.App/Assets/i18n/ja.json
+++ b/src/Filee.App/Assets/i18n/ja.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "必要な形式を教えてください。\nリクエストをもとに、今後Fileeが対応する形式を決めます。\n暗号化またはコピー保護(DRM)されたファイルは、形式にかかわらず変換できません。",
"error.no_route": "この変換に対応するエンジンがありません",
"error.cannot_turn": "回転と反転は画像でのみ使えます",
+ "error.images_only": "画像でのみ使えます",
"error.no_transparency": "この形式には透明部分がないため、切り取るものがありません",
"error.ocr_language_download": "OCR の言語データをダウンロードできませんでした",
"error.ocr_needs_tesseract": "Apple Vision はこの言語を読めません。「設定」→「変換エンジン」で Tesseract をインストールしてください",
diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.json
index 8e89ad9b..d74b8cfe 100644
--- a/src/Filee.App/Assets/i18n/ko.json
+++ b/src/Filee.App/Assets/i18n/ko.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "필요한 형식을 알려주세요.\n요청을 보고 다음에 지원할 형식을 정해요.\n암호화되거나 DRM이 걸린 파일은 변환할 수 없어요.",
"error.no_route": "이 변환을 할 수 있는 엔진이 없어요",
"error.cannot_turn": "회전·반전은 이미지에만 할 수 있어요",
+ "error.images_only": "이미지에만 쓸 수 있어요",
"error.no_transparency": "이 형식에는 투명한 부분이 없어서 잘라낼 것이 없어요",
"error.ocr_language_download": "OCR 언어 데이터를 내려받지 못했어요",
"error.ocr_needs_tesseract": "Apple Vision은 이 언어를 읽지 못해요. 설정 → 변환 엔진에서 Tesseract를 설치해 주세요",
diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.json
index 73395a70..47404bf9 100644
--- a/src/Filee.App/Assets/i18n/ne.json
+++ b/src/Filee.App/Assets/i18n/ne.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "तपाईंले चाहेको ढाँचा समर्थित छैन? हामीलाई अनुरोध पठाउनुहोस् र हामी यसलाई थप्ने प्रयास गर्नेछौं।",
"error.no_route": "कुनै पनि इन्जिनले यो रूपान्तरण गर्न सक्दैन",
"error.cannot_turn": "घुमाउने र उल्ट्याउने कार्य केवल छविहरूमा मात्र काम गर्छ",
+ "error.images_only": "केवल छविहरूमा मात्र काम गर्छ",
"error.ocr_language_download": "OCR भाषा डाउनलोड गर्न सकिएन",
"error.ocr_needs_tesseract": "Apple Vision ले यो भाषा पढ्न सक्दैन। सेटिङहरू → इन्जिनहरूमा Tesseract स्थापना गर्नुहोस्",
"error.no_transparency": "यो ढाँचामा पारदर्शिता हुँदैन, त्यसैले काट्नुपर्ने केही छैन",
diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.json
index 4eb84c4d..2805d7a8 100644
--- a/src/Filee.App/Assets/i18n/pl.json
+++ b/src/Filee.App/Assets/i18n/pl.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "Napisz, jakiego formatu potrzebujesz.\nNa podstawie próśb wybieramy kolejne obsługiwane formaty.\nPlików zaszyfrowanych lub chronionych przed kopiowaniem (DRM) nie da się konwertować, niezależnie od formatu.",
"error.no_route": "Żaden silnik nie wykona tej konwersji",
"error.cannot_turn": "Obracanie i odbicie działają tylko na obrazach",
+ "error.images_only": "Działa tylko na obrazach",
"error.no_transparency": "Ten format nie ma przezroczystości, więc nie ma czego przycinać",
"error.ocr_language_download": "Nie udało się pobrać języka OCR",
"error.ocr_needs_tesseract": "Apple Vision nie czyta tego języka. Zainstaluj Tesseract w Ustawienia → Silniki",
diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.json
index 8e99ed33..e2bde467 100644
--- a/src/Filee.App/Assets/i18n/pt-BR.json
+++ b/src/Filee.App/Assets/i18n/pt-BR.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "Diga qual formato você precisa.\nOs pedidos decidem o que o Filee passa a aceitar.\nArquivos criptografados ou protegidos contra cópia (DRM) não podem ser convertidos, seja qual for o formato.",
"error.no_route": "Nenhum motor faz esta conversão",
"error.cannot_turn": "Girar e espelhar só funcionam em imagens",
+ "error.images_only": "Só funciona em imagens",
"error.no_transparency": "Este formato não tem transparência, então não há nada para cortar",
"error.ocr_language_download": "Não foi possível baixar o idioma do OCR",
"error.ocr_needs_tesseract": "O Apple Vision não lê este idioma. Instale o Tesseract em Configurações → Motores",
diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.json
index 9cc6e393..bf6883e2 100644
--- a/src/Filee.App/Assets/i18n/pt-PT.json
+++ b/src/Filee.App/Assets/i18n/pt-PT.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "Diz-nos de que formato precisas.\nOs pedidos ajudam a decidir os próximos formatos suportados pelo Filee.\nNão é possível converter ficheiros encriptados ou protegidos contra cópia (DRM), seja qual for o formato.",
"error.no_route": "Nenhum motor consegue fazer esta conversão",
"error.cannot_turn": "Só é possível rodar e inverter imagens",
+ "error.images_only": "Só funciona com imagens",
"error.no_transparency": "Este formato não admite transparência, pelo que não há nada para recortar",
"error.ocr_language_download": "Não foi possível descarregar os dados do idioma para OCR",
"error.ocr_needs_tesseract": "O Apple Vision não consegue ler este idioma. Instala o Tesseract em Definições → Motores",
diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.json
index c0b3a2fc..258b7207 100644
--- a/src/Filee.App/Assets/i18n/ru.json
+++ b/src/Filee.App/Assets/i18n/ru.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "Напишите, какой формат вам нужен.\nОт запросов зависит, что Filee будет поддерживать дальше.\nЗашифрованные и защищённые от копирования (DRM) файлы сконвертировать нельзя, в каком бы формате они ни были.",
"error.no_route": "Нет движка для такой конвертации",
"error.cannot_turn": "Поворот и отражение работают только с изображениями",
+ "error.images_only": "Работает только с изображениями",
"error.no_transparency": "В этом формате нет прозрачности, обрезать нечего",
"error.ocr_language_download": "Не удалось скачать язык для OCR",
"error.ocr_needs_tesseract": "Apple Vision не читает этот язык. Установите Tesseract в разделе «Настройки → Движки»",
diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.json
index 83b3c7a5..2d912825 100644
--- a/src/Filee.App/Assets/i18n/th.json
+++ b/src/Filee.App/Assets/i18n/th.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "แจ้งให้เราทราบว่าคุณต้องการฟอร์แมตใด\nคำขอของคุณจะช่วยกำหนดฟอร์แมตที่ Filee จะพัฒนาต่อไป\nไฟล์ที่เข้ารหัสหรือติดการคุ้มครองลิขสิทธิ์ (DRM) จะไม่สามารถแปลงได้ไม่ว่าจะฟอร์แมตใดก็ตาม",
"error.no_route": "ไม่มีเครื่องมือที่แปลงฟอร์แมตนี้ได้",
"error.cannot_turn": "การหมุนและพลิกภาพใช้ได้กับไฟล์รูปภาพเท่านั้น",
+ "error.images_only": "ใช้ได้กับไฟล์รูปภาพเท่านั้น",
"error.ocr_language_download": "ดาวน์โหลดภาษาสำหรับ OCR ไม่ได้",
"error.ocr_needs_tesseract": "Apple Vision อ่านภาษานี้ไม่ได้ ติดตั้ง Tesseract ได้ในการตั้งค่า → เครื่องมือแปลงไฟล์",
"error.no_transparency": "ฟอร์แมตนี้ไม่มีความโปร่งใส จึงไม่มีขอบให้ตัดออก",
diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.json
index 09c66d35..eb88a121 100644
--- a/src/Filee.App/Assets/i18n/tr.json
+++ b/src/Filee.App/Assets/i18n/tr.json
@@ -83,6 +83,7 @@
"format_request.notice_text": "İhtiyacınız olan biçimi bize bildirin.\nFilee'nin sırada hangi biçimleri destekleyeceğini talepler belirler.\nŞifreli veya kopya korumalı (DRM) dosyalar, biçimi ne olursa olsun dönüştürülemez.",
"error.no_route": "Bu dönüştürmeyi yapabilen bir motor yok",
"error.cannot_turn": "Döndürme ve çevirme yalnızca görsellerde çalışır",
+ "error.images_only": "Yalnızca görsellerde çalışır",
"error.no_transparency": "Bu biçim saydamlık içermediği için kırpılacak alan yok",
"error.ocr_language_download": "OCR dili indirilemedi",
"error.ocr_needs_tesseract": "Apple Vision bu dili okuyamıyor. Ayarlar → Dönüştürme motorları bölümünden Tesseract kurun",
diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.json
index fa125720..b04212c1 100644
--- a/src/Filee.App/Assets/i18n/zh-CN.json
+++ b/src/Filee.App/Assets/i18n/zh-CN.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "告诉我们你需要的格式。\n我们会根据请求决定接下来支持哪些格式。\n加密或有复制保护 (DRM) 的文件,无论什么格式都无法转换。",
"error.no_route": "没有引擎可以完成此转换",
"error.cannot_turn": "只能旋转和翻转图片",
+ "error.images_only": "只能用于图片",
"error.no_transparency": "此格式没有透明部分,无需裁剪",
"error.ocr_language_download": "无法下载 OCR 语言数据",
"error.ocr_needs_tesseract": "Apple Vision 无法识别此语言。请在“设置 → 转换引擎”中安装 Tesseract",
diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.json
index 03c538be..e27f4562 100644
--- a/src/Filee.App/Assets/i18n/zh-TW.json
+++ b/src/Filee.App/Assets/i18n/zh-TW.json
@@ -89,6 +89,7 @@
"format_request.notice_text": "告訴我們你需要的格式。\n我們會根據請求決定接下來支援哪些格式。\n加密或有複製保護 (DRM) 的檔案,無論什麼格式都無法轉換。",
"error.no_route": "沒有引擎可以完成此轉換",
"error.cannot_turn": "只能旋轉和翻轉圖片",
+ "error.images_only": "只能用於圖片",
"error.no_transparency": "此格式沒有透明部分,無需裁切",
"error.ocr_language_download": "無法下載 OCR 語言資料",
"error.ocr_needs_tesseract": "Apple Vision 無法辨識此語言。請在「設定 → 轉換引擎」中安裝 Tesseract",
diff --git a/src/Filee.App/Services/PresetAvailability.cs b/src/Filee.App/Services/PresetAvailability.cs
index b45b0825..687c59bd 100644
--- a/src/Filee.App/Services/PresetAvailability.cs
+++ b/src/Filee.App/Services/PresetAvailability.cs
@@ -139,6 +139,14 @@ public sealed class PresetAvailability
if (formats.Count == 0)
return new(PresetUse.Unusable, _loc["error.unsupported_source"]);
+ // Resizing, greyscale, trimming or squeezing a file into its own format needs a picture: an MP3 or a ZIP has none.
+ if (preset.TargetFormat == BuiltInData.SameAsSource && preset.Image.EditsPicture)
+ {
+ formats = [.. formats.Where(f => f.Category == FormatCategory.Image)];
+ if (formats.Count == 0)
+ return new(PresetUse.Unusable, _loc["error.images_only"]);
+ }
+
// "Trim transparent borders" on JPG and other formats without transparency would only re-encode them.
if (preset.Image.TrimTransparent
&& formats.All(f => !Filee.Engines.Magick.ImageEncoder.HoldsAlpha(preset.TargetFormat == BuiltInData.SameAsSource ? f.Id : preset.TargetFormat)))
diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.cs
index ea4d79a6..a795927f 100644
--- a/src/Filee.Core/Presets/Preset.cs
+++ b/src/Filee.Core/Presets/Preset.cs
@@ -331,6 +331,10 @@ public sealed class ImageOptions
[JsonIgnore]
public bool TurnsOrMirrors => Rotation != ImageRotation.None || Flip != ImageFlip.None;
+ /// <summary>Whether the preset edits picture content, size, or playback speed.</summary>
+ [JsonIgnore]
+ public bool EditsPicture => Resize != ResizeMode.None || Grayscale || TrimTransparent || RemoveBackground || MaxCompression || ChangesSpeed;
+
/// <summary>Scale in percent when <see cref="Resize"/> is <see cref="ResizeMode.Percent"/>.</summary>
public int ResizePercent { get; set; } = 50;
diff --git a/tests/Filee.App.Tests/DonutGroupTests.cs b/tests/Filee.App.Tests/DonutGroupTests.cs
index 3d0a9384..6ef75250 100644
--- a/tests/Filee.App.Tests/DonutGroupTests.cs
+++ b/tests/Filee.App.Tests/DonutGroupTests.cs
@@ -437,6 +437,51 @@ public class DonutGroupTests
Assert.Equal("Rotate and flip work on images only", availability.Check(mergeTurned, [Filee.Core.Formats.FormatRegistry.Get("pdf")]));
}
+ [AvaloniaFact]
+ public void Picture_edits_in_the_same_format_are_offered_for_images_only()
+ {
+ TestServices.EnsureInitialized("en");
+ var availability = AppHost.Get<PresetAvailability>();
+ var presets = BuiltInData.CreatePresets();
+ var halfSize = presets.Single(p => p.Id == "half-size");
+ var grayscale = presets.Single(p => p.Id == "grayscale");
+ var trim = presets.Single(p => p.Id == "trim-transparent");
+ var compress = presets.Single(p => p.Id == "compress-image");
+ var removeMetadata = presets.Single(p => p.Id == "remove-metadata");
+ var png = Filee.Core.Formats.FormatRegistry.Get("png");
+ var gif = Filee.Core.Formats.FormatRegistry.Get("gif");
+ var mp3 = Filee.Core.Formats.FormatRegistry.Get("mp3");
+
+ foreach (var preset in new[] { halfSize, grayscale, trim, compress })
+ {
+ Assert.Null(availability.Check(preset, [png]));
+ Assert.Null(availability.Check(preset, [gif]));
+ foreach (var id in new[] { "mp3", "mp4", "zip", "pdf", "srt", "dxf", "geojson", "txt", "svg" })
+ Assert.Equal("Works on images only", availability.Check(preset, [Filee.Core.Formats.FormatRegistry.Get(id)]));
+ }
+
+ Assert.Null(availability.Check(halfSize, [png, mp3]));
+ Assert.Equal("This format has no transparency, so there's nothing to trim",
+ availability.Check(trim, [Filee.Core.Formats.FormatRegistry.Get("jpg"), mp3]));
+
+ var speed = new Preset { TargetFormat = BuiltInData.SameAsSource, Image = { AnimationSpeed = 2 } };
+ Assert.Equal("Works on images only", availability.Check(speed, [mp3]));
+ Assert.Null(availability.Check(speed, [gif]));
+
+ var removeBackground = new Preset { TargetFormat = BuiltInData.SameAsSource, Image = { RemoveBackground = true } };
+ Assert.Equal("Works on images only", availability.Check(removeBackground, [mp3]));
+ Assert.Null(availability.Check(removeBackground, [png]));
+
+ var mixedOptions = new Preset
+ {
+ TargetFormat = BuiltInData.SameAsSource,
+ Image = { Grayscale = true },
+ Media = { RemoveMetadata = true },
+ };
+ Assert.Equal("Works on images only", availability.Check(mixedOptions, [mp3]));
+ Assert.NotEqual("Works on images only", availability.Check(removeMetadata, [mp3]));
+ }
+
[AvaloniaFact]
public void Tool_presets_are_available_only_for_writable_single_frame_raster_formats()
{