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
feat(presets): set an image's file size as a KB or MB range
SeoJCalive9956a6767173
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.jsonindex 3f6b3e6e..df65e3e1 100644--- a/src/Filee.App/Assets/i18n/ar.json+++ b/src/Filee.App/Assets/i18n/ar.json@@ -132,6 +132,8 @@"error.fon_damaged": "ملف .fon تالف أو غير مكتمل","error.m4s_needs_init": "ملف .m4s هذا جزء من فيديو متدفّق، ولا يمكن قراءته دون مقطع البداية (init) المنفصل الخاص به","notice.pdf_not_smaller": "تعذّر تقليل الحجم، لذا نُسخ الملف كما هو",+ "notice.under_min_size": "تم الحفظ، لكنه أصغر من الحد الأدنى لحجم الملف",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "حُذفت كائنات لا يدعمها إصدار AutoCAD المختار (أسهم توضيحية متعددة، شبكات …)","notice.original_kept": "تم الاحتفاظ بالأصل وحُفظت النتيجة كنسخة","notice.original_in_trash": "الأصل في سلة المحذوفات، واحتفظت النتيجة باسمها",@@ -807,6 +809,12 @@"presets.max_size": "حد الحجم (ميغابايت)","presets.max_size_hint_image": "0 = بلا حد. تُحفظ الصورة الأكبر مرة أخرى بجودة أقل، ثم بحجم أصغر، حتى تناسب الحد.","presets.max_size_hint_video": "0 = بلا حد. يُرمَّز الفيديو الأكبر مرة أخرى بمعدل البت الذي يسمح به طوله.",+ "presets.size_range": "حجم الملف",+ "presets.min_size": "الحد الأدنى",+ "presets.max_size_short": "الحد الأقصى",+ "presets.size_unit": "الوحدة",+ "presets.min_size_hint_image": "0 = بلا حد أدنى. تُحفظ الصورة الأصغر مرة أخرى بجودة أعلى؛ لا تُكبَّر الصيغ التي لا تحتوي على إعداد للجودة (PNG وGIF…) ويحصل الملف على تنبيه بدلًا من ذلك.",+ "presets.size_range_invalid": "الحد الأدنى أكبر من الحد الأقصى.","presets.audio_bitrate": "معدل بت الصوت","presets.audio_bitrate.auto": "تلقائي","presets.remove_audio": "إزالة الصوت",diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.jsonindex 5755d0ee..e2f9bc9e 100644--- a/src/Filee.App/Assets/i18n/de.json+++ b/src/Filee.App/Assets/i18n/de.json@@ -132,6 +132,8 @@"error.fon_damaged": "Die .fon-Datei ist beschädigt oder unvollständig","error.m4s_needs_init": "Diese .m4s-Datei ist ein Stück eines gestreamten Videos und lässt sich ohne ihr separates Startsegment (init) nicht lesen","notice.pdf_not_smaller": "Die Datei ließ sich nicht verkleinern und wurde unverändert kopiert",+ "notice.under_min_size": "Gespeichert, aber kleiner als die Mindestdateigröße",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Objekte, die die gewählte AutoCAD-Version nicht unterstützt (Multiführungslinien, Netze …), wurden weggelassen","notice.original_kept": "Das Original wurde beibehalten und das Ergebnis als Kopie gespeichert","notice.original_in_trash": "Das Original liegt im Papierkorb. Das Ergebnis hat seinen eigenen Namen behalten",@@ -807,6 +809,12 @@"presets.max_size": "Größenlimit (MB)","presets.max_size_hint_image": "0 = kein Limit. Ein größeres Bild wird erneut gespeichert, zuerst mit geringerer Qualität, dann kleiner, bis es passt.","presets.max_size_hint_video": "0 = kein Limit. Ein größeres Video wird mit der Bitrate kodiert, die seine Länge zulässt.",+ "presets.size_range": "Dateigröße",+ "presets.min_size": "Minimum",+ "presets.max_size_short": "Maximum",+ "presets.size_unit": "Einheit",+ "presets.min_size_hint_image": "0 = kein Minimum. Ein kleineres Bild wird mit höherer Qualität erneut gespeichert; Formate ohne Qualitätseinstellung (PNG, GIF…) werden nicht größer, die Datei bekommt stattdessen einen Hinweis.",+ "presets.size_range_invalid": "Das Minimum ist größer als das Maximum.","presets.audio_bitrate": "Audio-Bitrate","presets.audio_bitrate.auto": "Automatisch","presets.remove_audio": "Ton entfernen",diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.jsonindex cadb814c..11f51176 100644--- a/src/Filee.App/Assets/i18n/en.json+++ b/src/Filee.App/Assets/i18n/en.json@@ -138,6 +138,8 @@"error.fon_damaged": "The .fon file is damaged or cut short","error.m4s_needs_init": "This .m4s is one piece of a streamed video: it can't be read without its separate start (init) segment","notice.pdf_not_smaller": "Couldn't make it smaller, so it was copied as it is",+ "notice.under_min_size": "Saved, but smaller than the minimum file size",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Objects the chosen AutoCAD version doesn't have (multileaders, meshes …) were left out","notice.original_kept": "The original was kept, the result was saved as a copy","notice.original_in_trash": "The original is in the Recycle Bin / Trash, the result kept its own name",@@ -822,6 +824,12 @@"presets.max_size": "Size limit (MB)","presets.max_size_hint_image": "0 = no limit. A larger picture is saved again at a lower quality, then smaller, until it fits.","presets.max_size_hint_video": "0 = no limit. A larger video is encoded again at the bitrate its length allows.",+ "presets.size_range": "File size",+ "presets.min_size": "Minimum",+ "presets.max_size_short": "Maximum",+ "presets.size_unit": "Unit",+ "presets.min_size_hint_image": "0 = no minimum. A smaller picture is saved again at a higher quality; formats without a quality setting (PNG, GIF…) aren't made larger, and the file gets a notice instead.",+ "presets.size_range_invalid": "The minimum is larger than the maximum.","presets.audio_bitrate": "Audio bitrate","presets.audio_bitrate.auto": "Automatic","presets.remove_audio": "Remove the sound",diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.jsonindex bed24f2b..2da56958 100644--- a/src/Filee.App/Assets/i18n/es.json+++ b/src/Filee.App/Assets/i18n/es.json@@ -132,6 +132,8 @@"error.fon_damaged": "El archivo .fon está dañado o incompleto","error.m4s_needs_init": "Este .m4s es un fragmento de un vídeo en streaming y no se puede leer sin su segmento de inicio (init) aparte","notice.pdf_not_smaller": "No se pudo reducir su tamaño, por lo que se copió tal cual",+ "notice.under_min_size": "Guardado, pero más pequeño que el tamaño mínimo de archivo",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Se omitieron objetos que la versión de AutoCAD elegida no tiene (directrices múltiples, mallas…)","notice.original_kept": "Se conservó el original, el resultado se guardó como copia","notice.original_in_trash": "El original está en la Papelera, el resultado conservó su propio nombre",@@ -807,6 +809,12 @@"presets.max_size": "Límite de tamaño (MB)","presets.max_size_hint_image": "0 = sin límite. Una imagen más grande se guarda de nuevo con menos calidad y después más pequeña, hasta que cabe.","presets.max_size_hint_video": "0 = sin límite. Un vídeo más grande se codifica de nuevo con la tasa de bits que permite su duración.",+ "presets.size_range": "Tamaño de archivo",+ "presets.min_size": "Mínimo",+ "presets.max_size_short": "Máximo",+ "presets.size_unit": "Unidad",+ "presets.min_size_hint_image": "0 = sin mínimo. Una imagen más pequeña se vuelve a guardar con mayor calidad; los formatos sin ajuste de calidad (PNG, GIF…) no se agrandan y el archivo recibe un aviso.",+ "presets.size_range_invalid": "El mínimo es mayor que el máximo.","presets.audio_bitrate": "Tasa de bits del audio","presets.audio_bitrate.auto": "Automática","presets.remove_audio": "Quitar el sonido",diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.jsonindex 8c6fa877..7f59b718 100644--- a/src/Filee.App/Assets/i18n/fr.json+++ b/src/Filee.App/Assets/i18n/fr.json@@ -138,6 +138,8 @@"error.fon_damaged": "Le fichier .fon est endommagé ou incomplet","error.m4s_needs_init": "Ce .m4s est un morceau d'une vidéo diffusée en streaming : il ne peut pas être lu sans son segment de départ (init) séparé","notice.pdf_not_smaller": "Impossible de réduire sa taille : le fichier a été copié tel quel",+ "notice.under_min_size": "Enregistré, mais plus petit que la taille de fichier minimale",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Des objets que la version d'AutoCAD choisie n'a pas (multilignes de repère, maillages…) ont été omis","notice.original_kept": "L'original a été conservé, le résultat a été enregistré en copie","notice.original_in_trash": "L'original est dans la Corbeille, le résultat a gardé son propre nom",@@ -822,6 +824,12 @@"presets.max_size": "Taille maximale (Mo)","presets.max_size_hint_image": "0 = aucune limite. Une image plus lourde est réenregistrée en qualité plus basse, puis plus petite, jusqu'à ce qu'elle tienne.","presets.max_size_hint_video": "0 = aucune limite. Une vidéo plus lourde est réencodée au débit que permet sa durée.",+ "presets.size_range": "Taille du fichier",+ "presets.min_size": "Minimum",+ "presets.max_size_short": "Maximum",+ "presets.size_unit": "Unité",+ "presets.min_size_hint_image": "0 = aucun minimum. Une image plus petite est réenregistrée avec une qualité plus élevée ; les formats sans réglage de qualité (PNG, GIF…) ne sont pas agrandis et le fichier reçoit un avis.",+ "presets.size_range_invalid": "Le minimum est supérieur au maximum.","presets.audio_bitrate": "Débit audio","presets.audio_bitrate.auto": "Automatique","presets.remove_audio": "Supprimer le son",diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.jsonindex b106d37a..8ca7d324 100644--- a/src/Filee.App/Assets/i18n/hi.json+++ b/src/Filee.App/Assets/i18n/hi.json@@ -132,6 +132,8 @@"error.fon_damaged": ".fon फ़ाइल खराब है या अधूरी है","error.m4s_needs_init": "यह .m4s स्ट्रीम किए गए वीडियो का एक हिस्सा है: इसके अलग शुरुआती (init) सेगमेंट के बिना इसे पढ़ा नहीं जा सकता","notice.pdf_not_smaller": "इसे छोटा नहीं किया जा सका, इसलिए जैसा है वैसा ही कॉपी कर दिया गया",+ "notice.under_min_size": "सहेजा गया, लेकिन न्यूनतम फ़ाइल आकार से छोटा है",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "चुने गए AutoCAD संस्करण में न होने वाले ऑब्जेक्ट (मल्टीलीडर, मेश …) छोड़ दिए गए","notice.original_kept": "मूल फ़ाइल रखी गई, परिणाम कॉपी के रूप में सहेजा गया","notice.original_in_trash": "मूल फ़ाइल रीसायकल बिन / ट्रैश में है, परिणाम ने अपना नाम रखा",@@ -807,6 +809,12 @@"presets.max_size": "आकार सीमा (MB)","presets.max_size_hint_image": "0 = कोई सीमा नहीं। बड़ी तस्वीर कम गुणवत्ता पर, फिर छोटी करके, तब तक दोबारा सहेजी जाती है जब तक वह सीमा में न आ जाए।","presets.max_size_hint_video": "0 = कोई सीमा नहीं। बड़ा वीडियो उसकी लंबाई के हिसाब से संभव बिटरेट पर दोबारा एन्कोड किया जाता है।",+ "presets.size_range": "फ़ाइल का आकार",+ "presets.min_size": "न्यूनतम",+ "presets.max_size_short": "अधिकतम",+ "presets.size_unit": "इकाई",+ "presets.min_size_hint_image": "0 = कोई न्यूनतम नहीं। छोटी तस्वीर को ऊँची गुणवत्ता पर फिर से सहेजा जाता है; बिना गुणवत्ता सेटिंग वाले फ़ॉर्मैट (PNG, GIF…) बड़े नहीं किए जाते, इसके बजाय फ़ाइल पर सूचना लगती है।",+ "presets.size_range_invalid": "न्यूनतम अधिकतम से बड़ा है।","presets.audio_bitrate": "ऑडियो बिटरेट","presets.audio_bitrate.auto": "स्वचालित","presets.remove_audio": "आवाज़ हटाएँ",diff --git a/src/Filee.App/Assets/i18n/it.json b/src/Filee.App/Assets/i18n/it.jsonindex af5b4690..aa085e43 100644--- a/src/Filee.App/Assets/i18n/it.json+++ b/src/Filee.App/Assets/i18n/it.json@@ -132,6 +132,8 @@"error.fon_damaged": "Il file .fon è danneggiato o troncato","error.m4s_needs_init": "Questo .m4s è un frammento di un video in streaming: non può essere letto senza il suo segmento iniziale (init) separato","notice.pdf_not_smaller": "Impossibile ridurlo, quindi è stato copiato così com'è",+"notice.under_min_size": "Salvato, ma più piccolo della dimensione minima del file",+"notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Gli oggetti che la versione AutoCAD scelta non supporta (multilinee guida, mesh …) sono stati omessi","notice.original_kept": "L'originale è stato conservato, il risultato è stato salvato come copia","notice.original_in_trash": "L'originale è nel Cestino, il risultato ha mantenuto il proprio nome",@@ -807,6 +809,12 @@"presets.max_size": "Limite di dimensione (MB)","presets.max_size_hint_image": "0 = nessun limite. Un'immagine più grande viene salvata di nuovo a qualità più bassa, poi più piccola, finché non rientra.","presets.max_size_hint_video": "0 = nessun limite. Un video più grande viene ricodificato al bitrate che la sua durata consente.",+"presets.size_range": "Dimensione file",+"presets.min_size": "Minimo",+"presets.max_size_short": "Massimo",+"presets.size_unit": "Unità",+"presets.min_size_hint_image": "0 = nessun minimo. Un'immagine più piccola viene salvata di nuovo con qualità più alta; i formati senza impostazione di qualità (PNG, GIF…) non vengono ingranditi e il file riceve un avviso.",+"presets.size_range_invalid": "Il minimo è maggiore del massimo.","presets.audio_bitrate": "Bitrate audio","presets.audio_bitrate.auto": "Automatico","presets.remove_audio": "Rimuovi l'audio",diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.jsonindex 89ca0d7a..e676fdd1 100644--- a/src/Filee.App/Assets/i18n/ja.json+++ b/src/Filee.App/Assets/i18n/ja.json@@ -132,6 +132,8 @@"error.fon_damaged": ".fonファイルが破損しているか、途中で切れています","error.m4s_needs_init": "この .m4s はストリーミング動画の一部で、別にある開始(init)セグメントがないと読み込めません","notice.pdf_not_smaller": "サイズを小さくできなかったため、元のままコピーしました",+ "notice.under_min_size": "保存しましたが、最小ファイルサイズより小さいです",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "選んだ AutoCAD のバージョンにないオブジェクト(マルチ引出線、メッシュ …)を省きました","notice.original_kept": "元のファイルを残し、結果をコピーとして保存しました","notice.original_in_trash": "元のファイルはごみ箱にあります。結果は別の名前のままです",@@ -807,6 +809,12 @@"presets.max_size": "サイズ上限 (MB)","presets.max_size_hint_image": "0 = 上限なし。大きい画像は品質を下げ、次に縮小して、収まるまで保存し直します。","presets.max_size_hint_video": "0 = 上限なし。大きい動画は長さに合ったビットレートでエンコードし直します。",+ "presets.size_range": "ファイルサイズ",+ "presets.min_size": "最小",+ "presets.max_size_short": "最大",+ "presets.size_unit": "単位",+ "presets.min_size_hint_image": "0 = 最小なし。小さい画像は品質を上げて保存し直します。品質設定のない形式(PNG、GIF…)は大きくならず、代わりに通知が付きます。",+ "presets.size_range_invalid": "最小が最大より大きくなっています。","presets.audio_bitrate": "音声ビットレート","presets.audio_bitrate.auto": "自動","presets.remove_audio": "音声を削除",diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.jsonindex aa837b22..63da1b9c 100644--- a/src/Filee.App/Assets/i18n/ko.json+++ b/src/Filee.App/Assets/i18n/ko.json@@ -138,6 +138,8 @@"error.fon_damaged": ".fon 파일이 손상되었거나 잘렸어요","error.m4s_needs_init": "스트리밍 동영상의 한 조각인 .m4s 파일이에요. 따로 있는 시작(init) 세그먼트 없이는 읽을 수 없어요","notice.pdf_not_smaller": "더 작게 만들 수 없어서 그대로 복사했어요",+ "notice.under_min_size": "최소 파일 크기보다 작지만 저장했어요",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "선택한 AutoCAD 버전에 없는 개체(다중 지시선, 메시 …)는 빼고 저장했어요","notice.original_kept": "원본은 그대로 두고 결과를 사본으로 저장했어요","notice.original_in_trash": "원본은 휴지통으로 옮겼고, 결과는 저장된 이름 그대로예요",@@ -822,6 +824,12 @@"presets.max_size": "크기 제한 (MB)","presets.max_size_hint_image": "0 = 제한 없음. 더 큰 그림은 품질을 낮추고, 그다음 크기를 줄여 맞을 때까지 다시 저장해요.","presets.max_size_hint_video": "0 = 제한 없음. 더 큰 동영상은 길이에 맞는 비트레이트로 다시 인코딩해요.",+ "presets.size_range": "파일 크기",+ "presets.min_size": "최소",+ "presets.max_size_short": "최대",+ "presets.size_unit": "단위",+ "presets.min_size_hint_image": "0 = 최소 없음. 더 작은 그림은 품질을 높여 다시 저장해요. 품질 설정이 없는 형식(PNG, GIF…)은 커지지 않고, 대신 알림을 붙여요.",+ "presets.size_range_invalid": "최소가 최대보다 커요.","presets.audio_bitrate": "오디오 비트레이트","presets.audio_bitrate.auto": "자동","presets.remove_audio": "소리 빼기",diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.jsonindex f728b81c..f4ffd4d6 100644--- a/src/Filee.App/Assets/i18n/ne.json+++ b/src/Filee.App/Assets/i18n/ne.json@@ -132,6 +132,8 @@"error.fon_damaged": ".fon फाइल बिग्रिएको वा अपूर्ण छ","error.m4s_needs_init": "यो .m4s स्ट्रिम गरिएको भिडियोको एउटा टुक्रा हो: छुट्टै सुरुवाती (init) खण्डबिना यसलाई पढ्न सकिँदैन","notice.pdf_not_smaller": "यसलाई सानो बनाउन सकिएन, त्यसैले जस्तो छ त्यस्तै प्रतिलिपि गरियो",+ "notice.under_min_size": "सुरक्षित भयो, तर न्यूनतम फाइल आकारभन्दा सानो छ",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "छानिएको AutoCAD संस्करणमा नभएका वस्तुहरू (मल्टिलिडर, मेस …) छोडिए","notice.original_kept": "मूल फाइल राखियो, नतिजा प्रतिलिपिको रूपमा सुरक्षित भयो","notice.original_in_trash": "मूल फाइल रिसाइकल बिन / ट्र्यासमा छ, नतिजाले आफ्नै नाम राख्यो",@@ -807,6 +809,12 @@"presets.max_size": "आकार सीमा (MB)","presets.max_size_hint_image": "0 = कुनै सीमा छैन। ठूलो तस्बिरलाई कम गुणस्तरमा, त्यसपछि सानो बनाएर, सीमाभित्र नआउँदासम्म फेरि सेभ गरिन्छ।","presets.max_size_hint_video": "0 = कुनै सीमा छैन। ठूलो भिडियोलाई यसको लम्बाइले दिने बिटरेटमा फेरि इन्कोड गरिन्छ।",+ "presets.size_range": "फाइलको आकार",+ "presets.min_size": "न्यूनतम",+ "presets.max_size_short": "अधिकतम",+ "presets.size_unit": "एकाइ",+ "presets.min_size_hint_image": "0 = न्यूनतम छैन। सानो तस्बिरलाई उच्च गुणस्तरमा फेरि सुरक्षित गरिन्छ; गुणस्तर सेटिङ नभएका ढाँचाहरू (PNG, GIF…) ठूला बनाइँदैनन्, बरु फाइलमा सूचना थपिन्छ।",+ "presets.size_range_invalid": "न्यूनतम अधिकतमभन्दा ठूलो छ।","presets.audio_bitrate": "अडियो बिटरेट","presets.audio_bitrate.auto": "स्वचालित","presets.remove_audio": "अडियो हटाउनुहोस्",diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.jsonindex 9ea16c30..5c843166 100644--- a/src/Filee.App/Assets/i18n/pl.json+++ b/src/Filee.App/Assets/i18n/pl.json@@ -138,6 +138,8 @@"error.fon_damaged": "Plik .fon jest uszkodzony lub niekompletny","error.m4s_needs_init": "Ten plik .m4s to fragment wideo strumieniowego i nie da się go odczytać bez osobnego segmentu początkowego (init)","notice.pdf_not_smaller": "Nie udało się zmniejszyć pliku, więc skopiowano go bez zmian",+ "notice.under_min_size": "Zapisano, ale plik jest mniejszy niż minimalny rozmiar",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Pominięto obiekty, których wybrana wersja AutoCAD nie ma (multiodnośniki, siatki…)","notice.original_kept": "Oryginał został zachowany, wynik zapisano jako kopię","notice.original_in_trash": "Oryginał jest w Koszu, wynik zachował własną nazwę",@@ -822,6 +824,12 @@"presets.max_size": "Limit rozmiaru (MB)","presets.max_size_hint_image": "0 = bez limitu. Większy obraz jest zapisywany ponownie w niższej jakości, a potem mniejszy, aż się zmieści.","presets.max_size_hint_video": "0 = bez limitu. Większe wideo jest kodowane ponownie z przepływnością, na jaką pozwala jego długość.",+ "presets.size_range": "Rozmiar pliku",+ "presets.min_size": "Minimum",+ "presets.max_size_short": "Maksimum",+ "presets.size_unit": "Jednostka",+ "presets.min_size_hint_image": "0 = bez minimum. Mniejszy obraz zostaje zapisany ponownie w wyższej jakości; formaty bez ustawienia jakości (PNG, GIF…) nie są powiększane, a plik dostaje powiadomienie.",+ "presets.size_range_invalid": "Minimum jest większe niż maksimum.","presets.audio_bitrate": "Bitrate audio","presets.audio_bitrate.auto": "Automatyczny","presets.remove_audio": "Usuń dźwięk",diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.jsonindex e327748a..5206ebf5 100644--- a/src/Filee.App/Assets/i18n/pt-BR.json+++ b/src/Filee.App/Assets/i18n/pt-BR.json@@ -138,6 +138,8 @@"error.fon_damaged": "O arquivo .fon está danificado ou incompleto","error.m4s_needs_init": "Este .m4s é um pedaço de um vídeo transmitido por streaming e não pode ser lido sem o seu segmento inicial (init) separado","notice.pdf_not_smaller": "Não deu para deixar menor, então foi copiado como está",+ "notice.under_min_size": "Salvo, mas menor que o tamanho mínimo do arquivo",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Objetos que a versão do AutoCAD escolhida não tem (multilinhas de chamada, malhas…) ficaram de fora","notice.original_kept": "O original foi mantido, o resultado foi salvo como cópia","notice.original_in_trash": "O original está na Lixeira, o resultado manteve o próprio nome",@@ -822,6 +824,12 @@"presets.max_size": "Limite de tamanho (MB)","presets.max_size_hint_image": "0 = sem limite. Uma imagem maior é salva de novo com qualidade menor e depois menor, até caber.","presets.max_size_hint_video": "0 = sem limite. Um vídeo maior é codificado de novo com a taxa de bits que a duração permite.",+ "presets.size_range": "Tamanho do arquivo",+ "presets.min_size": "Mínimo",+ "presets.max_size_short": "Máximo",+ "presets.size_unit": "Unidade",+ "presets.min_size_hint_image": "0 = sem mínimo. Uma imagem menor é salva novamente com qualidade maior; formatos sem ajuste de qualidade (PNG, GIF…) não ficam maiores e o arquivo recebe um aviso.",+ "presets.size_range_invalid": "O mínimo é maior que o máximo.","presets.audio_bitrate": "Taxa de bits do áudio","presets.audio_bitrate.auto": "Automática","presets.remove_audio": "Remover o som",diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.jsonindex d50366cf..e87adcab 100644--- a/src/Filee.App/Assets/i18n/pt-PT.json+++ b/src/Filee.App/Assets/i18n/pt-PT.json@@ -138,6 +138,8 @@"error.fon_damaged": "O ficheiro .fon está danificado ou incompleto","error.m4s_needs_init": "Este .m4s é um pedaço de um vídeo em streaming e não pode ser lido sem o respetivo segmento inicial (init) separado","notice.pdf_not_smaller": "Não foi possível reduzir o tamanho, pelo que o ficheiro foi copiado sem alterações",+ "notice.under_min_size": "Guardado, mas mais pequeno do que o tamanho mínimo do ficheiro",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Os objetos que a versão de AutoCAD escolhida não suporta (linhas de chamada múltiplas, malhas…) foram omitidos","notice.original_kept": "O original foi mantido e o resultado foi guardado como cópia","notice.original_in_trash": "O original está na Reciclagem ou no Lixo; o resultado manteve o seu próprio nome",@@ -822,6 +824,12 @@"presets.max_size": "Limite de tamanho (MB)","presets.max_size_hint_image": "0 = sem limite. Uma imagem maior é guardada novamente com menos qualidade e depois mais pequena, até caber.","presets.max_size_hint_video": "0 = sem limite. Um vídeo maior é codificado novamente com a taxa de bits que a duração permite.",+ "presets.size_range": "Tamanho do ficheiro",+ "presets.min_size": "Mínimo",+ "presets.max_size_short": "Máximo",+ "presets.size_unit": "Unidade",+ "presets.min_size_hint_image": "0 = sem mínimo. Uma imagem mais pequena é guardada novamente com qualidade superior; formatos sem definição de qualidade (PNG, GIF…) não ficam maiores e o ficheiro recebe um aviso.",+ "presets.size_range_invalid": "O mínimo é maior do que o máximo.","presets.audio_bitrate": "Taxa de bits do áudio","presets.audio_bitrate.auto": "Automática","presets.remove_audio": "Remover o som",diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.jsonindex 00dc7454..11c91dd5 100644--- a/src/Filee.App/Assets/i18n/ru.json+++ b/src/Filee.App/Assets/i18n/ru.json@@ -138,6 +138,8 @@"error.fon_damaged": "Файл .fon повреждён или обрезан","error.m4s_needs_init": "Этот .m4s — фрагмент потокового видео: без отдельного начального сегмента (init) его не прочитать","notice.pdf_not_smaller": "Уменьшить не получилось, файл скопирован как есть",+ "notice.under_min_size": "Сохранено, но меньше минимального размера файла",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Объекты, которых нет в выбранной версии AutoCAD (мультивыноски, сети…), не сохранены","notice.original_kept": "Оригинал оставлен, результат сохранён как копия","notice.original_in_trash": "Оригинал в Корзине, результат сохранил своё имя",@@ -822,6 +824,12 @@"presets.max_size": "Предел размера (МБ)","presets.max_size_hint_image": "0 = без предела. Изображение крупнее сохраняется заново с меньшим качеством, затем меньше по размеру, пока не уложится.","presets.max_size_hint_video": "0 = без предела. Видео крупнее кодируется заново с битрейтом, который позволяет его длительность.",+ "presets.size_range": "Размер файла",+ "presets.min_size": "Минимум",+ "presets.max_size_short": "Максимум",+ "presets.size_unit": "Единица",+ "presets.min_size_hint_image": "0 = без минимума. Изображение меньшего размера сохраняется повторно с более высоким качеством; форматы без настройки качества (PNG, GIF…) не увеличиваются, вместо этого к файлу добавляется уведомление.",+ "presets.size_range_invalid": "Минимум больше максимума.","presets.audio_bitrate": "Битрейт звука","presets.audio_bitrate.auto": "Автоматически","presets.remove_audio": "Убрать звук",diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.jsonindex 6bd724f0..4bd55e49 100644--- a/src/Filee.App/Assets/i18n/th.json+++ b/src/Filee.App/Assets/i18n/th.json@@ -132,6 +132,8 @@"error.fon_damaged": "ไฟล์ .fon เสียหายหรือไม่สมบูรณ์","error.m4s_needs_init": "ไฟล์ .m4s นี้เป็นชิ้นส่วนหนึ่งของวิดีโอสตรีมมิง และอ่านไม่ได้หากไม่มีเซกเมนต์เริ่มต้น (init) ที่แยกไว้","notice.pdf_not_smaller": "ไม่สามารถบีบอัดให้เล็กลงได้ จึงคัดลอกไฟล์ตามเดิม",+ "notice.under_min_size": "บันทึกแล้ว แต่เล็กกว่าขนาดไฟล์ขั้นต่ำ",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "ละวัตถุที่ AutoCAD เวอร์ชันที่เลือกไม่มี (มัลติลีดเดอร์ เมช …) ไว้","notice.original_kept": "เก็บไฟล์ต้นฉบับไว้ และบันทึกผลลัพธ์เป็นสำเนา","notice.original_in_trash": "ไฟล์ต้นฉบับอยู่ในถังขยะ ผลลัพธ์ยังใช้ชื่อของตัวเอง",@@ -807,6 +809,12 @@"presets.max_size": "ขนาดสูงสุด (MB)","presets.max_size_hint_image": "0 = ไม่จำกัด รูปที่ใหญ่กว่าจะถูกบันทึกใหม่ด้วยคุณภาพต่ำลง แล้วย่อขนาด จนกว่าจะพอดี","presets.max_size_hint_video": "0 = ไม่จำกัด วิดีโอที่ใหญ่กว่าจะถูกเข้ารหัสใหม่ด้วยบิตเรตที่ความยาวของมันรองรับ",+ "presets.size_range": "ขนาดไฟล์",+ "presets.min_size": "ต่ำสุด",+ "presets.max_size_short": "สูงสุด",+ "presets.size_unit": "หน่วย",+ "presets.min_size_hint_image": "0 = ไม่มีขั้นต่ำ ภาพที่เล็กกว่าจะถูกบันทึกใหม่ด้วยคุณภาพที่สูงขึ้น รูปแบบที่ไม่มีการตั้งค่าคุณภาพ (PNG, GIF…) จะไม่ถูกทำให้ใหญ่ขึ้น แต่ไฟล์จะได้รับการแจ้งเตือนแทน",+ "presets.size_range_invalid": "ค่าต่ำสุดมากกว่าค่าสูงสุด","presets.audio_bitrate": "บิตเรตเสียง","presets.audio_bitrate.auto": "อัตโนมัติ","presets.remove_audio": "ลบเสียงออก",diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.jsonindex 92ee1139..ddfd21a2 100644--- a/src/Filee.App/Assets/i18n/tr.json+++ b/src/Filee.App/Assets/i18n/tr.json@@ -132,6 +132,8 @@"error.fon_damaged": ".fon dosyası hasarlı veya eksik","error.m4s_needs_init": "Bu .m4s, akışla gelen bir videonun bir parçası: ayrı başlangıç (init) segmenti olmadan okunamaz","notice.pdf_not_smaller": "Küçültülemediği için olduğu gibi kopyalandı",+ "notice.under_min_size": "Kaydedildi, ancak en küçük dosya boyutundan küçük",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "Seçilen AutoCAD sürümünün desteklemediği nesneler (çoklu kılavuzlar, ağlar…) çıkarıldı","notice.original_kept": "Özgün dosya korundu, sonuç kopya olarak kaydedildi","notice.original_in_trash": "Özgün dosya Geri Dönüşüm Kutusu'nda / Çöp Sepeti'nde; sonuç kendi adını korudu",@@ -807,6 +809,12 @@"presets.max_size": "Boyut sınırı (MB)","presets.max_size_hint_image": "0 = sınır yok. Daha büyük bir resim, sığana kadar önce daha düşük kalitede, sonra daha küçük olarak yeniden kaydedilir.","presets.max_size_hint_video": "0 = sınır yok. Daha büyük bir video, süresinin izin verdiği bit hızıyla yeniden kodlanır.",+ "presets.size_range": "Dosya boyutu",+ "presets.min_size": "En az",+ "presets.max_size_short": "En çok",+ "presets.size_unit": "Birim",+ "presets.min_size_hint_image": "0 = en az sınır yok. Daha küçük bir resim daha yüksek kaliteyle yeniden kaydedilir; kalite ayarı olmayan biçimler (PNG, GIF…) büyütülmez, bunun yerine dosyaya bir bildirim eklenir.",+ "presets.size_range_invalid": "En az değer en çok değerden büyük.","presets.audio_bitrate": "Ses bit hızı","presets.audio_bitrate.auto": "Otomatik","presets.remove_audio": "Sesi kaldır",diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.jsonindex c76a842d..17eb59db 100644--- a/src/Filee.App/Assets/i18n/zh-CN.json+++ b/src/Filee.App/Assets/i18n/zh-CN.json@@ -138,6 +138,8 @@"error.fon_damaged": ".fon 文件已损坏或不完整","error.m4s_needs_init": "此 .m4s 是流媒体视频的一个片段,没有单独的起始(init)分段就无法读取","notice.pdf_not_smaller": "无法再缩小,已原样复制",+ "notice.under_min_size": "已保存,但小于最小文件大小",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "已省略所选 AutoCAD 版本没有的对象(多重引线、网格……)","notice.original_kept": "已保留原文件,结果另存为副本","notice.original_in_trash": "原文件已在回收站/废纸篓中,结果保留了自己的名称",@@ -822,6 +824,12 @@"presets.max_size": "大小上限(MB)","presets.max_size_hint_image": "0 = 不限。较大的图片会先降低质量、再缩小,重新保存直到符合上限。","presets.max_size_hint_video": "0 = 不限。较大的视频会按其时长允许的码率重新编码。",+ "presets.size_range": "文件大小",+ "presets.min_size": "最小",+ "presets.max_size_short": "最大",+ "presets.size_unit": "单位",+ "presets.min_size_hint_image": "0 = 无最小值。较小的图片会以更高的质量重新保存;没有质量设置的格式(PNG、GIF…)不会变大,而是为文件附加通知。",+ "presets.size_range_invalid": "最小值大于最大值。","presets.audio_bitrate": "音频比特率","presets.audio_bitrate.auto": "自动","presets.remove_audio": "去除声音",diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.jsonindex db5bb5db..ce1f61cc 100644--- a/src/Filee.App/Assets/i18n/zh-TW.json+++ b/src/Filee.App/Assets/i18n/zh-TW.json@@ -138,6 +138,8 @@"error.fon_damaged": ".fon 檔案已損壞或不完整","error.m4s_needs_init": "此 .m4s 是串流影片的一個片段,沒有另外的起始(init)區段就無法讀取","notice.pdf_not_smaller": "無法再縮小,已原樣複製",+ "notice.under_min_size": "已儲存,但小於最小檔案大小",+ "notice.with_under_min_size": "{0} · {1}","notice.cad_newer_left_out": "已略過所選 AutoCAD 版本沒有的物件(複線引線、網格……)","notice.original_kept": "已保留原始檔案,結果另存為副本","notice.original_in_trash": "原始檔案已在資源回收筒/垃圾桶中,結果保留了自己的名稱",@@ -822,6 +824,12 @@"presets.max_size": "大小上限(MB)","presets.max_size_hint_image": "0 = 不限。較大的圖片會先降低品質、再縮小,重新儲存直到符合上限。","presets.max_size_hint_video": "0 = 不限。較大的影片會以其長度允許的位元速率重新編碼。",+ "presets.size_range": "檔案大小",+ "presets.min_size": "最小",+ "presets.max_size_short": "最大",+ "presets.size_unit": "單位",+ "presets.min_size_hint_image": "0 = 無最小值。較小的圖片會以更高的品質重新儲存;沒有品質設定的格式(PNG、GIF…)不會變大,而是為檔案附加通知。",+ "presets.size_range_invalid": "最小值大於最大值。","presets.audio_bitrate": "音訊位元率","presets.audio_bitrate.auto": "自動","presets.remove_audio": "去除聲音",diff --git a/src/Filee.App/ViewModels/JobViewModel.cs b/src/Filee.App/ViewModels/JobViewModel.csindex a213dbf7..8e8cd334 100644--- a/src/Filee.App/ViewModels/JobViewModel.cs+++ b/src/Filee.App/ViewModels/JobViewModel.cs@@ -120,7 +120,7 @@ public sealed partial class JobViewModel : ObservableObjectif (!unknown.SequenceEqual(UnknownExtensions))UnknownExtensions = unknown;- var noted = Job.Files.Where(f => f.State == FileState.Done && f.NoticeKey is not null).ToList();+ var noted = Job.Files.Where(f => f.State == FileState.Done && f.HasNotice).ToList();HasNotices = noted.Count > 0;Notices = noted.Count == 0 ? null : string.Join(Environment.NewLine,noted.Select(f => $"{Path.GetFileName(f.SourcePath)} — {_loc.Notice(f)}"));diff --git a/src/Filee.App/ViewModels/PresetEditorViewModel.cs b/src/Filee.App/ViewModels/PresetEditorViewModel.csindex e2dade5e..a7fc5460 100644--- a/src/Filee.App/ViewModels/PresetEditorViewModel.cs+++ b/src/Filee.App/ViewModels/PresetEditorViewModel.cs@@ -20,6 +20,15 @@ public interface IChoicestring? Detail { get; }}+/// <summary>The unit of a picture's size range in the preset editor (#662); the preset itself keeps megabytes.</summary>+public enum FileSizeUnit+{+ /// <summary>1,000 bytes.</summary>+ KB,+ /// <summary>1,000,000 bytes.</summary>+ MB,+}+/// <summary>A value with a localized label for combo boxes.</summary>public sealed record Choice<T>(T Value, string Label, string? Detail = null) : IChoice{@@ -163,7 +172,12 @@ public sealed partial class PresetEditorViewModel : ObservableObject_traceColors = Math.Clamp(_edit.Trace.Colors, TracingOptions.MinColors, TracingOptions.MaxColors);_traceDetail = Math.Clamp(_edit.Trace.Detail, 0, 100);_quality = _edit.Image.Quality;- _imageMaxSizeMb = (decimal)_edit.Image.MaxSizeMb;+ // In KB when the size that's set (the maximum, else the minimum) is under 1 MB: 0.05 MB reads as 50 KB.+ var shown = _edit.Image.MaxSizeMb > 0 ? _edit.Image.MaxSizeMb : _edit.Image.MinSizeMb;+ _imageSizeUnit = SizeUnits[shown is > 0 and < 1 ? 0 : 1];+ var perMegabyte = _imageSizeUnit.Value == FileSizeUnit.KB ? 1000m : 1m;+ _imageMaxSize = (decimal)_edit.Image.MaxSizeMb * perMegabyte;+ _imageMinSize = (decimal)_edit.Image.MinSizeMb * perMegabyte;_videoMaxSizeMb = (decimal)_edit.Media.MaxSizeMb;_resizePercent = _edit.Image.ResizePercent;_longEdge = _edit.Image.LongEdge;@@ -260,7 +274,8 @@ public sealed partial class PresetEditorViewModel : ObservableObjectnameof(AudioCodecs), nameof(AudioCodecChoice), nameof(ShowAudioCodec),nameof(ShowArchive), nameof(ShowArchiveOptions), nameof(ShowExtractNote),nameof(ShowSaveEveryFrame), nameof(ShowAnimationSpeed), nameof(ShowTrace), nameof(ShowCad), nameof(ShowCadColors), nameof(ShowExtractMotionPhoto), nameof(ShowSlideshow),- nameof(ShowLivePhotoChoice), nameof(LivePhotoKinds), nameof(LivePhotoChoice), nameof(IsLivePhoto), nameof(LivePhotoHint))]+ nameof(ShowLivePhotoChoice), nameof(LivePhotoKinds), nameof(LivePhotoChoice), nameof(IsLivePhoto), nameof(LivePhotoHint),+ nameof(ShowImageSize), nameof(SizeRangeError), nameof(IsValid))]private Choice<string> _target;private LivePhotoKind _livePhotoValue;@@ -287,7 +302,7 @@ public sealed partial class PresetEditorViewModel : ObservableObjectreturn;_livePhotoValue = value.Value;OnPropertyChanged();- foreach (var name in (string[])[nameof(IsLivePhoto), nameof(LivePhotoHint), nameof(ShowImage), nameof(ShowPdf), nameof(ShowSaveEveryFrame)])+ foreach (var name in (string[])[nameof(IsLivePhoto), nameof(LivePhotoHint), nameof(ShowImage), nameof(ShowPdf), nameof(ShowSaveEveryFrame), nameof(ShowImageSize), nameof(SizeRangeError), nameof(IsValid)])OnPropertyChanged(name);}}@@ -398,8 +413,30 @@ public sealed partial class PresetEditorViewModel : ObservableObject[ObservableProperty] private bool _fitsDebayer;[ObservableProperty] private int _quality;- /// <summary>"Size limit (MB)" for a picture or a video (0 = none, #553).</summary>- [ObservableProperty] private decimal? _imageMaxSizeMb;+ /// <summary>A picture's size range (#553, #662) in <see cref="ImageSizeUnit"/>; 0 or empty = none.</summary>+ [ObservableProperty, NotifyPropertyChangedFor(nameof(SizeRangeError), nameof(IsValid))] private decimal? _imageMinSize;+ [ObservableProperty, NotifyPropertyChangedFor(nameof(SizeRangeError), nameof(IsValid))] private decimal? _imageMaxSize;++ /// <summary>KB or MB, for both ends of the range; not saved (the preset keeps megabytes).</summary>+ [ObservableProperty, NotifyPropertyChangedFor(nameof(SizeFormat), nameof(SizeIncrement))] private Choice<FileSizeUnit> _imageSizeUnit;++ public IReadOnlyList<Choice<FileSizeUnit>> SizeUnits { get; } =+ [new(FileSizeUnit.KB, "KB"), new(FileSizeUnit.MB, "MB")];++ /// <summary>Every byte shows: 50.5 KB, or a precise size saved before.</summary>+ public string SizeFormat => ImageSizeUnit.Value == FileSizeUnit.KB ? "0.####" : "0.#######";+ public decimal SizeIncrement => ImageSizeUnit.Value == FileSizeUnit.KB ? 10 : 0.5m;++ /// <summary>4096 MB in either unit, as the video's box: what the boxes show is what is saved.</summary>+ public decimal SizeMaximum => ImageSizeUnit.Value == FileSizeUnit.KB ? 4_096_000 : 4096;++ /// <summary>The size range's boxes are shown (not for a Live / Motion Photo, nor a format without a quality).</summary>+ public bool ShowImageSize => ShowImage && ShowQuality;++ /// <summary>A minimum over the maximum, while the boxes are shown; a maximum of 0 is no maximum.</summary>+ public string? SizeRangeError => ShowImageSize && ImageMaxSize > 0 && ImageMinSize > ImageMaxSize ? _loc["presets.size_range_invalid"] : null;++ /// <summary>"Size limit (MB)" for a video (0 = none, #553).</summary>[ObservableProperty] private decimal? _videoMaxSizeMb;[ObservableProperty] private int _resizePercent;[ObservableProperty] private int _longEdge;@@ -538,6 +575,24 @@ public sealed partial class PresetEditorViewModel : ObservableObject// A combo box that loses its selection sets null: every choice keeps its value (see Choices.Restore).partial void OnTargetChanged(Choice<string>? oldValue, Choice<string> newValue) => Choices.Restore(oldValue, newValue, v => Target = v);++ /// <summary>+ /// Both ends keep their size in the other unit: 500 KB becomes 0.5 MB. The boxes' maximum is raised before the+ /// values grow and lowered after they shrink, so a box never cuts a value to the other unit's maximum.+ /// </summary>+ partial void OnImageSizeUnitChanged(Choice<FileSizeUnit>? oldValue, Choice<FileSizeUnit> newValue)+ {+ if (Choices.Restore(oldValue, newValue, v => ImageSizeUnit = v) || oldValue is null || oldValue.Value == newValue.Value)+ return;+ var toKilobytes = newValue.Value == FileSizeUnit.KB;+ if (toKilobytes)+ OnPropertyChanged(nameof(SizeMaximum));+ var factor = toKilobytes ? 1000m : 0.001m;+ ImageMinSize *= factor;+ ImageMaxSize *= factor;+ if (!toKilobytes)+ OnPropertyChanged(nameof(SizeMaximum));+ }partial void OnResizeChanged(Choice<ResizeMode>? oldValue, Choice<ResizeMode> newValue) => Choices.Restore(oldValue, newValue, v => Resize = v);partial void OnRotationChanged(Choice<ImageRotation>? oldValue, Choice<ImageRotation> newValue) => Choices.Restore(oldValue, newValue, v => Rotation = v);partial void OnFlipChanged(Choice<ImageFlip>? oldValue, Choice<ImageFlip> newValue) => Choices.Restore(oldValue, newValue, v => Flip = v);@@ -680,7 +735,10 @@ public sealed partial class PresetEditorViewModel : ObservableObjectprivate static double SizeLimit(decimal? megabytes) => (double)Math.Clamp(megabytes ?? 0, 0, 4096);public string? NameError => string.IsNullOrWhiteSpace(Name) ? _loc["presets.name_required"] : null;- public bool IsValid => NameError is null;+ public bool IsValid => NameError is null && SizeRangeError is null;++ /// <summary>A size from the range's boxes in megabytes.</summary>+ private decimal? Megabytes(decimal? size) => ImageSizeUnit.Value == FileSizeUnit.KB ? size / 1000 : size;/// <summary>Writes the edits into the original preset. Returns false if the input is invalid.</summary>public bool Apply()@@ -696,7 +754,8 @@ public sealed partial class PresetEditorViewModel : ObservableObjectvar image = _original.Image;image.Quality = Math.Clamp(Quality, 1, 100);// Only where the field is shown, as with SaveEveryFrame below: a limit left behind by a JPG target fits nothing.- image.MaxSizeMb = ShowQuality ? SizeLimit(ImageMaxSizeMb) : 0;+ image.MaxSizeMb = ShowQuality ? SizeLimit(Megabytes(ImageMaxSize)) : 0;+ image.MinSizeMb = ShowImageSize ? SizeLimit(Megabytes(ImageMinSize)) : 0;if (Resize.Value == ResizeMode.Custom){// Custom sizing is stored as CustomSize with Resize None, never as a resize name an older version rejectsdiff --git a/src/Filee.App/Views/PresetEditorView.axaml b/src/Filee.App/Views/PresetEditorView.axamlindex 4fbfe945..c0dcc27a 100644--- a/src/Filee.App/Views/PresetEditorView.axaml+++ b/src/Filee.App/Views/PresetEditorView.axaml@@ -111,11 +111,22 @@</DockPanel><Slider Minimum="1" Maximum="100" Value="{Binding Quality}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource presets.quality}" /></StackPanel>- <Grid ColumnDefinitions="Auto,12,170" IsVisible="{Binding ShowQuality}">- <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource presets.max_size}" />- <NumericUpDown Grid.Column="2" Value="{Binding ImageMaxSizeMb}" Minimum="0" Maximum="4096" Increment="0.5" FormatString="0.#"- ToolTip.Tip="{DynamicResource presets.max_size_hint_image}" AutomationProperties.Name="{DynamicResource presets.max_size}" />- </Grid>+ <!-- File size range (#553, #662): both ends in one unit; the preset keeps megabytes. -->+ <StackPanel IsVisible="{Binding ShowQuality}" Spacing="4">+ <TextBlock Classes="label" Text="{DynamicResource presets.size_range}" />+ <Grid ColumnDefinitions="*,8,Auto,8,*,8,Auto">+ <NumericUpDown Name="ImageMinSize" Value="{Binding ImageMinSize}" Minimum="0" Maximum="{Binding SizeMaximum}"+ Increment="{Binding SizeIncrement}" FormatString="{Binding SizeFormat}"+ ToolTip.Tip="{DynamicResource presets.min_size_hint_image}" AutomationProperties.Name="{DynamicResource presets.min_size}" />+ <TextBlock Grid.Column="2" Text="~" VerticalAlignment="Center" />+ <NumericUpDown Grid.Column="4" Name="ImageMaxSize" Value="{Binding ImageMaxSize}" Minimum="0" Maximum="{Binding SizeMaximum}"+ Increment="{Binding SizeIncrement}" FormatString="{Binding SizeFormat}"+ ToolTip.Tip="{DynamicResource presets.max_size_hint_image}" AutomationProperties.Name="{DynamicResource presets.max_size_short}" />+ <ComboBox Grid.Column="6" Name="ImageSizeUnit" ItemsSource="{Binding SizeUnits}" SelectedItem="{Binding ImageSizeUnit}"+ AutomationProperties.Name="{DynamicResource presets.size_unit}" />+ </Grid>+ <TextBlock Classes="caption danger" Text="{Binding SizeRangeError}" IsVisible="{Binding SizeRangeError, Converter={x:Static ObjectConverters.IsNotNull}}" />+ </StackPanel><Grid ColumnDefinitions="*,12,*"><StackPanel><TextBlock Classes="label" Text="{DynamicResource presets.resize}" />diff --git a/src/Filee.Cli/Cli.cs b/src/Filee.Cli/Cli.csindex d9765ea1..8009843a 100644--- a/src/Filee.Cli/Cli.cs+++ b/src/Filee.Cli/Cli.cs@@ -132,7 +132,11 @@ internal static class Clireturn;lock (printed){- foreach (var file in job.Files.Where(f => f.State is not (FileState.Pending or FileState.Running) && printed.Add(f)))+ // While the job runs, a file done with no output yet is only a step on the way (a page of a multi-page TIFF,+ // a picture made PNG to be joined): it is printed at the end, with what it became and its notice. The queue+ // always raises the event as itself; only the last call below, after the job, has no sender.+ foreach (var file in job.Files.Where(f => f.State is not (FileState.Pending or FileState.Running)+ && (sender is null || f.State != FileState.Done || f.Outputs.Count > 0) && printed.Add(f)))output.WriteLine(Describe(file, host.Texts));}}@@ -157,7 +161,7 @@ internal static class Clireturn file.State switch{FileState.Done => $"ok {source} -> {string.Join(", ", file.Outputs.Select(Shorten))}"- + (file.NoticeKey is null ? "" : $" ({Notice(file, texts)})")+ + (file.HasNotice ? $" ({Notice(file, texts)})" : "")+ (file.MissingFonts.Count == 0 ? "" : $" (missing fonts: {string.Join(", ", file.MissingFonts)})"),FileState.Skipped => $"skip {source} (the output file already exists)",FileState.Cancelled => $"stop {source} (cancelled)",@@ -204,7 +208,7 @@ internal static class Clijson.WriteEndArray();if (file.State is FileState.Failed or FileState.Cancelled)json.WriteString("error", Error(file, texts));- else if (file.NoticeKey is not null)+ else if (file.HasNotice)json.WriteString("notice", Notice(file, texts));if (file.MissingFonts.Count > 0){diff --git a/src/Filee.Core/Conversion/ConversionJob.cs b/src/Filee.Core/Conversion/ConversionJob.csindex e2280ceb..262ddb2f 100644--- a/src/Filee.Core/Conversion/ConversionJob.cs+++ b/src/Filee.Core/Conversion/ConversionJob.cs@@ -66,6 +66,15 @@ public sealed class FileResult/// <summary>The system's own words after <see cref="NoticeReasonKey"/> (not localized), or null.</summary>public string? NoticeDetail { get; set; }+ /// <summary>+ /// A picture it became stayed under the preset's minimum size (#662). Apart from <see cref="NoticeKey"/>, which a+ /// later note (the original kept or copied) replaces: both are shown.+ /// </summary>+ public bool UnderMinimumSize { get; set; }++ /// <summary>There is a note to show: <see cref="NoticeKey"/>, <see cref="UnderMinimumSize"/> or both.</summary>+ public bool HasNotice => NoticeKey is not null || UnderMinimumSize;+/// <summary>"Replace the original" sent the source to the Recycle Bin / Trash (its path may now hold the result).</summary>public bool OriginalInTrash { get; set; }diff --git a/src/Filee.Core/Conversion/JobQueue.cs b/src/Filee.Core/Conversion/JobQueue.csindex c9517bce..2c9dd41f 100644--- a/src/Filee.Core/Conversion/JobQueue.cs+++ b/src/Filee.Core/Conversion/JobQueue.cs@@ -356,6 +356,9 @@ public sealed class JobQueue : IAsyncDisposableallocator.Discard();throw;}+ // Not checked against the maximum (as before), but a picture under the minimum gets its notice (#662).+ if (SizeLimit.IsUnderMinimum(job.Preset, [output]))+ first.UnderMinimumSize = true;first.Outputs.Add(output);foreach (var f in job.Files.Where(f => f.State != FileState.Failed)){@@ -532,6 +535,8 @@ public sealed class JobQueue : IAsyncDisposable{await write(output, progress);SizeLimit.Check(job.Preset, [output]); // joined media aren't fitted: one over the limit is refused (#553)+ if (SizeLimit.IsUnderMinimum(job.Preset, [output]))+ first.UnderMinimumSize = true;first.Outputs.Add(output);foreach (var f in joined){@@ -851,7 +856,7 @@ public sealed class JobQueue : IAsyncDisposableif (preset.Image.ChangesSpeed && !(isLast && finalOutput))preset = AtOriginalSpeed(preset);// Likewise the size limit: only the result has to fit, not a picture passed to the next engine.- if ((preset.Image.MaxSizeMb > 0 || preset.Media.MaxSizeMb > 0) && !(isLast && finalOutput))+ if ((preset.Image.MaxSizeMb > 0 || preset.Image.MinSizeMb > 0 || preset.Media.MaxSizeMb > 0) && !(isLast && finalOutput))preset = WithoutSizeLimit(preset);var stepInfo = new ConversionStep(input, step.From, step.To, preset, allocator, workDir, step.FrameSequence,key => file.NoticeKey = key, step.MotionPhoto, step.LivePhoto, fonts =>@@ -884,6 +889,9 @@ public sealed class JobQueue : IAsyncDisposable// The size limit (#553): a result the engine couldn't fit (HEIC, a render, an animation) isn't handed over.if (finalOutput)SizeLimit.Check(runWith, inputs);+ // The minimum (#662), on the pictures themselves: after the source was copied over, before they go into a ZIP.+ if (finalOutput && SizeLimit.IsUnderMinimum(runWith, inputs))+ file.UnderMinimumSize = true;if (zipResult && inputs.Count > 0)inputs = PackZip(job, file, index, inputs, ct);@@ -949,6 +957,7 @@ public sealed class JobQueue : IAsyncDisposable{var copy = preset.Clone();copy.Image.MaxSizeMb = 0;+ copy.Image.MinSizeMb = 0;copy.Media.MaxSizeMb = 0;return copy;}diff --git a/src/Filee.Core/Localization/ILocalizer.cs b/src/Filee.Core/Localization/ILocalizer.csindex 6179d23b..67e60465 100644--- a/src/Filee.Core/Localization/ILocalizer.cs+++ b/src/Filee.Core/Localization/ILocalizer.cs@@ -27,14 +27,18 @@ public static class LocalizerExtensions{/// <summary>/// A file's notice with why in brackets, the reason translated and the system's own words after it:- /// "The original was kept… (the file is open in another program)".+ /// "The original was kept… (the file is open in another program)". A picture under the preset's minimum size adds+ /// its own sentence, or is the notice on its own (<see cref="Conversion.FileResult.UnderMinimumSize"/>, #662)./// </summary>public static string Notice(this ILocalizer loc, Conversion.FileResult file){+ if (file.NoticeKey is null)+ return file.UnderMinimumSize ? loc["notice.under_min_size"] : string.Empty;var why = file.NoticeReasonKey is { } key ? loc[key] : null;if (!string.IsNullOrWhiteSpace(file.NoticeDetail))why = why is null ? file.NoticeDetail : $"{why}: {file.NoticeDetail}";- return why is null ? loc[file.NoticeKey!] : $"{loc[file.NoticeKey!]} ({why})";+ var notice = why is null ? loc[file.NoticeKey] : $"{loc[file.NoticeKey]} ({why})";+ return file.UnderMinimumSize ? loc.Format("notice.with_under_min_size", notice, loc["notice.under_min_size"]) : notice;}public static string DisplayName(this ILocalizer loc, Preset preset) =>diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.csindex ffe50ebf..34dabca1 100644--- a/src/Filee.Core/Presets/Preset.cs+++ b/src/Filee.Core/Presets/Preset.cs@@ -412,6 +412,12 @@ public sealed class ImageOptions/// </summary>public double MaxSizeMb { get; set; }+ /// <summary>+ /// Keep each picture at least this many MB of 1,000,000 bytes; 0 = no minimum. A smaller one in a lossy format is+ /// saved again at a higher quality (never padded or enlarged); one that stays under it is kept, with a notice (#662).+ /// </summary>+ public double MinSizeMb { get; set; }+/// <summary>/// How the picture is scaled. A preset with <see cref="CustomSize"/> or <see cref="MinShortEdge"/> set stores None/// here (that sizing wins), so a version without it simply does not resize instead of rejecting a name it doesdiff --git a/src/Filee.Core/Presets/SizeLimit.cs b/src/Filee.Core/Presets/SizeLimit.csindex ea9fb1fa..709f6399 100644--- a/src/Filee.Core/Presets/SizeLimit.cs+++ b/src/Filee.Core/Presets/SizeLimit.cs@@ -12,9 +12,16 @@ public static class SizeLimit/// <summary>Megabytes of 1,000,000 bytes.</summary>public static long Bytes(double megabytes) => (long)(megabytes * 1_000_000);- /// <summary>"12.3 MB > 10 MB", in the same megabytes.</summary>- public static string Describe(long size, long limit) =>- string.Create(CultureInfo.InvariantCulture, $"{size / 1e6:0.##} MB > {limit / 1e6:0.##} MB");+ /// <summary>+ /// Megabytes of 1,000,000 bytes, to the nearest byte: a minimum truncated like <see cref="Bytes"/> would let a+ /// file one byte short through (1.001 MB is 1,000,999.9999… bytes as a double).+ /// </summary>+ public static long MinimumBytes(double megabytes) => (long)Math.Round(megabytes * 1_000_000, MidpointRounding.AwayFromZero);++ /// <summary>"12.3 MB > 10 MB", in the same megabytes; a picture's limit under 1 MB in KB ("61.2 KB > 50 KB").</summary>+ public static string Describe(long size, long limit, bool image = false) => image && limit < 1_000_000+ ? string.Create(CultureInfo.InvariantCulture, $"{size / 1e3:0.##} KB > {limit / 1e3:0.##} KB")+ : string.Create(CultureInfo.InvariantCulture, $"{size / 1e6:0.##} MB > {limit / 1e6:0.##} MB");/// <summary>The limit for a result of <paramref name="path"/>'s kind: pictures and videos have their own; 0 = none.</summary>public static long For(Preset preset, string path) => FormatRegistry.Detect(path)?.Category switch@@ -33,7 +40,20 @@ public static class SizeLimitforeach (var output in outputs){if (For(preset, output) is > 0 and var limit && File.Exists(output) && new FileInfo(output).Length is var size && size > limit)- throw new ConversionRefusedException("error.over_size_limit", Describe(size, limit));+ throw new ConversionRefusedException("error.over_size_limit", Describe(size, limit, IsImage(output)));}}++ /// <summary>A picture result's minimum in bytes (#662); 0 = none, also for anything that isn't a picture.</summary>+ private static long Minimum(Preset preset, string path) =>+ preset.Image.MinSizeMb > 0 && IsImage(path) ? MinimumBytes(preset.Image.MinSizeMb) : 0;++ /// <summary>+ /// Whether a picture among <paramref name="outputs"/> stayed under the preset's minimum. Only files count: a folder+ /// of video frames is left out.+ /// </summary>+ public static bool IsUnderMinimum(Preset preset, IEnumerable<string> outputs) =>+ outputs.Any(output => Minimum(preset, output) is > 0 and var minimum && File.Exists(output) && new FileInfo(output).Length < minimum);++ private static bool IsImage(string path) => FormatRegistry.Detect(path)?.Category == FormatCategory.Image;}diff --git a/src/Filee.Engines/Magick/ImageEncoder.cs b/src/Filee.Engines/Magick/ImageEncoder.csindex a043e529..fc4c8428 100644--- a/src/Filee.Engines/Magick/ImageEncoder.cs+++ b/src/Filee.Engines/Magick/ImageEncoder.cs@@ -478,8 +478,8 @@ internal static class ImageEncodercontinue;frames[i].Write(path, format);// Animations and multi-page files written above aren't fitted: the queue refuses them when they're too large.- if (options is { MaxSizeMb: > 0 })- FitToSize(frames[i], path, format, SizeLimit.Bytes(options.MaxSizeMb));+ if (options is { MaxSizeMb: > 0 } or { MinSizeMb: > 0 })+ FitToSize(frames[i], path, format, SizeLimit.Bytes(options.MaxSizeMb), SizeLimit.MinimumBytes(options.MinSizeMb));written.Add(path);}return written;@@ -492,12 +492,18 @@ internal static class ImageEncoder/// Saves <paramref name="image"/> again until <paramref name="path"/> is at most <paramref name="limit"/> bytes: a/// lower quality first (down to 50, where a lossy format still looks fine), then fewer pixels, but never below a/// long edge of <see cref="MinFittedLongEdge"/>. Refuses when it still doesn't fit, rather than hand over a file- /// that breaks the limit or a thumbnail.+ /// that breaks the limit or a thumbnail. Under <paramref name="minimum"/> (#662), a lossy format is saved again at a+ /// higher quality, never with more pixels, up to 100 or until the next step would break the limit; the queue tells+ /// about a file that stays under it./// </summary>- internal static void FitToSize(IMagickImage<byte> image, string path, MagickFormat format, long limit)+ /// <param name="limit">Most bytes; 0 = no limit.</param>+ /// <param name="minimum">Fewest bytes; 0 = no minimum.</param>+ internal static void FitToSize(IMagickImage<byte> image, string path, MagickFormat format, long limit, long minimum = 0){var size = new FileInfo(path).Length;- if (size <= limit)+ if (limit <= 0)+ limit = long.MaxValue;+ if (size <= limit && size >= minimum)return;using var copy = image.Clone();var lossy = format is MagickFormat.Jpeg or MagickFormat.WebP or MagickFormat.Avif or MagickFormat.Jxl or MagickFormat.Jp2;@@ -519,7 +525,22 @@ internal static class ImageEncodersize = new FileInfo(path).Length;}if (size > limit)- throw new ConversionRefusedException("error.over_size_limit", SizeLimit.Describe(size, limit));+ throw new ConversionRefusedException("error.over_size_limit", SizeLimit.Describe(size, limit, image: true));++ // Still the copy fitted above (its quality and pixels), never the picture as it came.+ while (lossy && size < minimum && copy.Quality < 100)+ {+ var previous = copy.Quality;+ copy.Quality = Math.Min(100, previous + 10);+ copy.Write(path, format);+ size = new FileInfo(path).Length;+ if (size > limit)+ {+ copy.Quality = previous;+ copy.Write(path, format);+ break;+ }+ }}/// <summary>Writes one image as <paramref name="targetFormat"/> (APNG through <see cref="Apng"/>).</summary>diff --git a/src/Filee.Engines/Magick/ImageJoiner.cs b/src/Filee.Engines/Magick/ImageJoiner.csindex d9c8bb91..84772637 100644--- a/src/Filee.Engines/Magick/ImageJoiner.cs+++ b/src/Filee.Engines/Magick/ImageJoiner.cs@@ -118,8 +118,9 @@ internal static class ImageJoinerImageEncoder.ApplyOptions(merged, rest, format);cancellationToken.ThrowIfCancellationRequested();ImageEncoder.WriteImage(merged, outputPath, format);- if (options.MaxSizeMb > 0)- ImageEncoder.FitToSize(merged, outputPath, ImageEncoder.OutputFormat(format, rest).Format, SizeLimit.Bytes(options.MaxSizeMb));+ if (options.MaxSizeMb > 0 || options.MinSizeMb > 0)+ ImageEncoder.FitToSize(merged, outputPath, ImageEncoder.OutputFormat(format, rest).Format, SizeLimit.Bytes(options.MaxSizeMb),+ SizeLimit.MinimumBytes(options.MinSizeMb));progress?.Report(1);}finallydiff --git a/tests/Filee.App.Tests/PresetSizeRangeTests.cs b/tests/Filee.App.Tests/PresetSizeRangeTests.csnew file mode 100644index 00000000..99599539--- /dev/null+++ b/tests/Filee.App.Tests/PresetSizeRangeTests.cs@@ -0,0 +1,234 @@+// A picture's file size range in the preset editor (#662): both ends in KB or MB, kept in megabytes in presets.json, a+// minimum over the maximum not saved while it can be seen, and a picture under the minimum noted on the result.++using System.Text.RegularExpressions;+using Avalonia.Controls;+using Avalonia.Headless;+using Avalonia.Headless.XUnit;+using Avalonia.Threading;+using Avalonia.VisualTree;+using Filee.App.Services;+using Filee.App.ViewModels;+using Filee.App.Views;+using Filee.Core.Conversion;+using Filee.Core.Localization;+using Filee.Core.Platform;+using Filee.Core.Presets;+using Filee.Core.Settings;++namespace Filee.App.Tests;++public class PresetSizeRangeTests+{+ private static void Pump()+ {+ for (var i = 0; i < 20; i++)+ {+ Dispatcher.UIThread.RunJobs();+ AvaloniaHeadlessPlatform.ForceRenderTimerTick();+ }+ }++ /// <summary>Opens <paramref name="preset"/> in the editor window and hands it to <paramref name="use"/>.</summary>+ private static void InEditor(Preset preset, Action<PresetEditorViewModel, Window> use)+ {+ var editor = new PresetEditorViewModel(preset, AppHost.Get<ILocalizer>());+ var window = new PresetEditorWindow { DataContext = editor, Height = 900 };+ window.Show();+ Pump();+ try+ {+ use(editor, window);+ }+ finally+ {+ window.Close();+ }+ }++ private static NumericUpDown Box(Window window, string name) =>+ window.GetVisualDescendants().OfType<NumericUpDown>().Single(b => b.Name == name);++ private static Choice<FileSizeUnit> Unit(PresetEditorViewModel editor, FileSizeUnit unit) => editor.SizeUnits.Single(u => u.Value == unit);++ [AvaloniaFact]+ public void Kilobytes_are_saved_as_megabytes_and_read_back_in_kilobytes()+ {+ TestServices.EnsureInitialized("en");+ var folder = Directory.CreateTempSubdirectory("filee-size-range-").FullName;+ try+ {+ var preset = new Preset { Id = "size-range", Name = "Upload", TargetFormat = "jpg" };+ InEditor(preset, (editor, window) =>+ {+ var unit = window.GetVisualDescendants().OfType<ComboBox>().Single(c => c.Name == "ImageSizeUnit");+ Assert.Equal(FileSizeUnit.MB, ((Choice<FileSizeUnit>)unit.SelectedItem!).Value);+ unit.SelectedItem = Unit(editor, FileSizeUnit.KB);+ Box(window, "ImageMinSize").Value = 50;+ Pump();+ Assert.True(editor.Apply());+ });+ Assert.Equal(0.05, preset.Image.MinSizeMb);++ var store = new UserDataStore(folder);+ store.Load();+ store.Presets.Add(preset);+ store.SaveLibrary();+ var reloaded = new UserDataStore(folder);+ reloaded.Load();+ var read = reloaded.FindPreset("size-range")!;+ Assert.Equal(0.05, read.Image.MinSizeMb);+ InEditor(read, (editor, window) =>+ {+ Assert.Equal(FileSizeUnit.KB, editor.ImageSizeUnit.Value);+ Assert.Equal("50", Box(window, "ImageMinSize").Text);++ // A part of a kilobyte shows as it is and is kept.+ Box(window, "ImageMinSize").Value = 50.5m;+ Pump();+ Assert.Equal("50.5", Box(window, "ImageMinSize").Text);+ Assert.True(editor.Apply());+ });+ Assert.Equal(0.0505, read.Image.MinSizeMb);++ // A presets.json from before the minimum: none.+ var path = Path.Combine(folder, "presets.json");+ File.WriteAllText(path, Regex.Replace(File.ReadAllText(path), "\"MinSizeMb\":\\s*[^,}\\s]+,?", "", RegexOptions.IgnoreCase));+ var older = new UserDataStore(folder);+ older.Load();+ Assert.Equal(0, older.FindPreset("size-range")!.Image.MinSizeMb);+ }+ finally+ {+ Directory.Delete(folder, true);+ }+ }++ [AvaloniaTheory]+ [InlineData(0.5, FileSizeUnit.KB, "500")]+ [InlineData(2, FileSizeUnit.MB, "2")]+ [InlineData(0.1000006, FileSizeUnit.KB, "100.0006")]+ public void A_saved_limit_opens_in_its_unit_and_is_saved_unchanged(double megabytes, FileSizeUnit unit, string shown)+ {+ TestServices.EnsureInitialized("en");+ var preset = new Preset { Name = "Upload", TargetFormat = "jpg", Image = { MaxSizeMb = megabytes } };+ InEditor(preset, (editor, window) =>+ {+ Assert.Equal(unit, editor.ImageSizeUnit.Value);+ Assert.Equal(shown, Box(window, "ImageMaxSize").Text);++ // To the other unit and back: the same size.+ var other = unit == FileSizeUnit.KB ? FileSizeUnit.MB : FileSizeUnit.KB;+ editor.ImageSizeUnit = Unit(editor, other);+ Assert.Equal((decimal)megabytes * (other == FileSizeUnit.KB ? 1000 : 1), editor.ImageMaxSize);+ editor.ImageSizeUnit = Unit(editor, unit);+ Assert.True(editor.Apply());+ });+ Assert.Equal(megabytes, preset.Image.MaxSizeMb);+ }++ [AvaloniaFact]+ public void The_boxes_go_up_to_4096_mb_in_either_unit_and_a_change_of_unit_cuts_nothing()+ {+ TestServices.EnsureInitialized("en");+ var preset = new Preset { Name = "Upload", TargetFormat = "jpg" };+ InEditor(preset, (editor, window) =>+ {+ var box = Box(window, "ImageMaxSize");+ Assert.Equal(4096m, box.Maximum);+ editor.ImageSizeUnit = Unit(editor, FileSizeUnit.KB);+ Pump();+ Assert.Equal(4_096_000m, box.Maximum);++ // 5,000 KB is over 4096 as a number: shown and kept as 5 MB, not cut to 4096 on the way.+ box.Value = 5000;+ Pump();+ editor.ImageSizeUnit = Unit(editor, FileSizeUnit.MB);+ Pump();+ Assert.Equal((5m, 4096m), (box.Value, box.Maximum));+ editor.ImageSizeUnit = Unit(editor, FileSizeUnit.KB);+ Pump();+ Assert.Equal(5000m, box.Value);+ Assert.True(editor.Apply());+ });+ Assert.Equal(5, preset.Image.MaxSizeMb);+ }++ [AvaloniaFact]+ public void Each_end_can_be_set_alone_or_cleared()+ {+ TestServices.EnsureInitialized("en");+ foreach (var (min, max) in new (decimal?, decimal?)[] { (60, null), (null, 500), (60, 500), (null, null), (0, 0) })+ {+ var preset = new Preset { Name = "Upload", TargetFormat = "jpg" };+ InEditor(preset, (editor, _) =>+ {+ editor.ImageSizeUnit = Unit(editor, FileSizeUnit.KB);+ (editor.ImageMinSize, editor.ImageMaxSize) = (min, max);+ Assert.True(editor.Apply());+ });+ Assert.Equal(((double)(min ?? 0) / 1000, (double)(max ?? 0) / 1000), (preset.Image.MinSizeMb, preset.Image.MaxSizeMb));+ InEditor(preset, (editor, _) =>+ Assert.Equal((min ?? 0, max ?? 0), (editor.ImageMinSize ?? 0, editor.ImageMaxSize ?? 0)));+ }+ }++ [AvaloniaFact]+ public void A_minimum_over_the_maximum_is_not_saved_while_it_can_be_seen()+ {+ TestServices.EnsureInitialized("en");+ var preset = new Preset { Name = "Upload", TargetFormat = "jpg" };+ InEditor(preset, (editor, window) =>+ {+ var save = window.GetVisualDescendants().OfType<Button>().Single(b => b.IsDefault);+ editor.ImageSizeUnit = Unit(editor, FileSizeUnit.KB);+ (editor.ImageMinSize, editor.ImageMaxSize) = (600, 500);+ Pump();+ Assert.NotNull(editor.SizeRangeError);+ Assert.False(editor.IsValid);+ Assert.False(save.IsEnabled);+ Assert.False(editor.Apply());++ // A format without a quality hides the boxes: nothing in the way, and no limit saved.+ editor.Target = editor.Targets.Single(t => t.Value == "png");+ Pump();+ Assert.True(editor.IsValid);+ Assert.True(save.IsEnabled);+ Assert.True(editor.Apply());+ Assert.Equal((0.0, 0.0), (preset.Image.MinSizeMb, preset.Image.MaxSizeMb));++ editor.Target = editor.Targets.Single(t => t.Value == "jpg");+ (editor.ImageMinSize, editor.ImageMaxSize) = (600, 500);+ Pump();+ Assert.False(editor.IsValid);++ // A Live / Motion Photo hides the image card: savable, without the minimum; the maximum as before.+ editor.LivePhotoChoice = editor.LivePhotoKinds.First(k => k.Value != LivePhotoKind.None);+ Pump();+ Assert.True(editor.IsValid);+ Assert.True(save.IsEnabled);+ Assert.True(editor.Apply());+ Assert.Equal((0.0, 0.5), (preset.Image.MinSizeMb, preset.Image.MaxSizeMb));++ editor.LivePhotoChoice = editor.LivePhotoKinds.Single(k => k.Value == LivePhotoKind.None);+ Pump();+ Assert.False(editor.IsValid);+ Assert.NotNull(editor.SizeRangeError);+ });+ }++ [AvaloniaFact]+ public void A_picture_under_the_minimum_is_noted_on_the_result_on_its_own()+ {+ TestServices.EnsureInitialized("en");+ var conversion = new ConversionJob(["C:/photo.jpg", "C:/other.jpg"], new Preset { TargetFormat = "jpg" }, "Upload");+ conversion.Files[0].State = FileState.Done;+ conversion.Files[0].UnderMinimumSize = true;+ conversion.Files[1].State = FileState.Done;+ var loc = AppHost.Get<ILocalizer>();+ var job = new JobViewModel(conversion, loc, AppHost.Get<IPlatformServices>(), _ => { });++ Assert.True(job.HasNotices);+ Assert.Equal($"photo.jpg — {loc["notice.under_min_size"]}", job.Notices);+ }+}diff --git a/tests/Filee.App.Tests/RenderTests.cs b/tests/Filee.App.Tests/RenderTests.csindex 42e6f9ea..93ea3ded 100644--- a/tests/Filee.App.Tests/RenderTests.cs+++ b/tests/Filee.App.Tests/RenderTests.cs@@ -495,7 +495,7 @@ public class RenderTestseditor.Target = editor.Targets.Single(t => t.Value == "jpg");Assert.False(editor.ShowVideoMaxSize);Assert.True(editor.ShowQuality);- editor.ImageMaxSizeMb = 1.5m;+ editor.ImageMaxSize = 1.5m;Assert.True(editor.Apply());Assert.Equal((0.0, 1.5), (added[^1].Media.MaxSizeMb, added[^1].Image.MaxSizeMb));diff --git a/tests/Filee.Cli.Tests/CliTests.cs b/tests/Filee.Cli.Tests/CliTests.csindex c11f5678..8df17f75 100644--- a/tests/Filee.Cli.Tests/CliTests.cs+++ b/tests/Filee.Cli.Tests/CliTests.cs@@ -381,6 +381,51 @@ public sealed class CliTests : IDisposableAssert.Equal(OperatingSystem.IsWindows(), output.Contains("optional engines", StringComparison.Ordinal));}+ [Fact]+ public async Task A_picture_under_the_minimum_is_written_with_its_notice_also_after_a_step_on_the_way()+ {+ // #662. A multi-page TIFF and a merge first turn the files into pages or PNGs: the line for the file the result+ // belongs to is printed once, at the end, with the result and the notice.+ AddPresets(+ new Preset { Id = "min-png", Name = "Min PNG", TargetFormat = "png", Image = { MinSizeMb = 1 } },+ new Preset { Id = "min-tiff", Name = "Min TIFF", TargetFormat = "tiff", Image = { MultiPageTiff = true, MinSizeMb = 1 } },+ new Preset+ {+ Id = "min-merge",+ Name = "Min merge",+ TargetFormat = "png",+ Image = { JoinIntoOne = true, MinSizeMb = 1 },+ Output = { FileNamePattern = "{name}_merged" }+ });+ string notice;+ await using (var host = CliHost.Create(_settings))+ notice = host.Texts["notice.under_min_size"];+ var a = Png("a.png");+ var b = Png("b.png");+ var logo = Path.Combine(_folder, "logo.svg");+ File.WriteAllText(logo, "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"40\" height=\"30\"><rect width=\"40\" height=\"30\" fill=\"teal\"/></svg>");++ foreach (var (args, first, result) in new (string[], string, string)[]+ {+ (["convert", a, "--preset", "min-png", "--output", Path.Combine(_folder, "out")], "a.png", Path.Combine("out", "a.png")),+ (["convert", a, b, "--preset", "min-tiff"], "a.png", "a.tiff"),+ (["convert", logo, b, "--preset", "min-merge"], "logo.svg", "logo_merged.png"),+ })+ {+ var (code, output, errors) = await Run(args);+ Assert.True(code == Cli.Success, errors + output);+ var line = Assert.Single(output.Split('\n'), l => l.StartsWith("ok", StringComparison.Ordinal) && l.Contains(first, StringComparison.Ordinal)+ && l.IndexOf(first, StringComparison.Ordinal) < l.IndexOf("->", StringComparison.Ordinal));+ Assert.Contains(result, line, StringComparison.Ordinal);+ Assert.Contains(notice, line, StringComparison.Ordinal);++ (code, output, _) = await Run([.. args, "--json", "--overwrite"]);+ Assert.Equal(Cli.Success, code);+ using var json = System.Text.Json.JsonDocument.Parse(output);+ Assert.Equal(notice, json.RootElement.GetProperty("files")[0].GetProperty("notice").GetString());+ }+ }+/// <summary>Adds presets to the settings folder the CLI runs with.</summary>private void AddPresets(params Preset[] presets){diff --git a/tests/Filee.Core.Tests/FakeConverter.cs b/tests/Filee.Core.Tests/FakeConverter.csindex f2e20acf..3c2ed273 100644--- a/tests/Filee.Core.Tests/FakeConverter.cs+++ b/tests/Filee.Core.Tests/FakeConverter.cs@@ -23,6 +23,12 @@ internal sealed class FakeConverter(string id, params ConversionEdge[] edges) :/// <summary>The picture folder is taken from the allocator (MarkdownPictures) rather than just written (Pandoc).</summary>public bool ReservesPictureFolder { get; set; } = true;+ /// <summary>What output i holds, instead of the input name and target (to make outputs of given sizes).</summary>+ public Func<int, string>? Content { get; set; }++ /// <summary>Returns a folder at the output's name instead of writing a file (a folder of video frames).</summary>+ public bool OutputIsFolder { get; set; }+/// <summary>Thrown instead of converting, when set.</summary>public Exception? Failure { get; set; }@@ -52,7 +58,13 @@ internal sealed class FakeConverter(string id, params ConversionEdge[] edges) :var path = step.Output.Allocate(step.To, OutputsPerInput > 1 ? $"_p{i + 1}" : null);if (path is null)continue;- File.WriteAllText(path, $"{Path.GetFileName(step.InputPath)}→{step.To} by {id}");+ if (OutputIsFolder)+ {+ Directory.CreateDirectory(path);+ written.Add(path);+ continue;+ }+ File.WriteAllText(path, Content?.Invoke(i) ?? $"{Path.GetFileName(step.InputPath)}→{step.To} by {id}");written.Add(path);if (PictureFolder){diff --git a/tests/Filee.Core.Tests/SizeLimitTests.cs b/tests/Filee.Core.Tests/SizeLimitTests.csindex 6289be76..d26d213c 100644--- a/tests/Filee.Core.Tests/SizeLimitTests.cs+++ b/tests/Filee.Core.Tests/SizeLimitTests.cs@@ -2,6 +2,7 @@// ready-made presets for where a file goes are offered by Add only, never put in the library on their own.using Filee.Core.Conversion;+using Filee.Core.Localization;using Filee.Core.Presets;namespace Filee.Core.Tests;@@ -62,6 +63,177 @@ public class SizeLimitTestsAssert.Equal(JobState.Completed, other.State);}+ [Fact]+ public async Task A_minimum_alone_is_also_only_for_the_step_that_writes_the_result()+ {+ // No maximum at all: the minimum on its own must be taken off the steps on the way (#662).+ using var dir = new TempDir();+ var photo = dir.File("photo.jpg");+ var first = new FakeConverter("magick", new ConversionEdge("jpg", "png"));+ var second = new FakeConverter("other", new ConversionEdge("png", "webp"));+ await using var queue = new JobQueue(new ConverterCatalog([first, second]));++ await queue.RunAsync(new ConversionJob([photo], new Preset { TargetFormat = "webp", Image = { MinSizeMb = 0.06 } }, "WEBP"));++ Assert.Equal(0, Assert.Single(first.Presets).Image.MinSizeMb);+ Assert.Equal(0.06, Assert.Single(second.Presets).Image.MinSizeMb);+ }++ [Theory]+ [InlineData(0.001, true)] // 1,000 bytes: the fake result is a few dozen+ [InlineData(0.00001, false)] // 10 bytes+ [InlineData(0, false)] // no minimum+ public async Task A_picture_under_the_minimum_is_kept_with_a_notice(double minimum, bool under)+ {+ using var dir = new TempDir();+ var photo = dir.File("photo.jpg");+ await using var queue = new JobQueue(new ConverterCatalog([new FakeConverter("magick", new ConversionEdge("jpg", "png"))]));+ var job = new ConversionJob([photo], new Preset { TargetFormat = "png", Image = { MinSizeMb = minimum } }, "PNG");++ await queue.RunAsync(job);++ var file = Assert.Single(job.Files);+ Assert.Equal(FileState.Done, file.State);+ Assert.Single(file.Outputs);+ Assert.Equal(under, file.UnderMinimumSize);+ Assert.Equal(under, file.HasNotice);+ }++ [Theory]+ [InlineData(1)]+ [InlineData(2)]+ public async Task Under_save_as_zip_the_pictures_are_measured_not_the_zip(int pictures)+ {+ using var dir = new TempDir();+ var photo = dir.File("photo.jpg");+ var big = new string('a', 5_000); // packs into a ZIP far under 4,000 bytes+ var converter = new FakeConverter("magick", new ConversionEdge("jpg", "png")) { OutputsPerInput = pictures, Content = _ => big };+ await using var queue = new JobQueue(new ConverterCatalog([converter]));+ var preset = new Preset { TargetFormat = "png", Image = { MinSizeMb = 0.004 }, Output = { ZipResult = true } };++ var fits = new ConversionJob([photo], preset, "PNG");+ await queue.RunAsync(fits);++ var zip = Assert.Single(fits.Files[0].Outputs);+ Assert.EndsWith(".zip", zip);+ Assert.True(new FileInfo(zip).Length < 4_000);+ Assert.False(fits.Files[0].UnderMinimumSize);++ // One picture short (the last one) is enough for the notice.+ converter.Content = i => i == pictures - 1 ? "short" : big;+ preset.Output.FileNamePattern = "{name}_2";+ var shortJob = new ConversionJob([photo], preset, "PNG");+ await queue.RunAsync(shortJob);++ Assert.Equal(FileState.Done, shortJob.Files[0].State);+ Assert.True(shortJob.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task One_page_under_the_minimum_is_enough_for_the_notice()+ {+ using var dir = new TempDir();+ var scan = dir.File("scan.pdf");+ var converter = new FakeConverter("pdfium", new ConversionEdge("pdf", "png")) { OutputsPerInput = 3, Content = i => i == 1 ? "short" : new string('a', 2_000) };+ await using var queue = new JobQueue(new ConverterCatalog([converter]));+ var job = new ConversionJob([scan], new Preset { TargetFormat = "png", Image = { MinSizeMb = 0.001 } }, "PNG");++ await queue.RunAsync(job);++ Assert.Equal(3, job.Files[0].Outputs.Count);+ Assert.True(job.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task The_original_kept_as_it_was_smaller_still_tells_that_it_is_under_the_minimum()+ {+ using var dir = new TempDir();+ var tiny = dir.File("tiny.jpg", "x");+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "compress-image").Clone();+ preset.Image.MinSizeMb = 0.0001; // 100 bytes+ await using var queue = new JobQueue(new ConverterCatalog([new FakeConverter("magick", new ConversionEdge("jpg", "jpg"))]));+ var job = new ConversionJob([tiny], preset, "JPG");++ await queue.RunAsync(job);++ var file = Assert.Single(job.Files);+ Assert.Equal("notice.pdf_not_smaller", file.NoticeKey);+ Assert.True(file.UnderMinimumSize);+ Assert.Equal("notice.with_under_min_size(notice.pdf_not_smaller|notice.under_min_size)", new KeyLocalizer().Notice(file));+ }++ [Fact]+ public async Task A_multi_page_tiff_under_the_minimum_gets_the_notice_on_the_first_file()+ {+ using var dir = new TempDir();+ var photo = dir.File("photo.jpg");+ var other = dir.File("other.jpg");+ await using var queue = new JobQueue(new ConverterCatalog([new FakeConverter("magick", new ConversionEdge("jpg", "tiff"))]),+ tiffMerger: new FakeTiffMerger());+ var job = new ConversionJob([photo, other], new Preset { TargetFormat = "tiff", Image = { MultiPageTiff = true, MinSizeMb = 0.001 } }, "TIFF");++ await queue.RunAsync(job);++ Assert.Equal(JobState.Completed, job.State);+ Assert.Single(job.Files[0].Outputs);+ Assert.True(job.Files[0].UnderMinimumSize);+ Assert.False(job.Files[1].UnderMinimumSize);+ }++ [Fact]+ public async Task A_folder_result_is_not_measured()+ {+ // Named like a picture, but a folder (video frames): left alone, not failed.+ using var dir = new TempDir();+ var clip = dir.File("clip.mp4");+ await using var queue = new JobQueue(new ConverterCatalog([new FakeConverter("ffmpeg", new ConversionEdge("mp4", "jpg")) { OutputIsFolder = true }]));+ var job = new ConversionJob([clip], new Preset { TargetFormat = "jpg", Image = { MinSizeMb = 0.001 } }, "JPG");++ await queue.RunAsync(job);++ var file = Assert.Single(job.Files);+ Assert.Equal(FileState.Done, file.State);+ Assert.True(Directory.Exists(Assert.Single(file.Outputs)));+ Assert.False(file.UnderMinimumSize);+ }++ [Fact]+ public void A_picture_limit_under_a_megabyte_reads_in_kilobytes_and_a_minimum_counts_every_byte()+ {+ Assert.EndsWith("KB", SizeLimit.Describe(61_200, 50_000, image: true));+ Assert.EndsWith("MB", SizeLimit.Describe(2_500_000, 2_000_000, image: true));+ Assert.EndsWith("MB", SizeLimit.Describe(600_000, 500_000)); // a video's limit stays in MB++ Assert.Equal(1_001_000, SizeLimit.MinimumBytes(1.001)); // truncated, it would be 1,000,999+ Assert.Equal([50_000L, 999_000L, 4_096_000_000L], new[] { 0.05, 0.999, 4096 }.Select(SizeLimit.MinimumBytes));++ using var dir = new TempDir();+ var preset = new Preset { Image = { MinSizeMb = 1.001 } };+ bool Under(int bytes) => SizeLimit.IsUnderMinimum(preset, [dir.File($"{bytes}.png", new string('a', bytes))]);+ Assert.Equal((true, false, false), (Under(1_000_999), Under(1_001_000), Under(1_001_001)));+ }++ [Fact]+ public void A_notice_shows_the_minimum_alone_or_beside_the_other_note()+ {+ var loc = new KeyLocalizer();++ Assert.Equal("notice.under_min_size", loc.Notice(new FileResult { SourcePath = "a.png", UnderMinimumSize = true }));+ Assert.Equal("", loc.Notice(new FileResult { SourcePath = "a.png" }));+ Assert.Equal("notice.pdf_not_smaller", loc.Notice(new FileResult { SourcePath = "a.png", NoticeKey = "notice.pdf_not_smaller" }));+ Assert.Equal("notice.with_under_min_size(notice.original_kept (trash.cannot_place)|notice.under_min_size)",+ loc.Notice(new FileResult { SourcePath = "a.png", NoticeKey = "notice.original_kept", NoticeReasonKey = "trash.cannot_place", UnderMinimumSize = true }));+ }++ /// <summary>Gives keys back as they are, so a test sees which sentences went into a notice.</summary>+ private sealed class KeyLocalizer : ILocalizer+ {+ public string Language => "en";+ public string this[string key] => key;+ public string Format(string key, params object[] args) => $"{key}({string.Join("|", args)})";+ public event EventHandler? LanguageChanged { add { } remove { } }+ }+[Fact]public void The_presets_for_where_a_file_goes_are_offered_but_not_installed(){diff --git a/tests/Filee.Engines.Tests/SizeLimitTests.cs b/tests/Filee.Engines.Tests/SizeLimitTests.csindex 181b57e1..7d0ec5a6 100644--- a/tests/Filee.Engines.Tests/SizeLimitTests.cs+++ b/tests/Filee.Engines.Tests/SizeLimitTests.cs@@ -102,6 +102,232 @@ public class SizeLimitTests(EngineFixture fx) : IClassFixture<EngineFixture>Assert.InRange(Math.Max(fitted.Width, fitted.Height), (uint)ImageEncoder.MinFittedLongEdge, 1439u);}+ /// <summary>Bytes of <paramref name="source"/> saved as <paramref name="format"/> at <paramref name="quality"/>.</summary>+ private static long Encoded(string source, MagickFormat format, uint quality)+ {+ using var image = new MagickImage(source);+ image.Quality = quality;+ return image.ToByteArray(format).LongLength;+ }++ /// <summary>A noisy PNG to convert: noise keeps quality steps far apart in bytes.</summary>+ private string NoisySource(uint width = 300, uint height = 200)+ {+ var path = Path.Combine(fx.NewFolder(), "noise.png");+ using var image = Noisy(width, height);+ image.Write(path, MagickFormat.Png);+ return path;+ }++ private static string Done(ConversionJob job)+ {+ Assert.True(job.State == JobState.Completed, string.Join("; ", job.Files.Select(f => $"{f.ErrorKey} {f.ErrorDetail}")));+ return job.Outputs.First();+ }++ [Theory]+ [InlineData("jpg", MagickFormat.Jpeg)]+ [InlineData("webp", MagickFormat.WebP)]+ public async Task A_picture_under_the_minimum_is_saved_again_at_a_higher_quality_with_the_same_pixels(string target, MagickFormat format)+ {+ var source = NoisySource();+ var minimum = (Encoded(source, format, 30) + Encoded(source, format, 100)) / 2;++ var job = await fx.ConvertAsync([source], new Preset { TargetFormat = target, Image = { Quality = 30, MinSizeMb = minimum / 1e6 } });++ var output = Done(job);+ Assert.True(new FileInfo(output).Length >= minimum, $"{new FileInfo(output).Length} < {minimum}");+ Assert.False(job.Files[0].UnderMinimumSize);+ using var result = new MagickImage(output);+ Assert.Equal((300u, 200u), (result.Width, result.Height));+ }++ [Fact]+ public async Task A_range_is_met_by_quality_alone()+ {+ var source = NoisySource();+ var minimum = (Encoded(source, MagickFormat.Jpeg, 30) + Encoded(source, MagickFormat.Jpeg, 100)) / 2;+ var maximum = Encoded(source, MagickFormat.Jpeg, 100) * 105 / 100;++ var output = Done(await fx.ConvertAsync([source],+ new Preset { TargetFormat = "jpg", Image = { Quality = 30, MinSizeMb = minimum / 1e6, MaxSizeMb = maximum / 1e6 } }));++ Assert.InRange(new FileInfo(output).Length, minimum, maximum);+ using var result = new MagickImage(output);+ Assert.Equal((300u, 200u), (result.Width, result.Height));+ }++ [Fact]+ public void The_minimum_goes_on_from_the_picture_the_maximum_fitted_not_the_one_handed_in()+ {+ // Too large at first, then quality and pixels cut until it fits: raising the quality again from there must not+ // bring back the pixels (or the file) of the picture handed in.+ var path = Path.Combine(fx.NewFolder(), "noise.jpg");+ using var image = Noisy(1600, 1200);+ image.Quality = 95;+ image.Write(path, MagickFormat.Jpeg);+ const long limit = 200 * 1024;++ ImageEncoder.FitToSize(image, path, MagickFormat.Jpeg, limit, limit);++ Assert.InRange(new FileInfo(path).Length, 1, limit);+ using var fitted = new MagickImage(path);+ Assert.True(fitted.Width < 1600);+ }++ [Fact]+ public async Task A_minimum_the_maximum_cuts_short_keeps_the_maximum_and_gets_the_notice()+ {+ var source = NoisySource();+ var (q80, q90, q100) = (Encoded(source, MagickFormat.Jpeg, 80), Encoded(source, MagickFormat.Jpeg, 90), Encoded(source, MagickFormat.Jpeg, 100));+ Assert.True(q80 < q90 && q90 < q100, $"{q80} {q90} {q100}");+ var maximum = (q80 + q90) / 2; // 90 breaks it…+ var minimum = (q90 + q100) / 2; // …before the minimum is reached++ var job = await fx.ConvertAsync([source], new Preset { TargetFormat = "jpg", Image = { Quality = 30, MinSizeMb = minimum / 1e6, MaxSizeMb = maximum / 1e6 } });++ Assert.InRange(new FileInfo(Done(job)).Length, 1, maximum);+ Assert.True(job.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task A_picture_too_plain_for_the_minimum_is_kept_at_the_highest_quality_with_the_notice()+ {+ var source = Path.Combine(fx.NewFolder(), "plain.png");+ using (var image = new MagickImage(MagickColors.SteelBlue, 32, 32))+ image.Write(source, MagickFormat.Png);++ var job = await fx.ConvertAsync([source], new Preset { TargetFormat = "jpg", Image = { Quality = 50, MinSizeMb = 1 } });++ using var result = new MagickImage(Done(job));+ Assert.Equal(100u, result.Quality);+ Assert.Equal((32u, 32u), (result.Width, result.Height));+ Assert.True(job.Files[0].UnderMinimumSize);+ }++ [Theory]+ [InlineData("png")] // no quality: never made larger+ [InlineData("gif")] // an animation: not fitted at all+ public async Task A_format_that_cannot_be_raised_is_kept_with_the_notice(string target)+ {+ var dir = fx.NewFolder();+ var source = Path.Combine(dir, "frames.gif");+ using (var frames = new MagickImageCollection())+ {+ frames.Add(new MagickImage(MagickColors.Coral, 40, 30) { AnimationDelay = 20 });+ frames.Add(new MagickImage(MagickColors.Teal, 40, 30) { AnimationDelay = 20 });+ frames.Write(source, MagickFormat.Gif);+ }++ var job = await fx.ConvertAsync([source], new Preset { TargetFormat = target, Image = { MinSizeMb = 1 } });++ Done(job);+ Assert.Equal(FileState.Done, job.Files[0].State);+ Assert.True(job.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task One_page_of_a_tiff_under_the_minimum_is_enough_for_the_notice()+ {+ var source = Path.Combine(fx.NewFolder(), "pages.tiff");+ using (var pages = new MagickImageCollection())+ {+ pages.Add(Noisy(600, 400));+ pages.Add(new MagickImage(MagickColors.White, 600, 400));+ pages.Write(source, MagickFormat.Tiff);+ }++ var job = await fx.ConvertAsync([source], new Preset { TargetFormat = "jpg", Image = { MinSizeMb = 0.02 } });++ Done(job);+ Assert.Equal(2, job.Files[0].Outputs.Count);+ Assert.True(new FileInfo(job.Files[0].Outputs[0]).Length >= 20_000);+ Assert.True(job.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task Merged_pictures_are_raised_in_quality_to_the_range_too()+ {+ var originals = fx.NewFolder();+ foreach (var name in new[] { "1.png", "2.png" })+ {+ using var image = Noisy(200, 100);+ image.Write(Path.Combine(originals, name), MagickFormat.Png);+ }+ async Task<(ConversionJob Job, string Output)> Merge(Action<ImageOptions> set)+ {+ var dir = fx.NewFolder();+ var sources = new[] { "1.png", "2.png" }.Select(n => { var to = Path.Combine(dir, n); File.Copy(Path.Combine(originals, n), to); return to; }).ToList();+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "merge-images").Clone();+ preset.TargetFormat = "jpg";+ set(preset.Image);+ var job = await fx.ConvertAsync(sources, preset);+ return (job, Done(job));+ }++ var low = new FileInfo((await Merge(i => i.Quality = 30)).Output).Length;+ var high = new FileInfo((await Merge(i => i.Quality = 100)).Output).Length;+ var minimum = (low + high) / 2;++ var (alone, aloneOutput) = await Merge(i => { i.Quality = 30; i.MinSizeMb = minimum / 1e6; });+ var (ranged, rangedOutput) = await Merge(i => { i.Quality = 30; i.MinSizeMb = minimum / 1e6; i.MaxSizeMb = high * 1.05 / 1e6; });+ var (unreachable, _) = await Merge(i => { i.Quality = 30; i.MinSizeMb = high * 3 / 1e6; });++ Assert.True(new FileInfo(aloneOutput).Length >= minimum);+ Assert.InRange(new FileInfo(rangedOutput).Length, minimum, (long)(high * 1.05));+ Assert.False(alone.Files[0].UnderMinimumSize || ranged.Files[0].UnderMinimumSize);+ using (var merged = new MagickImage(aloneOutput))+ Assert.Equal((200u, 200u), (merged.Width, merged.Height));+ Assert.True(unreachable.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task Compress_image_keeping_a_smaller_original_still_tells_it_is_under_the_minimum()+ {+ var source = Path.Combine(fx.NewFolder(), "small.jpg");+ using (var image = new MagickImage(MagickColors.SteelBlue, 64, 64) { Quality = 10 })+ image.Write(source, MagickFormat.Jpeg);+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "compress-image").Clone();+ preset.Image.MinSizeMb = 1;++ var job = await fx.ConvertAsync([source], preset);++ Done(job);+ Assert.Equal("notice.pdf_not_smaller", job.Files[0].NoticeKey);+ Assert.True(job.Files[0].UnderMinimumSize);+ }++ [Fact]+ public async Task A_limit_in_kilobytes_is_kept()+ {+ var source = Path.Combine(fx.NewFolder(), "photo.png");+ using (var image = new MagickImage("gradient:#C04020-#2060C0", 1200, 900))+ {+ image.AddNoise(NoiseType.Gaussian, 0.3);+ image.Write(source, MagickFormat.Png);+ }++ var output = Done(await fx.ConvertAsync([source], new Preset { TargetFormat = "jpg", Image = { MaxSizeMb = 0.05 } }));++ Assert.InRange(new FileInfo(output).Length, 1, 50_000);+ }++ [Fact]+ public async Task Video_frames_saved_into_a_folder_are_left_out_of_the_minimum()+ {+ Assert.SkipUnless(Tools is not null, "FFmpeg is not installed (pwsh build/fetch-engines.ps1 -Only ffmpeg)");+ var source = Path.Combine(fx.NewFolder(), "clip.mp4");+ var made = await ProcessRunner.RunAsync(Tools!.Value.Ffmpeg,+ ["-hide_banner", "-nostdin", "-v", "error", "-y", "-f", "lavfi", "-i", "testsrc2=size=160x120:rate=5:duration=1", "-pix_fmt", "yuv420p", source],+ TimeSpan.FromMinutes(1), CancellationToken.None);+ Assert.True(made.ExitCode == 0, made.StandardError);++ var job = await fx.ConvertAsync([source], new Preset { TargetFormat = "jpg", Image = { MinSizeMb = 1 }, Media = { SaveEveryFrame = true } });++ Assert.True(Directory.Exists(Done(job)));+ Assert.False(job.Files[0].UnderMinimumSize);+ }+[Fact]public void Megabytes_are_a_million_bytes_as_the_services_count_them(){