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
Replace Download with user-created Copy to folder presets
1644ye1b9367e78564
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.jsonindex 18447c52..028a9c70 100644--- a/src/Filee.App/Assets/i18n/ar.json+++ b/src/Filee.App/Assets/i18n/ar.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "تنزيل",- "preset.browser_download_caption": "بدون تحويل",-"app.name": "Filee","app.tagline": "اسحب، أفلت، وحوّل.","nav.home": "الرئيسية",@@ -1273,5 +1265,10 @@"whats_new.2_0_0.languages.text": "تتوفر الآن الإسبانية والهندية واليابانية والروسية والعربية والبرتغالية البرازيلية، إلى جانب الإنجليزية والكورية والصينية والبولندية.","whats_new.2_0_0.more.title": "والمزيد من التحسينات","whats_new.2_0_0.more.text": "يمكنك إعادة قائمة دائرية واحدة إلى إعداداتها الافتراضية، والبحث في سجل التحويلات بالكامل، وتحويل المستندات الغوجاراتية والهندية والعربية باستخدام LibreOffice.",- "preset.extract_motion.donut": "استخراج فيديو Live Photo"+ "preset.extract_motion.donut": "استخراج فيديو Live Photo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.jsonindex e2464b05..d19add20 100644--- a/src/Filee.App/Assets/i18n/de.json+++ b/src/Filee.App/Assets/i18n/de.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Download",- "preset.browser_download_caption": "No conversion",-"app.name": "Filee","app.tagline": "Ziehen, ablegen, fertig.","nav.home": "Start",@@ -1272,5 +1264,10 @@"whats_new.2_0_0.languages.text": "Spanisch, Hindi, Japanisch, Russisch, Arabisch und brasilianisches Portugiesisch ergänzen Englisch, Koreanisch, Chinesisch und Polnisch.","whats_new.2_0_0.more.title": "Und noch mehr","whats_new.2_0_0.more.text": "Setze einzelne Ringmenüs zurück, durchsuche den gesamten Verlauf und konvertiere Dokumente auf Gujarati, Hindi oder Arabisch mit LibreOffice.",- "preset.extract_motion.donut": "Video extrahieren"+ "preset.extract_motion.donut": "Video extrahieren",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.jsonindex 5e9d80a5..eec07b44 100644--- a/src/Filee.App/Assets/i18n/en.json+++ b/src/Filee.App/Assets/i18n/en.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Download",- "preset.browser_download_caption": "No conversion",-"app.name": "Filee","app.tagline": "Drag, drop, converted.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "Spanish, Hindi, Japanese, Russian, Arabic and Brazilian Portuguese join English, Korean, Chinese and Polish.","whats_new.2_0_0.more.title": "And a little more","whats_new.2_0_0.more.text": "Reset a single donut to its defaults, search your whole history, and convert Gujarati, Hindi or Arabic documents through LibreOffice.",- "preset.extract_motion.donut": "Extract video"+ "preset.extract_motion.donut": "Extract video",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.jsonindex a32af692..8c7c0829 100644--- a/src/Filee.App/Assets/i18n/es.json+++ b/src/Filee.App/Assets/i18n/es.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Descargar",- "preset.browser_download_caption": "Sin conversión",-"app.name": "Filee","app.tagline": "Arrastra, suelta y convierte.","nav.home": "Inicio",@@ -1274,5 +1266,10 @@"whats_new.2_0_0.languages.text": "El español, el hindi, el japonés, el ruso, el árabe y el portugués de Brasil se suman al inglés, el coreano, el chino y el polaco.","whats_new.2_0_0.more.title": "Y un poco más","whats_new.2_0_0.more.text": "Restablece un solo menú circular, busca en todo tu historial y convierte documentos en guyaratí, hindi o árabe con LibreOffice.",- "preset.extract_motion.donut": "Extraer vídeo de Live Photo"+ "preset.extract_motion.donut": "Extraer vídeo de Live Photo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.jsonindex 013afe98..1aa508fa 100644--- a/src/Filee.App/Assets/i18n/fr.json+++ b/src/Filee.App/Assets/i18n/fr.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Télécharger",- "preset.browser_download_caption": "Sans conversion",-"app.name": "Filee","app.tagline": "Glissez, déposez, c'est converti.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "L'espagnol, l'hindi, le japonais, le russe, l'arabe et le portugais du Brésil rejoignent l'anglais, le coréen, le chinois et le polonais.","whats_new.2_0_0.more.title": "Et encore un peu plus","whats_new.2_0_0.more.text": "Réinitialisez un seul menu circulaire, recherchez dans tout votre historique, et convertissez des documents en gujarati, hindi ou arabe via LibreOffice.",- "preset.extract_motion.donut": "Vidéo Live"+ "preset.extract_motion.donut": "Vidéo Live",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.jsonindex d3089317..afa6648c 100644--- a/src/Filee.App/Assets/i18n/hi.json+++ b/src/Filee.App/Assets/i18n/hi.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "डाउनलोड",- "preset.browser_download_caption": "बिना रूपांतरण",-"app.name": "Filee","app.tagline": "खींचें, छोड़ें, कन्वर्ट हो गया।","nav.home": "होम",@@ -1274,5 +1266,10 @@"whats_new.2_0_0.languages.text": "अंग्रेज़ी, कोरियाई, चीनी और पोलिश के साथ अब स्पैनिश, हिन्दी, जापानी, रूसी, अरबी और ब्राज़ीलियाई पुर्तगाली भी।","whats_new.2_0_0.more.title": "और भी थोड़ा","whats_new.2_0_0.more.text": "एक ही डोनट को डिफ़ॉल्ट पर रीसेट करें, पूरा इतिहास खोजें, और गुजराती, हिन्दी या अरबी दस्तावेज़ LibreOffice से बदलें।",- "preset.extract_motion.donut": "लाइव फ़ोटो वीडियो निकालें"+ "preset.extract_motion.donut": "लाइव फ़ोटो वीडियो निकालें",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/id.json b/src/Filee.App/Assets/i18n/id.jsonindex a22f8c9c..8b224b6a 100644--- a/src/Filee.App/Assets/i18n/id.json+++ b/src/Filee.App/Assets/i18n/id.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Download",- "preset.browser_download_caption": "No conversion",-"app.name": "Filee","app.tagline": "Seret, lepas, terkonversi.","nav.home": "Beranda",@@ -1272,5 +1264,10 @@"whats_new.2_0_0.languages.text": "Bahasa Spanyol, Hindi, Jepang, Rusia, Arab, dan Portugis Brasil bergabung dengan bahasa Inggris, Korea, Mandarin, dan Polandia.","whats_new.2_0_0.more.title": "Dan masih banyak lagi","whats_new.2_0_0.more.text": "Atur ulang satu menu donut ke bawaan, cari seluruh riwayat Anda, dan konversi dokumen Gujarati, Hindi, atau Arab melalui LibreOffice.",- "preset.extract_motion.donut": "Ekstrak video"+ "preset.extract_motion.donut": "Ekstrak video",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/it.json b/src/Filee.App/Assets/i18n/it.jsonindex 063f12af..ab0af57e 100644--- a/src/Filee.App/Assets/i18n/it.json+++ b/src/Filee.App/Assets/i18n/it.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Download",- "preset.browser_download_caption": "No conversion",-"app.name": "Filee","app.tagline": "Trascina, rilascia, converti.","nav.home": "Home",@@ -1272,5 +1264,10 @@"whats_new.2_0_0.languages.text": "Spagnolo, hindi, giapponese, russo, arabo e portoghese brasiliano si uniscono a inglese, coreano, cinese e polacco.","whats_new.2_0_0.more.title": "E qualcosa in più","whats_new.2_0_0.more.text": "Ripristina un singolo donut ai valori predefiniti, cerca in tutta la cronologia e converti documenti in gujarati, hindi o arabo tramite LibreOffice.",-"preset.extract_motion.donut": "Estrai video"+"preset.extract_motion.donut": "Estrai video",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.jsonindex 98021a1d..5f18b62d 100644--- a/src/Filee.App/Assets/i18n/ja.json+++ b/src/Filee.App/Assets/i18n/ja.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "ダウンロード",- "preset.browser_download_caption": "変換なし",-"app.name": "Filee","app.tagline": "ドラッグ。ドロップ。\n変換完了。","nav.home": "ホーム",@@ -1274,5 +1266,10 @@"whats_new.2_0_0.languages.text": "英語、韓国語、中国語、ポーランド語に、スペイン語、ヒンディー語、日本語、ロシア語、アラビア語、ブラジルポルトガル語が加わりました。","whats_new.2_0_0.more.title": "ほかにも","whats_new.2_0_0.more.text": "ドーナツを 1 つだけ既定に戻す、履歴全体を検索する、グジャラート語・ヒンディー語・アラビア語の文書を LibreOffice で変換する、など。",- "preset.extract_motion.donut": "Live Photoの動画を抽出"+ "preset.extract_motion.donut": "Live Photoの動画を抽出",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.jsonindex c28e81e0..f6630867 100644--- a/src/Filee.App/Assets/i18n/ko.json+++ b/src/Filee.App/Assets/i18n/ko.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "다운로드",- "preset.browser_download_caption": "변환 안 함",-"app.name": "Filee","app.tagline": "끌어서 놓으면, 변환 끝.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "영어, 한국어, 중국어, 폴란드어에 스페인어, 힌디어, 일본어, 러시아어, 아랍어, 브라질 포르투갈어가 더해졌어요.","whats_new.2_0_0.more.title": "그리고 조금 더","whats_new.2_0_0.more.text": "원형 툴바 하나만 기본값으로 초기화하고, 기록 전체를 검색하고, 구자라트어·힌디어·아랍어 문서를 LibreOffice로 변환할 수 있어요.",- "preset.extract_motion.donut": "라이브 포토 동영상 추출"+ "preset.extract_motion.donut": "라이브 포토 동영상 추출",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.jsonindex ba223906..b39570fe 100644--- a/src/Filee.App/Assets/i18n/ne.json+++ b/src/Filee.App/Assets/i18n/ne.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "डाउनलोड",- "preset.browser_download_caption": "रूपान्तरण बिना",-"app.name": "Filee","app.tagline": "तान्नुहोस्, छाड्नुहोस्, रूपान्तरण भयो।","nav.home": "गृहपृष्ठ",@@ -1274,5 +1266,10 @@"whats_new.2_0_0.languages.text": "अङ्ग्रेजी, कोरियाली, चिनियाँ र पोलिससँगै अब स्पेनिस, हिन्दी, जापानी, रसियन, अरबी र ब्राजिलियन पोर्चुगिज पनि।","whats_new.2_0_0.more.title": "र थोरै अरू पनि","whats_new.2_0_0.more.text": "एउटै डोनटलाई पूर्वनिर्धारितमा रिसेट गर्नुहोस्, सम्पूर्ण इतिहास खोज्नुहोस्, र LibreOffice मार्फत गुजराती, हिन्दी वा अरबी कागजातहरू रूपान्तरण गर्नुहोस्।",- "preset.extract_motion.donut": "लाइभ फोटो भिडियो निकाल्नुहोस्"+ "preset.extract_motion.donut": "लाइभ फोटो भिडियो निकाल्नुहोस्",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.jsonindex 899ca89d..efdc72b8 100644--- a/src/Filee.App/Assets/i18n/pl.json+++ b/src/Filee.App/Assets/i18n/pl.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Pobierz",- "preset.browser_download_caption": "Bez konwersji",-"app.name": "Filee","app.tagline": "Przeciągnij, upuść, gotowe.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "Do angielskiego, koreańskiego, chińskiego i polskiego dołączają hiszpański, hindi, japoński, rosyjski, arabski i portugalski brazylijski.","whats_new.2_0_0.more.title": "I jeszcze trochę","whats_new.2_0_0.more.text": "Przywróć domyślne ustawienia jednego pierścienia, przeszukuj całą historię i konwertuj dokumenty w gudżarati, hindi lub arabskim przez LibreOffice.",- "preset.extract_motion.donut": "Wyodrębnij wideo z Live Photo"+ "preset.extract_motion.donut": "Wyodrębnij wideo z Live Photo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.jsonindex 50309410..5f7220f2 100644--- a/src/Filee.App/Assets/i18n/pt-BR.json+++ b/src/Filee.App/Assets/i18n/pt-BR.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Baixar",- "preset.browser_download_caption": "Sem conversão",-"app.name": "Filee","app.tagline": "Arraste, solte, convertido.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "Espanhol, hindi, japonês, russo, árabe e português do Brasil se juntam ao inglês, coreano, chinês e polonês.","whats_new.2_0_0.more.title": "E um pouco mais","whats_new.2_0_0.more.text": "Restaure um único menu aos padrões, pesquise todo o histórico e converta documentos em guzerate, hindi ou árabe pelo LibreOffice.",- "preset.extract_motion.donut": "Extrair vídeo"+ "preset.extract_motion.donut": "Extrair vídeo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.jsonindex 403a509c..241d43b5 100644--- a/src/Filee.App/Assets/i18n/pt-PT.json+++ b/src/Filee.App/Assets/i18n/pt-PT.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Transferir",- "preset.browser_download_caption": "Sem conversão",-"app.name": "Filee","app.tagline": "Arrasta, larga, convertido.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "O espanhol, o hindi, o japonês, o russo, o árabe e o português do Brasil juntam-se ao inglês, ao coreano, ao chinês e ao polaco.","whats_new.2_0_0.more.title": "E mais algumas novidades","whats_new.2_0_0.more.text": "Repõe os valores de origem de uma só barra, pesquisa em todo o histórico e converte documentos em guzerate, hindi ou árabe através do LibreOffice.",- "preset.extract_motion.donut": "Extrair vídeo"+ "preset.extract_motion.donut": "Extrair vídeo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.jsonindex 129b52c5..596877e5 100644--- a/src/Filee.App/Assets/i18n/ru.json+++ b/src/Filee.App/Assets/i18n/ru.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "Скачать",- "preset.browser_download_caption": "Без преобразования",-"app.name": "Filee","app.tagline": "Перетащил — и готово.",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "К английскому, корейскому, китайскому и польскому добавились испанский, хинди, японский, русский, арабский и бразильский португальский.","whats_new.2_0_0.more.title": "И ещё немного","whats_new.2_0_0.more.text": "Сбрасывайте одно круговое меню к настройкам по умолчанию, ищите по всей истории и конвертируйте документы на гуджарати, хинди и арабском через LibreOffice.",- "preset.extract_motion.donut": "Видео из Live Photo"+ "preset.extract_motion.donut": "Видео из Live Photo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.jsonindex 9cb95b41..856bf23a 100644--- a/src/Filee.App/Assets/i18n/th.json+++ b/src/Filee.App/Assets/i18n/th.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "ดาวน์โหลด",- "preset.browser_download_caption": "ไม่แปลงไฟล์",-"app.name": "Filee","app.tagline": "ลาก วาง แปลงไฟล์ทันที","nav.home": "หน้าแรก",@@ -1274,5 +1266,10 @@"whats_new.2_0_0.languages.text": "เพิ่มภาษาสเปน ฮินดี ญี่ปุ่น รัสเซีย อาหรับ และโปรตุเกสบราซิล ร่วมกับอังกฤษ เกาหลี จีน และโปแลนด์","whats_new.2_0_0.more.title": "และอีกมากมาย","whats_new.2_0_0.more.text": "รีเซ็ตโดนัทแต่ละอันกลับเป็นค่าเริ่มต้น ค้นหาประวัติการแปลงไฟล์ทั้งหมด และแปลงเอกสารภาษาคุชราต ฮินดี หรืออาหรับผ่าน LibreOffice",- "preset.extract_motion.donut": "ดึงวิดีโอจาก Live Photo"+ "preset.extract_motion.donut": "ดึงวิดีโอจาก Live Photo",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.jsonindex 689d2d16..f3e22f33 100644--- a/src/Filee.App/Assets/i18n/tr.json+++ b/src/Filee.App/Assets/i18n/tr.json@@ -1,12 +1,4 @@{- "general.download_location": "Download save location",- "general.download.Default": "Default (Downloads folder)",- "general.download.Ask": "Choose a folder every time",- "general.download.Custom": "Specified folder",- "general.download_hint": "Applies only to Download in the ring. An empty specified folder prompts you to choose; cancelling saves nothing.",- "preset.browser_download": "İndir",- "preset.browser_download_caption": "Dönüştürme yok",-"app.name": "Filee","app.tagline": "Sürükle, bırak, dönüştür.","nav.home": "Ana sayfa",@@ -1272,5 +1264,10 @@"whats_new.2_0_0.languages.text": "İspanyolca, Hintçe, Japonca, Rusça, Arapça ve Brezilya Portekizcesi; İngilizce, Korece, Çince ve Lehçeye katılıyor.","whats_new.2_0_0.more.title": "Ve biraz daha fazlası","whats_new.2_0_0.more.text": "Tek bir halkayı varsayılanlarına sıfırlayın, tüm geçmişte arama yapın ve Guceratça, Hintçe veya Arapça belgeleri LibreOffice ile dönüştürün.",- "preset.extract_motion.donut": "Live Photo videosunu çıkar"+ "preset.extract_motion.donut": "Live Photo videosunu çıkar",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.jsonindex 94a4be5a..95be8e54 100644--- a/src/Filee.App/Assets/i18n/zh-CN.json+++ b/src/Filee.App/Assets/i18n/zh-CN.json@@ -1,12 +1,4 @@{- "general.download_location": "圆盘下载保存位置",- "general.download.Default": "默认保存(系统下载文件夹)",- "general.download.Ask": "每次选择位置",- "general.download.Custom": "指定文件夹",- "general.download_hint": "仅用于圆盘中的“下载”。指定文件夹为空时会询问;取消选择不会下载。",- "preset.browser_download": "下载",- "preset.browser_download_caption": "不转换",-"app.name": "Filee","app.tagline": "拖一拖,放一放,转换完成。",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "在英语、韩语、中文和波兰语之外,新增西班牙语、印地语、日语、俄语、阿拉伯语和巴西葡萄牙语。","whats_new.2_0_0.more.title": "还有更多","whats_new.2_0_0.more.text": "可以只把一个环形工具栏恢复默认、搜索全部历史记录,并通过 LibreOffice 转换古吉拉特语、印地语或阿拉伯语文档。",- "preset.extract_motion.donut": "提取实况/动态照片视频"+ "preset.extract_motion.donut": "提取实况/动态照片视频",+ "presets.copy_to_folder": "复制到文件夹",+ "presets.copy_hint": "直接复制文件和文件夹,不转换格式。原件保留,重名时自动编号。",+ "presets.copy_choose_folder": "请选择目标文件夹,或选择“每次询问”。",+ "presets.copy_back": "复制到文件夹放在背面,请切换到背面后添加。",+ "presets.copy_action": "操作"}diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.jsonindex 7dfc03cb..24c4110a 100644--- a/src/Filee.App/Assets/i18n/zh-TW.json+++ b/src/Filee.App/Assets/i18n/zh-TW.json@@ -1,12 +1,4 @@{- "general.download_location": "圓盤下載儲存位置",- "general.download.Default": "預設儲存(系統下載資料夾)",- "general.download.Ask": "每次選擇位置",- "general.download.Custom": "指定資料夾",- "general.download_hint": "僅用於圓盤中的「下載」。指定資料夾為空時會詢問;取消選擇不會下載。",- "preset.browser_download": "下載",- "preset.browser_download_caption": "不轉換",-"app.name": "Filee","app.tagline": "拖一拖,放一放,轉換完成。",@@ -1294,5 +1286,10 @@"whats_new.2_0_0.languages.text": "在英語、韓語、中文和波蘭語之外,新增西班牙語、印地語、日語、俄語、阿拉伯語和巴西葡萄牙語。","whats_new.2_0_0.more.title": "還有更多","whats_new.2_0_0.more.text": "可以只把一個環形工具列還原為初始設定、搜尋全部歷史記錄,並透過 LibreOffice 轉換古吉拉特語、印地語或阿拉伯語文件。",- "preset.extract_motion.donut": "擷取原況/動態相片影片"+ "preset.extract_motion.donut": "擷取原況/動態相片影片",+ "presets.copy_to_folder": "Copy to folder",+ "presets.copy_hint": "Copy files and folders without conversion. Originals stay where they are; existing names get a number.",+ "presets.copy_choose_folder": "Choose a destination folder, or Ask every time.",+ "presets.copy_back": "Copy to folder belongs on the back face. Switch to Back to add it.",+ "presets.copy_action": "Action"}diff --git a/src/Filee.App/Services/ConversionService.cs b/src/Filee.App/Services/ConversionService.csindex f21605e2..ded8bfc0 100644--- a/src/Filee.App/Services/ConversionService.cs+++ b/src/Filee.App/Services/ConversionService.cs@@ -74,9 +74,10 @@ public sealed class ConversionService/// </param>/// <param name="toClipboard">The results go on the clipboard when the job has finished (the clipboard shortcut).</param>/// <returns>The job's view model, or null when there was nothing to convert.</returns>- public JobViewModel? Start(IReadOnlyList<string> files, Preset preset, bool showInToast = true, WebDrop? web = null, string? downloadFolder = null, IReadOnlyDictionary<string, string>? savePaths = null, bool toClipboard = false)+ public JobViewModel? Start(IReadOnlyList<string> files, Preset preset, bool showInToast = true, WebDrop? web = null,+ bool toClipboard = false){- if (files.Count == 0 || preset.IsGroup || preset.IsTool || preset.IsDownload && (web is null || DownloadNeedsPicker && string.IsNullOrWhiteSpace(downloadFolder)))+ if (files.Count == 0 || preset.IsGroup || preset.IsTool && !preset.IsCopyToFolder || preset.IsCopyToFolder && preset.Output.AskEveryTime){web?.Dispose();return null;@@ -87,10 +88,10 @@ public sealed class ConversionServiceif (web is not null){var options = BrowserDropOptions();- if (web.SaveOnlyConverted is { } only)+ if (preset.IsCopyToFolder)+ options = options with { SaveOnlyConverted = true };+ else if (web.SaveOnlyConverted is { } only)options = options with { SaveOnlyConverted = only };- if (preset.IsDownload)- options = options with { SaveOnlyConverted = false, Folder = downloadFolder ?? DownloadFolderInUse, SavePaths = savePaths };fetcher = web.CreateFetcher(options, _downloader);// "Next to the source" is the download folder, also when the original is only kept until converted.preset = fetcher.Apply(preset);@@ -111,6 +112,24 @@ public sealed class ConversionServicereturn vm;}+ /// <summary>The existing save picker, before creating a job; cancellation releases browser data.</summary>+ internal async Task<JobViewModel?> AskThenStartAsync(IReadOnlyList<string> files, Preset preset, WebDrop? web,+ Func<Preset, bool, Task<Preset?>> choose, bool toClipboard = false)+ {+ try+ {+ var running = _store.Settings.WithDefaultOutput(preset);+ var one = AskedLocation.MakesOneResult(running, files.Count)+ && !(running.IsCopyToFolder && Directory.Exists(files[0]));+ if (await choose(running, one) is not { } asked)+ return null;+ var job = Start(files, asked, web: web, toClipboard: toClipboard);+ web = null;+ return job;+ }+ finally { web?.Dispose(); }+ }+/// <summary>/// Converts a watch folder's files again (rule id, files, preset as the job ran it): WatchFolderService sets it, so/// a retry also does what the folder does afterwards (moving originals).@@ -180,53 +199,6 @@ public sealed class ConversionServicereturn new WebDropOptions(folder, settings.SaveOnlyConverted);}- public bool DownloadNeedsPicker => _store.Settings.BrowserDrops.DownloadLocation == DownloadLocation.Ask- || _store.Settings.BrowserDrops.DownloadLocation == DownloadLocation.Custom- && string.IsNullOrWhiteSpace(_store.Settings.BrowserDrops.DownloadFolder);-- public string DownloadFolderInUse => _store.Settings.BrowserDrops.DownloadLocation == DownloadLocation.Custom- && !string.IsNullOrWhiteSpace(_store.Settings.BrowserDrops.DownloadFolder)- ? _store.Settings.BrowserDrops.DownloadFolder.Trim() : _platform.DownloadsFolder;-- internal async Task<JobViewModel?> ChooseNamedDownloadAsync(IReadOnlyList<string> files, Preset preset, WebDrop web,- Func<string, string, Task<string?>> chooseFile)- {- try- {- var folder = _store.Settings.BrowserDrops.LastDownloadFolder;- if (!Directory.Exists(folder)) folder = DownloadFolderInUse;- var paths = new Dictionary<string, string>();- foreach (var file in files)- {- var path = await chooseFile(folder, Path.GetFileName(file));- if (string.IsNullOrWhiteSpace(path)) return null;- if (paths.Values.Contains(path, StringComparer.OrdinalIgnoreCase)) return null;- paths[file] = path;- folder = Path.GetDirectoryName(path)!;- }- _store.Settings.BrowserDrops.LastDownloadFolder = folder;- _store.SaveSettings();- var job = Start(files, preset, web: web, downloadFolder: folder, savePaths: paths);- web = null!;- return job;- }- finally { web?.Dispose(); }- }-- internal async Task<JobViewModel?> ChooseDownloadAsync(IReadOnlyList<string> files, Preset preset, WebDrop web,- Func<string, Task<string?>> chooseFolder)- {- try- {- var folder = await chooseFolder(DownloadFolderInUse);- if (string.IsNullOrWhiteSpace(folder)) return null;- var job = Start(files, preset, web: web, downloadFolder: folder);- web = null!; // Start owns or disposes it.- return job;- }- finally { web?.Dispose(); }- }-/// <summary>True when a source file (or folder) is still where it was.</summary>public static bool Exists(string path) => File.Exists(path) || Directory.Exists(path);diff --git a/src/Filee.App/Services/PresetAvailability.cs b/src/Filee.App/Services/PresetAvailability.csindex 7f3072bc..e5a0946c 100644--- a/src/Filee.App/Services/PresetAvailability.cs+++ b/src/Filee.App/Services/PresetAvailability.cs@@ -105,6 +105,9 @@ public sealed class PresetAvailabilityprivate PresetJudgement Evaluate(Preset preset, IReadOnlyList<FileFormat> formats,Func<RoutePlanner> installedPlanner, Func<Func<RoutePlanner, bool>, EnginePackageState?> packageEnabling){+ if (preset.IsCopyToFolder)+ return new(PresetUse.Usable, null);+if (preset.IsClipTool){// Any video among the files: the others are left out when the clip window opens.diff --git a/src/Filee.App/Services/RadialController.cs b/src/Filee.App/Services/RadialController.csindex efe57782..1e7749d4 100644--- a/src/Filee.App/Services/RadialController.cs+++ b/src/Filee.App/Services/RadialController.cs@@ -338,14 +338,7 @@ public sealed class RadialController(return;}- if (preset.IsDownload && web is not null && conversions.DownloadNeedsPicker)- {- Close(animate: false);- _ = DownloadInFolderAsync(sources, preset.Clone(), web);- return;- }-- if (preset.IsTool)+ if (preset.IsTool && !preset.IsCopyToFolder){log.LogInformation("Opening {Preset} for {Count} file(s)", preset.Id, sources.Count);var near = _window?.Position;@@ -367,16 +360,16 @@ public sealed class RadialController(// "Ask every time" (#521): the save dialog first; the toast shows the job, the donut has closed for the dialog.// shortcut: files from a browser aren't asked about, they save into the download folder as "next to the source".- if (preset.Output.AskEveryTime && web is null)+ if (preset.Output.AskEveryTime && (web is null || preset.IsCopyToFolder)){Close(animate: false);- _ = AskThenConvertAsync(sources, preset, _toClipboard);+ _ = AskThenConvertAsync(sources, preset, _toClipboard, web);return;}log.LogInformation("Converting {Count} file(s) with preset {Preset}{Web}{Clipboard}", sources.Count, preset.Id,web is null ? "" : " (from a browser)", _toClipboard ? " (from the clipboard)" : "");- var job = conversions.Start(sources, preset, showInToast: false, web: web, toClipboard: _toClipboard);+ var job = conversions.Start(sources, preset, showInToast: false, web, _toClipboard);if (job is null || _window is null){Close();@@ -386,13 +379,6 @@ public sealed class RadialController(ShowProgress(job);}- private async Task DownloadInFolderAsync(IReadOnlyList<string> files, Preset preset, WebDrop web)- {- try { await conversions.ChooseNamedDownloadAsync(files, preset, web, windows.ChooseDownloadFileAsync); }- catch (Exception ex) when (ex is not OutOfMemoryException)- { log.LogError(ex, "Could not choose the download folder"); }- }-private async Task MergeInOrderAsync(IReadOnlyList<string> files, Preset preset, WebDrop? web, bool toClipboard){try@@ -444,17 +430,12 @@ public sealed class RadialController(}}- private async Task AskThenConvertAsync(IReadOnlyList<string> sources, Preset preset, bool toClipboard)+ private async Task AskThenConvertAsync(IReadOnlyList<string> sources, Preset preset, bool toClipboard, WebDrop? web = null){try{- // Asked as it will run (a ZIP from Settings › General is a .zip), for one file or a folder as the job makes them.- var running = store.Settings.WithDefaultOutput(preset);- if (await windows.AskSaveLocationAsync(sources, running, AskedLocation.MakesOneResult(running, sources.Count)) is { } asked)- {- log.LogInformation("Converting {Count} file(s) with preset {Preset} where the user chose", sources.Count, preset.Id);- conversions.Start(sources, asked, toClipboard: toClipboard);- }+ await conversions.AskThenStartAsync(sources, preset, web,+ (running, one) => windows.AskSaveLocationAsync(sources, running, one), toClipboard);}catch (Exception ex) when (ex is not OutOfMemoryException){@@ -476,7 +457,7 @@ public sealed class RadialController(/// archive"; any other preset converts the files beside them (issue #186)./// </summary>internal static IReadOnlyList<string> SourcesFor(Preset preset, IReadOnlyList<string> files) =>- preset.PacksIntoOneArchive ? files : [.. files.Where(path => !Directory.Exists(path))];+ preset.PacksIntoOneArchive || preset.IsCopyToFolder ? files : [.. files.Where(path => !Directory.Exists(path))];// ───────── Progress ring ─────────@@ -669,4 +650,3 @@ public sealed class RadialController(_web = web;}}-diff --git a/src/Filee.App/Services/WindowService.cs b/src/Filee.App/Services/WindowService.csindex fdf39c78..955b0851 100644--- a/src/Filee.App/Services/WindowService.cs+++ b/src/Filee.App/Services/WindowService.cs@@ -87,29 +87,6 @@ public sealed class WindowService(ILocalizer loc, IServiceProvider services, Memreturn dialog.Result;}- public async Task<string?> ChooseDownloadFileAsync(string startFolder, string name)- {- var owner = new Window- {- Title = loc["preset.browser_download"],- Width = 380,- Height = 120,- WindowStartupLocation = WindowStartupLocation.CenterScreen,- Content = new TextBlock { Text = loc["general.download.Ask"], Margin = new Thickness(24) },- };- PrepareWindow(owner);- owner.Show();- owner.Activate();- try- {- var start = await owner.StorageProvider.TryGetFolderFromPathAsync(startFolder);- var file = await owner.StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions- { Title = loc["preset.browser_download"], SuggestedFileName = name, ShowOverwritePrompt = true, SuggestedStartLocation = start });- return file?.TryGetLocalPath();- }- finally { owner.Close(); }- }-/// <summary>/// "Ask every time" (#521): one save dialog for the batch, starting in the first source's folder. One result is/// saved under a name (<see cref="AskedLocation.ForFile"/>), several go into a folder. Null when cancelled.@@ -132,7 +109,10 @@ public sealed class WindowService(ILocalizer loc, IServiceProvider services, Memtry{var storage = host.StorageProvider;- var start = await storage.TryGetFolderFromPathAsync(Path.GetDirectoryName(Path.GetFullPath(sources[0]))!);+ var startFolder = Path.GetDirectoryName(Path.GetFullPath(sources[0]))!;+ if (preset.IsCopyToFolder && !Directory.Exists(startFolder))+ startFolder = services.GetRequiredService<Filee.Core.Platform.IPlatformServices>().DownloadsFolder;+ var start = await storage.TryGetFolderFromPathAsync(startFolder);if (oneResult){var extension = AskedLocation.Extension(preset, sources[0]);@@ -142,7 +122,7 @@ public sealed class WindowService(ILocalizer loc, IServiceProvider services, MemSuggestedStartLocation = start,SuggestedFileName = AskedLocation.SuggestedName(preset, loc.DisplayName(preset), sources[0]),DefaultExtension = extension.Length == 0 ? null : extension,- ShowOverwritePrompt = true,+ ShowOverwritePrompt = !preset.IsCopyToFolder,});return file?.TryGetLocalPath() is { } path ? AskedLocation.ForFile(preset, path) : null;}diff --git a/src/Filee.App/ViewModels/Pages/GeneralPageViewModel.cs b/src/Filee.App/ViewModels/Pages/GeneralPageViewModel.csindex 699494f3..c55d3540 100644--- a/src/Filee.App/ViewModels/Pages/GeneralPageViewModel.cs+++ b/src/Filee.App/ViewModels/Pages/GeneralPageViewModel.cs@@ -49,9 +49,6 @@ public sealed partial class GeneralPageViewModel : ObservableObject, IDisposable_keepFileDates = store.Settings.KeepFileDates;_browserFolder = store.Settings.BrowserDrops.Folder;_saveOnlyConverted = store.Settings.BrowserDrops.SaveOnlyConverted;- DownloadLocations = Enum.GetValues<Filee.Core.Settings.DownloadLocation>().Select(v => new Choice<DownloadLocation>(v, loc[$"general.download.{v}"])).ToList();- _downloadLocation = DownloadLocations.FirstOrDefault(v => v.Value == store.Settings.BrowserDrops.DownloadLocation) ?? DownloadLocations[0];- _downloadFolder = store.Settings.BrowserDrops.DownloadFolder;_zipGeoResults = store.Settings.ZipGeoResults;CloseChoices = Enum.GetValues<CloseAction>().Select(v => new Choice<CloseAction>(v, loc[$"general.close.{v}"])).ToList();_closeChoice = CloseChoices.First(c => c.Value == store.Settings.CloseAction);@@ -100,18 +97,6 @@ public sealed partial class GeneralPageViewModel : ObservableObject, IDisposable/// <summary>Where files dragged from a browser are saved; empty for the Downloads folder.</summary>[ObservableProperty] private string _browserFolder;- public IReadOnlyList<Choice<DownloadLocation>> DownloadLocations { get; }- [ObservableProperty, NotifyPropertyChangedFor(nameof(ShowDownloadFolder))]- private Choice<DownloadLocation> _downloadLocation;- [ObservableProperty] private string _downloadFolder;- public bool ShowDownloadFolder => DownloadLocation.Value == Filee.Core.Settings.DownloadLocation.Custom;- partial void OnDownloadLocationChanged(Choice<DownloadLocation>? oldValue, Choice<DownloadLocation> newValue)- {- if (!Choices.Restore(oldValue, newValue, v => DownloadLocation = v))- Save(s => s.BrowserDrops.DownloadLocation = newValue.Value);- }- partial void OnDownloadFolderChanged(string value) => Save(s => s.BrowserDrops.DownloadFolder = value.Trim());-[ObservableProperty] private bool _saveOnlyConverted;/// <summary>The user's Downloads folder, shown while no other folder is set.</summary>diff --git a/src/Filee.App/ViewModels/Pages/ToolbarPageViewModel.cs b/src/Filee.App/ViewModels/Pages/ToolbarPageViewModel.csindex f01f584c..e6d9e590 100644--- a/src/Filee.App/ViewModels/Pages/ToolbarPageViewModel.cs+++ b/src/Filee.App/ViewModels/Pages/ToolbarPageViewModel.cs@@ -472,6 +472,11 @@ public sealed partial class ToolbarPageViewModel : ObservableObject, IDisposable/// </summary>public bool Insert(string presetId, int index){+ if (!EditingBack && BelongsOnBack(_store.FindPreset(presetId)))+ {+ Message = _loc["presets.copy_back"];+ return false;+ }if (Slices is not { } slices || slices.Contains(presetId))return false;if (slices.Count >= ToolbarProfile.MaxSlices)@@ -551,6 +556,30 @@ public sealed partial class ToolbarPageViewModel : ObservableObject, IDisposableCommit();}+ private bool BelongsOnBack(Preset? preset) => preset is not null && (preset.IsCopyToFolder+ || preset.IsGroup && preset.SubPresetIds.Any(id => _store.FindPreset(id)?.IsCopyToFolder == true));++ [RelayCommand]+ private async Task NewFolderCopy()+ {+ var preset = new Preset+ {+ Name = _loc["presets.copy_to_folder"],+ Kind = PresetKind.CopyToFolder,+ TargetFormat = Preset.CopyTarget,+ Output = new OutputRule { Location = OutputLocation.CustomFolder }+ };+ if (!await _windows.EditPresetAsync(preset, _windows.Main))+ return;+ _store.Presets.Add(preset);+ EditingBack = true;+ if (Slices is { Count: < ToolbarProfile.MaxSlices } slices)+ slices.Add(preset.Id);+ else+ _newPresetToSelect = preset.Id;+ Commit();+ }+[RelayCommand]private async Task NewPreset(){@@ -871,5 +900,6 @@ public sealed partial class ToolbarPageViewModel : ObservableObject, IDisposableprivate string? Caption(Preset p) =>p.IsGroup ? _loc.Format("donut.group_caption", p.SubPresetIds.Count)+ : p.IsCopyToFolder ? _loc["presets.copy_to_folder"]: p.TargetFormat == BuiltInData.SameAsSource ? _loc["donut.same_format"] : FormatLabels.NameOf(_loc, p.TargetFormat);}diff --git a/src/Filee.App/ViewModels/PresetEditorViewModel.cs b/src/Filee.App/ViewModels/PresetEditorViewModel.csindex ace632fc..916946e8 100644--- a/src/Filee.App/ViewModels/PresetEditorViewModel.cs+++ b/src/Filee.App/ViewModels/PresetEditorViewModel.cs@@ -86,6 +86,8 @@ public sealed partial class PresetEditorViewModel : ObservableObjectf.Id == FormatRegistry.Folder ? loc["presets.target_folder"] : f.DisplayName,FormatLabels.Category(loc, f.Category))),];+ if (preset.IsCopyToFolder)+ Targets = [new Choice<string>(Preset.CopyTarget, loc["presets.copy_to_folder"])];ResizeModes = Enum.GetValues<ResizeMode>().Select(v => new Choice<ResizeMode>(v, loc[$"presets.resize.{v}"])).ToList();Rotations = Enum.GetValues<ImageRotation>().Select(v => new Choice<ImageRotation>(v, loc[$"presets.rotation.{v}"])).ToList();Flips = Enum.GetValues<ImageFlip>().Select(v => new Choice<ImageFlip>(v, loc[$"presets.flip.{v}"])).ToList();@@ -104,6 +106,13 @@ public sealed partial class PresetEditorViewModel : ObservableObjectLocations = [.. Enum.GetValues<OutputLocation>().Select(v => new Choice<OutputLocation?>(v, loc[$"presets.location.{v}"])),new Choice<OutputLocation?>(null, loc["presets.location.Ask"])];Conflicts = Enum.GetValues<ConflictPolicy>().Select(v => new Choice<ConflictPolicy>(v, loc[$"presets.conflict.{v}"])).ToList();+ if (preset.IsCopyToFolder)+ {+ Locations = Locations.Where(l => l.Value is null or OutputLocation.CustomFolder).ToList();+ Conflicts = Conflicts.Where(c => c.Value == ConflictPolicy.Rename).ToList();+ _edit.Output.Location = OutputLocation.CustomFolder;+ _edit.Output.Conflict = ConflictPolicy.Rename;+ }TiffCompressions = Enum.GetValues<TiffCompression>().Select(v => new Choice<TiffCompression>(v, v.ToString().ToUpperInvariant())).ToList();FitsTiffModes = Enum.GetValues<FitsTiffMode>().Select(v => new Choice<FitsTiffMode>(v, loc[$"presets.fits_tiff.{v}"])).ToList();MediaQualities = Enum.GetValues<MediaQuality>().Select(v => new Choice<MediaQuality>(v, loc[$"presets.media_quality.{v}"])).ToList();@@ -228,6 +237,11 @@ public sealed partial class PresetEditorViewModel : ObservableObject}public string PresetId => _original.Id;+ public bool IsCopyToFolder => _original.IsCopyToFolder;+ public bool ShowConversionOutput => !IsCopyToFolder;+ public string? DestinationError => IsCopyToFolder && Location.Value is not null && string.IsNullOrWhiteSpace(CustomFolder)+ ? _loc["presets.copy_choose_folder"] : null;+public bool IsTool => _original.IsTool;public bool CanChangeTarget => !IsTool;@@ -415,6 +429,7 @@ public sealed partial class PresetEditorViewModel : ObservableObjectprivate Choice<PdfPageSize> _pageSize;[ObservableProperty, NotifyPropertyChangedFor(nameof(ShowSubfolder), nameof(ShowCustomFolder))]+ [NotifyPropertyChangedFor(nameof(DestinationError), nameof(IsValid))]private Choice<OutputLocation?> _location;[ObservableProperty] private Choice<ConflictPolicy> _conflict;@@ -542,7 +557,9 @@ public sealed partial class PresetEditorViewModel : ObservableObject[ObservableProperty] private string _subfolderName;/// <summary>The subfolder only for a file that becomes several (OutputRule.SubfolderOnlyForSeveralFiles).</summary>[ObservableProperty] private bool _subfolderOnlyForSeveralFiles;- [ObservableProperty] private string _customFolder;+ [ObservableProperty]+ [NotifyPropertyChangedFor(nameof(DestinationError), nameof(IsValid))]+ private string _customFolder;[ObservableProperty] private string _pattern;[ObservableProperty] private bool _keepDates;/// <summary>Geospatial targets: the result is saved as one ZIP (OutputRule.ZipResult).</summary>@@ -753,7 +770,7 @@ 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 && SizeRangeError is null;+ public bool IsValid => NameError is null && SizeRangeError is null && DestinationError 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;@@ -916,7 +933,7 @@ public sealed partial class PresetEditorViewModel : ObservableObjectoutput.KeepDates = KeepDates;// Only for geospatial targets, where it is offered: a box ticked for Shapefile must not zip a later PNG.output.ZipResult = ShowZipResult && ZipResult;- output.ReplaceOriginal = ReplaceOriginal;+ output.ReplaceOriginal = !IsCopyToFolder && ReplaceOriginal;return true;}diff --git a/src/Filee.App/ViewModels/PresetFormatTip.cs b/src/Filee.App/ViewModels/PresetFormatTip.csindex 50ae037e..fd837976 100644--- a/src/Filee.App/ViewModels/PresetFormatTip.cs+++ b/src/Filee.App/ViewModels/PresetFormatTip.cs@@ -71,6 +71,14 @@ public sealed partial class PresetFormatTip(if (preset.IsGroup)return;+ if (preset.IsCopyToFolder)+ {+ Title = loc.DisplayName(preset);+ AnyFile = loc["toolbar.chip_tip.any_file"];+ MakesBefore = loc["presets.copy_hint"];+ return;+ }+if (!preset.PacksIntoOneArchive){var usable = availability.UsableFormats(preset, FormatRegistry.Known);diff --git a/src/Filee.App/ViewModels/RadialViewModel.cs b/src/Filee.App/ViewModels/RadialViewModel.csindex 335dc3c3..2ecd925d 100644--- a/src/Filee.App/ViewModels/RadialViewModel.cs+++ b/src/Filee.App/ViewModels/RadialViewModel.cs@@ -10,7 +10,6 @@ using Filee.Core.Localization;using Filee.Core.Presets;using Filee.Core.Profiles;using Filee.Core.Settings;-using Filee.Core.Web;namespace Filee.App.ViewModels;@@ -158,7 +157,7 @@ public sealed partial class RadialViewModel(UserDataStore store, ILocalizer loc,var profile = ProfileSelector.Select(store.Profiles, counted);var formats = ProfileSelector.DetectFormats(counted);// Both faces follow the same rule: a slice that can't convert these files is greyed out and says why.- _front = BuildFace(profile?.PresetIds ?? [], formats, files.Count > 0 && files.All(WebDrop.IsPlaceholder));+ _front = BuildFace(profile?.PresetIds ?? [], formats);(_back, _backIds, _formats) = (null, [.. profile?.BackPresetIds ?? []], formats);var load = ++_loads;if (backFace)@@ -223,22 +222,13 @@ public sealed partial class RadialViewModel(UserDataStore store, ILocalizer loc,private bool HasGroups(IEnumerable<string> presetIds) => presetIds.Any(id => store.FindPreset(id)?.IsGroup == true);- private Face BuildFace(IEnumerable<string> presetIds, IReadOnlyList<FileFormat> formats, bool download = false)+ private Face BuildFace(IEnumerable<string> presetIds, IReadOnlyList<FileFormat> formats){var presets = presetIds.Select(store.FindPreset).OfType<Preset>().ToList();- if (download)- presets.Add(new Preset- {- Id = "browser-download",- NameKey = "preset.browser_download",- TargetFormat = "download",- Kind = PresetKind.Download- });-var subPresets = presets.Select(p => (IReadOnlyList<Preset>)(p.IsGroup ? p.SubPresetIds : []).Select(store.FindPreset).OfType<Preset>().Where(c => !c.IsGroup).Take(Preset.MaxSubPresets).ToList())@@ -246,13 +236,14 @@ public sealed partial class RadialViewModel(UserDataStore store, ILocalizer loc,DonutItem ItemOf(Preset p, bool caption = true){- var reason = p.IsDownload ? null : availability.Check(p, formats);+ var reason = availability.Check(p, formats);return new DonutItem{Id = p.Id,// On a group's ring the group's name gives the context: "Rotate" → Left / Right / 180°.Label = caption ? loc.DonutName(p) : loc.RingName(p),- Caption = p.IsDownload ? loc["preset.browser_download_caption"] : !caption ? null+ Caption = !caption ? null+ : p.IsCopyToFolder ? loc["presets.copy_to_folder"]: p.TargetFormat == BuiltInData.SameAsSource? string.Join("/", formats.Select(f => f.DisplayName).Take(2)): FormatLabels.NameOf(loc, p.TargetFormat),diff --git a/src/Filee.App/Views/Pages/GeneralPage.axaml b/src/Filee.App/Views/Pages/GeneralPage.axamlindex 4c4e4ff4..0d30079c 100644--- a/src/Filee.App/Views/Pages/GeneralPage.axaml+++ b/src/Filee.App/Views/Pages/GeneralPage.axaml@@ -74,13 +74,6 @@<TextBox Text="{Binding BrowserFolder}" PlaceholderText="{Binding DownloadsFolder}" Width="440" /></DockPanel></StackPanel>- <TextBlock Classes="label" Text="{DynamicResource general.download_location}" />- <ComboBox ItemsSource="{Binding DownloadLocations}" SelectedItem="{Binding DownloadLocation}" MinWidth="240" />- <DockPanel IsVisible="{Binding ShowDownloadFolder}" MaxWidth="560" HorizontalAlignment="Stretch">- <Button DockPanel.Dock="Right" Margin="8,0,0,0" Content="{DynamicResource presets.browse}" Click="OnBrowseDownloadFolder" />- <TextBox Text="{Binding DownloadFolder}" PlaceholderText="{Binding DownloadsFolder}" />- </DockPanel>- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource general.download_hint}" /><CheckBox Content="{DynamicResource general.browser_drops_only_converted}" IsChecked="{Binding SaveOnlyConverted}" /><TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource general.browser_drops_only_converted_hint}" Margin="0,-6,0,0" /></StackPanel>diff --git a/src/Filee.App/Views/Pages/GeneralPage.axaml.cs b/src/Filee.App/Views/Pages/GeneralPage.axaml.csindex 950acea4..b880be0e 100644--- a/src/Filee.App/Views/Pages/GeneralPage.axaml.cs+++ b/src/Filee.App/Views/Pages/GeneralPage.axaml.cs@@ -48,15 +48,6 @@ public partial class GeneralPage : UserControlVm.BrowserFolder = path;}- private async void OnBrowseDownloadFolder(object? sender, RoutedEventArgs e)- {- if (Vm is null || TopLevel.GetTopLevel(this) is not { } top) return;- var start = await top.StorageProvider.TryGetFolderFromPathAsync(- string.IsNullOrWhiteSpace(Vm.DownloadFolder) ? Vm.DownloadsFolder : Vm.DownloadFolder.Trim());- var folders = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions { AllowMultiple = false, SuggestedStartLocation = start });- if (folders.FirstOrDefault()?.TryGetLocalPath() is { } path) Vm.DownloadFolder = path;- }-private async void OnImport(object? sender, RoutedEventArgs e){if (Vm is null || TopLevel.GetTopLevel(this) is not { } top)diff --git a/src/Filee.App/Views/Pages/ToolbarPage.axaml b/src/Filee.App/Views/Pages/ToolbarPage.axamlindex c57d78ad..82152ce4 100644--- a/src/Filee.App/Views/Pages/ToolbarPage.axaml+++ b/src/Filee.App/Views/Pages/ToolbarPage.axaml@@ -472,6 +472,9 @@<TextBlock Text="{DynamicResource toolbar.new_group}" /></StackPanel></Button>+ <Button x:Name="NewFolderCopyButton" Margin="0,0,0,6" Padding="6,6"+ Command="{Binding NewFolderCopyCommand}" Content="{DynamicResource presets.copy_to_folder}"+ ToolTip.Tip="{DynamicResource presets.copy_hint}" /></WrapPanel><TextBox x:Name="PaletteSearchBox" Classes="search clearButton" Text="{Binding PaletteSearch}" Watermark="{DynamicResource common.search}"><TextBox.InnerLeftContent>diff --git a/src/Filee.App/Views/PresetEditorView.axaml b/src/Filee.App/Views/PresetEditorView.axamlindex 816b7031..b462ac2b 100644--- a/src/Filee.App/Views/PresetEditorView.axaml+++ b/src/Filee.App/Views/PresetEditorView.axaml@@ -34,7 +34,8 @@<TextBlock Classes="caption danger" Text="{Binding NameError}" IsVisible="{Binding NameError, Converter={x:Static ObjectConverters.IsNotNull}}" Margin="2,4,0,0" /></StackPanel><StackPanel Grid.Column="2">- <TextBlock Classes="label" Text="{DynamicResource presets.target}" />+ <TextBlock Classes="label" Text="{DynamicResource presets.target}" IsVisible="{Binding ShowConversionOutput}" />+ <TextBlock Classes="label" Text="{DynamicResource presets.copy_action}" IsVisible="{Binding IsCopyToFolder}" /><ComboBox x:Name="TargetBox" Classes="targets" ItemsSource="{Binding Targets}" SelectedItem="{Binding Target}"IsEnabled="{Binding CanChangeTarget}"HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch" MaxDropDownHeight="420" AutomationProperties.Name="{DynamicResource presets.target}">@@ -510,6 +511,8 @@</StackPanel></Border>+ <TextBlock Text="{DynamicResource presets.copy_hint}" IsVisible="{Binding IsCopyToFolder}" TextWrapping="Wrap" />+<!-- Output --><Border Classes="card" Padding="14"><StackPanel Spacing="10">@@ -524,6 +527,8 @@<ComboBox ItemsSource="{Binding Conflicts}" SelectedItem="{Binding Conflict}" HorizontalAlignment="Stretch" AutomationProperties.Name="{DynamicResource presets.conflict}" /></StackPanel></Grid>+ <TextBlock Classes="caption danger" Text="{Binding DestinationError}" TextWrapping="Wrap"+ IsVisible="{Binding DestinationError, Converter={x:Static ObjectConverters.IsNotNull}}" /><StackPanel IsVisible="{Binding ShowSubfolder}"><TextBlock Classes="label" Text="{DynamicResource presets.subfolder}" /><TextBox Text="{Binding SubfolderName}" PlaceholderText="converted" AutomationProperties.Name="{DynamicResource presets.subfolder}" />@@ -537,16 +542,16 @@<TextBox Text="{Binding CustomFolder}" AutomationProperties.Name="{DynamicResource presets.custom_folder}" /></DockPanel></StackPanel>- <StackPanel>+ <StackPanel IsVisible="{Binding ShowConversionOutput}"><TextBlock Classes="label" Text="{DynamicResource presets.pattern}" /><TextBox Text="{Binding Pattern}" PlaceholderText="{}{name}" /><TextBlock Classes="caption" Text="{DynamicResource presets.pattern_hint}" Margin="2,4,0,0" /></StackPanel>- <CheckBox Content="{DynamicResource presets.keep_dates}" IsChecked="{Binding KeepDates}"+ <CheckBox IsVisible="{Binding ShowConversionOutput}" Content="{DynamicResource presets.keep_dates}" IsChecked="{Binding KeepDates}"ToolTip.Tip="{DynamicResource presets.keep_dates_hint}" /><CheckBox Content="{DynamicResource presets.zip_result}" IsChecked="{Binding ZipResult}" IsVisible="{Binding ShowZipResult}"ToolTip.Tip="{DynamicResource presets.zip_result_hint}" />- <StackPanel>+ <StackPanel IsVisible="{Binding ShowConversionOutput}"><CheckBox Content="{DynamicResource presets.replace_original}" IsChecked="{Binding ReplaceOriginal}" /><TextBlock Classes="caption" Text="{DynamicResource presets.replace_original_hint}" TextWrapping="Wrap"IsVisible="{Binding ReplaceOriginal}" Margin="28,2,0,0" />diff --git a/src/Filee.Core/Conversion/ConversionJob.cs b/src/Filee.Core/Conversion/ConversionJob.csindex 262ddb2f..aea9aa2f 100644--- a/src/Filee.Core/Conversion/ConversionJob.cs+++ b/src/Filee.Core/Conversion/ConversionJob.cs@@ -98,7 +98,8 @@ public sealed class ConversionJobpublic ConversionJob(IReadOnlyList<string> sources, Preset preset, string presetDisplayName, ISourceFetcher? fetcher = null){// A Shapefile's .dbf, .shx, .prj, ... dropped with its .shp are part of it, not files to convert on their own.- sources = Formats.CompanionFiles.WithoutCompanions(sources);+ if (!preset.IsCopyToFolder)+ sources = Formats.CompanionFiles.WithoutCompanions(sources);Preset = preset.Clone(); // later edits of the preset must not affect a running jobPresetDisplayName = presetDisplayName;Fetcher = fetcher;diff --git a/src/Filee.Core/Conversion/JobQueue.Copy.cs b/src/Filee.Core/Conversion/JobQueue.Copy.csnew file mode 100644index 00000000..3ad452a7--- /dev/null+++ b/src/Filee.Core/Conversion/JobQueue.Copy.cs@@ -0,0 +1,31 @@+using Filee.Core.Presets;++namespace Filee.Core.Conversion;++public sealed partial class JobQueue+{+ private async Task RunCopiesAsync(ConversionJob job)+ {+ foreach (var file in job.Files.Where(f => !Stopped(f)))+ {+ file.State = FileState.Running;+ Notify(job);+ try+ {+ var result = await FolderCopy.CopyAsync(file.SourcePath, job.Preset.Output, job.CancellationToken);+ if (result is not null)+ file.Outputs.Add(result);+ file.Progress = 1;+ file.State = result is null ? FileState.Skipped : FileState.Done;+ }+ catch (OperationCanceledException) { file.State = FileState.Cancelled; }+ catch (Exception ex) when (ex is not OutOfMemoryException)+ {+ file.State = FileState.Failed;+ file.ErrorKey = "error.conversion_failed";+ file.ErrorDetail = ex.Message;+ }+ Notify(job);+ }+ }+}diff --git a/src/Filee.Core/Conversion/JobQueue.cs b/src/Filee.Core/Conversion/JobQueue.csindex eb6c2c1d..2c050611 100644--- a/src/Filee.Core/Conversion/JobQueue.cs+++ b/src/Filee.Core/Conversion/JobQueue.cs@@ -11,7 +11,7 @@ using Microsoft.Extensions.Logging.Abstractions;namespace Filee.Core.Conversion;/// <summary>Background queue that executes <see cref="ConversionJob"/>s one after another.</summary>-public sealed class JobQueue : IAsyncDisposable+public sealed partial class JobQueue : IAsyncDisposable{private readonly ConverterCatalog _catalog;private readonly IPdfMerger? _pdfMerger;@@ -98,20 +98,11 @@ public sealed class JobQueue : IAsyncDisposableDirectory.CreateDirectory(workDir);try{- if (job.Preset.IsDownload && job.Fetcher is null)- throw new InvalidOperationException("Download requires browser source data.");if (job.Fetcher is { } fetcher)await FetchSourcesAsync(job, fetcher);- if (job.Preset.IsDownload)- {- foreach (var file in job.Files.Where(f => f.Saved && f.State == FileState.Pending))- {- file.Outputs.Add(file.SourcePath);- file.Progress = 1;- file.State = FileState.Done;- }- }+ if (job.Preset.IsCopyToFolder)+ await RunCopiesAsync(job);else{var planner = _catalog.CreatePlanner();@@ -126,8 +117,9 @@ public sealed class JobQueue : IAsyncDisposablevar multiPageTiff = job.Preset.Image.MultiPageTiff && job.Preset.TargetFormat == "tiff" && _tiffMerger is not null;// Clips back to back, or pictures one after the other, in the order they were dropped.var join = job.Preset.JoinsIntoOneMedia && _mediaJoiner is not null;-+ // Pictures one under another or side by side, in the order they were dropped.var imageJoiner = job.Preset.JoinsImages ? _catalog.All.OfType<IImageJoiner>().FirstOrDefault() : null;+if (join)await RunJoinedMediaAsync(job, planner, workDir);else if (imageJoiner is not null)@@ -192,7 +184,7 @@ public sealed class JobQueue : IAsyncDisposableif (file.State != FileState.Running || file.Saved)return;file.Transfer = p;- var value = (p.Fraction ?? 0) * (job.Preset.IsDownload ? 1 : FetchShare);+ var value = (p.Fraction ?? 0) * FetchShare;if (value > file.Progress)file.Progress = value;Notify(job);@@ -202,7 +194,7 @@ public sealed class JobQueue : IAsyncDisposablefile.SourcePath = await fetcher.FetchAsync(file.SourcePath, progress, job.CancellationToken);file.Saved = true;file.State = FileState.Pending;- file.Progress = job.Preset.IsDownload ? 1 : FetchShare;+ file.Progress = FetchShare;}catch (OperationCanceledException){diff --git a/src/Filee.Core/Presets/AskedLocation.cs b/src/Filee.Core/Presets/AskedLocation.csindex ff8c170b..7fed4793 100644--- a/src/Filee.Core/Presets/AskedLocation.cs+++ b/src/Filee.Core/Presets/AskedLocation.cs@@ -24,6 +24,8 @@ public static class AskedLocation/// </summary>public static string SuggestedName(Preset preset, string presetName, string source){+ if (preset.IsCopyToFolder)+ return Path.GetFileName(Path.TrimEndingDirectorySeparator(source));var tokens = new OutputPathResolver.Tokens(source, presetName, 1, DateTime.Now);var name = OutputPathResolver.Sanitize(OutputPathResolver.Rename(OutputPathResolver.ExpandPattern(preset.Output.FileNamePattern, tokens), preset.Output.Renames),@@ -37,7 +39,8 @@ public static class AskedLocation/// source", empty for a folder ("Extract"). The preset is the one that runs, with Settings › General applied./// </summary>public static string Extension(Preset preset, string source) =>- preset.Output.ZipResult ? "zip"+ preset.IsCopyToFolder ? Path.GetExtension(source).TrimStart('.')+ : preset.Output.ZipResult ? "zip": preset.TargetFormat == BuiltInData.SameAsSource ? FormatRegistry.ExtensionOf(source): FormatRegistry.FindById(preset.TargetFormat)?.Extensions.FirstOrDefault() ?? "";diff --git a/src/Filee.Core/Presets/FolderCopy.cs b/src/Filee.Core/Presets/FolderCopy.csnew file mode 100644index 00000000..bf44f7ee--- /dev/null+++ b/src/Filee.Core/Presets/FolderCopy.cs@@ -0,0 +1,78 @@+using Filee.Core.Platform;++namespace Filee.Core.Presets;++/// <summary>Byte-preserving copies, published without overwriting any existing file or folder.</summary>+public static class FolderCopy+{+ private const string WorkPrefix = ".filee-copy-";++ /// <summary>Watchers ignore unpublished copies, including files inside their temporary directories.</summary>+ public static bool IsWorkPath(string path) => path.Split(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)+ .Any(part => part.StartsWith(WorkPrefix, StringComparison.Ordinal) && part.EndsWith(".tmp", StringComparison.Ordinal));++ /// <returns>The new path, or null when the source is already in the destination folder.</returns>+ public static async Task<string?> CopyAsync(string source, OutputRule rule, CancellationToken cancellationToken)+ {+ if (rule.AskEveryTime || rule.Location != OutputLocation.CustomFolder || string.IsNullOrWhiteSpace(rule.CustomFolder))+ throw new IOException("Choose a destination folder for Copy to folder.");+ var destination = Path.GetFullPath(rule.CustomFolder);+ if (!Directory.Exists(destination))+ throw new DirectoryNotFoundException("The destination folder is missing or unavailable: " + destination);+ source = Path.TrimEndingDirectorySeparator(Path.GetFullPath(source));+ if (FileSystemPaths.Comparer.Equals(Path.GetDirectoryName(source), Path.TrimEndingDirectorySeparator(destination)))+ return null;+ var directory = Directory.Exists(source);+ if (directory && (FileSystemPaths.Comparer.Equals(destination, source)+ || destination.StartsWith(source + Path.DirectorySeparatorChar, FileSystemPaths.Comparison)))+ throw new IOException("A folder cannot be copied into itself or one of its subfolders.");+ var name = rule.ConfirmedPath is { } chosen ? Path.GetFileName(chosen) : Path.GetFileName(source);+ var stage = Path.Combine(destination, WorkPrefix + Guid.NewGuid().ToString("N") + ".tmp");+ try+ {+ if (directory)+ await CopyDirectoryAsync(source, stage, cancellationToken);+ else+ await CopyFileAsync(source, stage, cancellationToken);+ var extension = directory ? "" : Path.GetExtension(name);+ var stem = directory ? name : Path.GetFileNameWithoutExtension(name);+ for (var n = 1; ; n++)+ {+ cancellationToken.ThrowIfCancellationRequested();+ var target = Path.Combine(destination, n == 1 ? name : $"{stem} ({n}){extension}");+ try+ {+ if (directory) Directory.Move(stage, target);+ else File.Move(stage, target, overwrite: false);+ return target;+ }+ catch (IOException) when (File.Exists(target) || Directory.Exists(target)) { }+ }+ }+ finally+ {+ // Only this operation's unpublished path is removed, never a source or a published result.+ if (File.Exists(stage)) File.Delete(stage);+ else if (Directory.Exists(stage)) Directory.Delete(stage, recursive: true);+ }+ }++ private static async Task CopyFileAsync(string source, string target, CancellationToken cancellationToken)+ {+ await using var input = new FileStream(source, FileMode.Open, FileAccess.Read, FileShare.Read, 65536, true);+ await using var output = new FileStream(target, FileMode.CreateNew, FileAccess.Write, FileShare.None, 65536, true);+ await input.CopyToAsync(output, cancellationToken);+ }++ private static async Task CopyDirectoryAsync(string source, string target, CancellationToken cancellationToken)+ {+ cancellationToken.ThrowIfCancellationRequested();+ if ((File.GetAttributes(source) & FileAttributes.ReparsePoint) != 0)+ throw new IOException("Copy to folder cannot follow a linked directory: " + source);+ Directory.CreateDirectory(target);+ foreach (var file in Directory.EnumerateFiles(source))+ await CopyFileAsync(file, Path.Combine(target, Path.GetFileName(file)), cancellationToken);+ foreach (var folder in Directory.EnumerateDirectories(source))+ await CopyDirectoryAsync(folder, Path.Combine(target, Path.GetFileName(folder)), cancellationToken);+ }+}diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.csindex bdccbf1f..6183cc4e 100644--- a/src/Filee.Core/Presets/Preset.cs+++ b/src/Filee.Core/Presets/Preset.cs@@ -23,8 +23,8 @@ public enum PresetKind/// </summary>Tool,- /// <summary>Saves browser-supplied files without conversion. Offered only for a live browser drop.</summary>- Download,+ /// <summary>Copies files and folders byte for byte to a chosen destination.</summary>+ CopyToFolder,}/// <summary>@@ -145,9 +145,6 @@ public sealed class Preset[JsonIgnore]public bool IsGroup => Kind == PresetKind.Group;- [JsonIgnore]- public bool IsDownload => Kind == PresetKind.Download;-/// <summary>True for "Compress into one archive": files and folders go into one archive as they are.</summary>[JsonIgnore]public bool PacksIntoOneArchive =>@@ -224,7 +221,12 @@ public sealed class Preset/// <summary>True for a <see cref="PresetKind.Tool"/>.</summary>[JsonIgnore]- public bool IsTool => Kind == PresetKind.Tool;+ public bool IsTool => Kind is PresetKind.Tool or PresetKind.CopyToFolder;++ [JsonIgnore]+ public bool IsCopyToFolder => Kind == PresetKind.CopyToFolder;++ public const string CopyTarget = "copy-to-folder";/// <summary><see cref="Tool"/> of the interactive crop (also a tool saved without one, from before clips).</summary>public const string CropTool = "crop";@@ -252,7 +254,7 @@ public sealed class Preset/// <summary>True for the interactive crop.</summary>[JsonIgnore]- public bool IsCropTool => IsTool && Tool is null or CropTool;+ public bool IsCropTool => Kind == PresetKind.Tool && Tool is null or CropTool;/// <summary>True for "Cut a clip".</summary>[JsonIgnore]diff --git a/src/Filee.Core/Settings/AppSettings.cs b/src/Filee.Core/Settings/AppSettings.csindex 01019aab..45db4a43 100644--- a/src/Filee.Core/Settings/AppSettings.cs+++ b/src/Filee.Core/Settings/AppSettings.cs@@ -343,15 +343,10 @@ public sealed class DefaultOutputSettings}/// <summary>Files dragged out of a web browser (Settings → General).</summary>-public enum DownloadLocation { Default, Ask, Custom }-public sealed class BrowserDropSettings{/// <summary>Where they are saved; empty means the user's Downloads folder (looked up each time, as it can move).</summary>public string Folder { get; set; } = "";- public DownloadLocation DownloadLocation { get; set; }- public string DownloadFolder { get; set; } = "";- public string LastDownloadFolder { get; set; } = "";/// <summary>Keep only the converted file: the original goes into a work folder and is deleted after the conversion.</summary>public bool SaveOnlyConverted { get; set; }diff --git a/src/Filee.Core/Watching/FolderWatcher.cs b/src/Filee.Core/Watching/FolderWatcher.csindex ffb05826..ee18964b 100644--- a/src/Filee.Core/Watching/FolderWatcher.cs+++ b/src/Filee.Core/Watching/FolderWatcher.cs@@ -123,6 +123,23 @@ public sealed class FolderWatcher : IAsyncDisposable/// <summary>Registers a file that appeared or changed; it is converted once it has settled.</summary>public void Notice(string path){+ if (Presets.FolderCopy.IsWorkPath(path))+ return;+ // A complete folder can arrive in one rename (Copy to folder publishes it atomically).+ if (Rule.IncludeSubfolders && Directory.Exists(path))+ {+ try+ {+ foreach (var file in Directory.EnumerateFiles(path, "*", new EnumerationOptions+ { RecurseSubdirectories = true, AttributesToSkip = FileAttributes.ReparsePoint, IgnoreInaccessible = true }))+ Notice(file);+ }+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)+ {+ _log.LogWarning(ex, "Could not list arriving folder {Folder}", path);+ }+ return;+ }if (ShouldIgnore(path, Rule))return;var now = _time.GetUtcNow();@@ -211,6 +228,8 @@ public sealed class FolderWatcher : IAsyncDisposable/// anything inside the output or originals folder, and names the rule's <see cref="WatchRule.Include"/> leaves out.</summary>public static bool ShouldIgnore(string path, WatchRule rule){+ if (Presets.FolderCopy.IsWorkPath(path))+ return true;var name = Path.GetFileName(path);if (name.Length == 0 || name.StartsWith("~$", StringComparison.Ordinal) || name.StartsWith('.')|| SystemFiles.Contains(name) || TemporaryExtensions.Contains(Path.GetExtension(name)))diff --git a/src/Filee.Core/Web/WebDrop.cs b/src/Filee.Core/Web/WebDrop.csindex 910b6b27..247333e0 100644--- a/src/Filee.Core/Web/WebDrop.cs+++ b/src/Filee.Core/Web/WebDrop.cs@@ -204,10 +204,7 @@ public sealed class WebDrop : IDisposable/// <summary>Where files dragged from a browser are saved (Settings → General).</summary>/// <param name="Folder">The download folder; "next to the source" means this folder for these files.</param>/// <param name="SaveOnlyConverted">The original goes into the work folder and is deleted after the conversion.</param>-public sealed record WebDropOptions(string Folder, bool SaveOnlyConverted)-{- public IReadOnlyDictionary<string, string>? SavePaths { get; init; }-}+public sealed record WebDropOptions(string Folder, bool SaveOnlyConverted);/// <summary>Saves a <see cref="WebDrop"/>'s files for the job that converts them, and cleans up after it.</summary>public sealed class WebDropFetcher(WebDrop drop, WebDropOptions options, WebDownloader downloader) : ISourceFetcher@@ -230,16 +227,8 @@ public sealed class WebDropFetcher(WebDrop drop, WebDropOptions options, WebDownpublic bool Fetches(string path) => drop.Holds(path);- public async Task<string> FetchAsync(string placeholder, IProgress<TransferProgress> progress, CancellationToken cancellationToken)- {- if (options.SavePaths is null || !options.SavePaths.TryGetValue(placeholder, out var destination))- return await drop.ItemFor(placeholder).SaveAsync(SaveFolder, downloader, progress, cancellationToken);- var staging = Path.Combine(drop.WorkFolder, "named-downloads");- var saved = await drop.ItemFor(placeholder).SaveAsync(staging, downloader, progress, cancellationToken);- cancellationToken.ThrowIfCancellationRequested();- File.Move(saved, destination, overwrite: true);- return destination;- }+ public Task<string> FetchAsync(string placeholder, IProgress<TransferProgress> progress, CancellationToken cancellationToken) =>+ drop.ItemFor(placeholder).SaveAsync(SaveFolder, downloader, progress, cancellationToken);public void Release(ConversionJob job){@@ -248,4 +237,3 @@ public sealed class WebDropFetcher(WebDrop drop, WebDropOptions options, WebDownWebDrop.TryDeleteFolder(drop.WorkFolder);}}-diff --git a/tests/Filee.App.Tests/BrowserDropTests.cs b/tests/Filee.App.Tests/BrowserDropTests.csindex 429b2cba..b4bec042 100644--- a/tests/Filee.App.Tests/BrowserDropTests.cs+++ b/tests/Filee.App.Tests/BrowserDropTests.cs@@ -93,6 +93,55 @@ public class BrowserDropTests}}+ [AvaloniaFact]+ public void Browser_drop_on_a_back_face_folder_slice_copies_the_original_bytes()+ {+ TestServices.EnsureInitialized("en");+ var store = AppHost.Get<UserDataStore>();+ var destination = Directory.CreateTempSubdirectory("filee-copy-drop-").FullName;+ var preset = new Filee.Core.Presets.Preset+ {+ Name = "Folder",+ Kind = Filee.Core.Presets.PresetKind.CopyToFolder,+ TargetFormat = Filee.Core.Presets.Preset.CopyTarget,+ Output = new() { Location = Filee.Core.Presets.OutputLocation.CustomFolder, CustomFolder = destination }+ };+ var profile = store.Profiles.Single(p => p.Id == "images");+ var before = profile.BackPresetIds;+ var radial = AppHost.Get<RadialController>();+ var motion = Motion.Enabled;+ try+ {+ store.Presets.Add(preset); profile.BackPresetIds = [preset.Id];+ Motion.Set(false);+ var file = VirtualFile.Create("cat.png", Png);+ using var data = ChromePicture(file);+ radial.ShowForDrag(500, 500);+ var window = radial.Window!;+ var root = window.FindControl<Panel>("Root")!;+ var donut = window.DonutControl;+ root.RaiseEvent(new DragEventArgs(DragDrop.DragEnterEvent, data, root, new Point(5, 5), KeyModifiers.Control));+ Pump(); donut.Flip(); Pump();+ var model = AppHost.Get<RadialViewModel>();+ Assert.True(model.IsBackFace);+ var (at, id) = FirstSlice(donut, model);+ Assert.Equal(preset.Id, id);+ root.RaiseEvent(new DragEventArgs(DragDrop.DropEvent, data, root, donut.TranslatePoint(at, root)!.Value, KeyModifiers.Control));+ var job = WaitFor(AppHost.Get<ConversionService>().Jobs[0]);+ Assert.Equal(JobState.Completed, job.State);+ var output = Assert.Single(job.Outputs);+ Assert.Equal(Path.Combine(destination, "cat.png"), output);+ Assert.Equal(Png, File.ReadAllBytes(output));+ Assert.True(file.Disposed);+ }+ finally+ {+ radial.Close(animate: false); Motion.Set(motion);+ profile.BackPresetIds = before; store.Presets.Remove(preset);+ Directory.Delete(destination, recursive: true);+ }+ }+private static ConversionJob WaitFor(JobViewModel vm){var deadline = DateTime.UtcNow + TimeSpan.FromSeconds(60);diff --git a/tests/Filee.App.Tests/DownloadTests.cs b/tests/Filee.App.Tests/DownloadTests.csdeleted file mode 100644index 2200de77..00000000--- a/tests/Filee.App.Tests/DownloadTests.cs+++ /dev/null@@ -1,65 +0,0 @@-using Avalonia.Headless.XUnit;-using Avalonia.Threading;-using Filee.App.Services;-using Filee.Core.Conversion;-using Filee.Core.Platform;-using Filee.Core.Presets;-using Filee.Core.Settings;-using Filee.Core.Web;--namespace Filee.App.Tests;--public class DownloadTests-{- [AvaloniaFact]- public async Task Download_policy_cancel_and_exact_bytes_are_independent_of_conversion_settings()- {- TestServices.EnsureInitialized("en");- var store = AppHost.Get<UserDataStore>();- var service = AppHost.Get<ConversionService>();- var previous = store.Settings.BrowserDrops;- var folder = Path.Combine(Path.GetTempPath(), "filee-download-test-" + Guid.NewGuid().ToString("N"));- var bytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==");- var preset = new Preset { Id = "browser-download", Kind = PresetKind.Download, TargetFormat = "download" };- WebDrop Drop() => new([WebDropItem.FromBytes("same.png", bytes)], WebDrop.DefaultWorkRoot);- try- {- store.Settings.BrowserDrops = new BrowserDropSettings { Folder = folder + "-unused", SaveOnlyConverted = true };- Assert.False(service.DownloadNeedsPicker);- Assert.Equal(AppHost.Get<IPlatformServices>().DownloadsFolder, service.DownloadFolderInUse);- store.Settings.BrowserDrops.DownloadLocation = DownloadLocation.Custom;- Assert.True(service.DownloadNeedsPicker);- store.Settings.BrowserDrops.DownloadFolder = folder;- Assert.False(service.DownloadNeedsPicker);- Assert.Equal(folder, service.DownloadFolderInUse);- store.Settings.BrowserDrops.DownloadLocation = DownloadLocation.Ask;- var before = service.Jobs.Count;- using (var cancel = Drop())- {- Assert.Null(await service.ChooseDownloadAsync(cancel.Placeholders, preset, cancel, _ => Task.FromResult<string?>(null)));- Assert.False(Directory.Exists(cancel.WorkFolder));- }- Assert.Equal(before, service.Jobs.Count);- for (var attempt = 0; attempt < 2; attempt++)- {- using var drop = Drop();- var vm = await service.ChooseDownloadAsync(drop.Placeholders, preset, drop, _ => Task.FromResult<string?>(folder));- Assert.NotNull(vm);- var until = DateTime.UtcNow.AddSeconds(30);- while (vm.Job.State is JobState.Queued or JobState.Running && DateTime.UtcNow < until)- { Dispatcher.UIThread.RunJobs(); Thread.Sleep(10); }- Assert.Equal(JobState.Completed, vm.Job.State);- var output = Assert.Single(vm.Job.Outputs);- Assert.Equal(folder, Path.GetDirectoryName(output));- Assert.Equal(bytes, File.ReadAllBytes(output));- }- Assert.Equal(2, Directory.GetFiles(folder).Length);- Assert.False(Directory.Exists(folder + "-unused"));- }- finally- {- store.Settings.BrowserDrops = previous;- if (Directory.Exists(folder)) Directory.Delete(folder, recursive: true);- }- }-}diff --git a/tests/Filee.App.Tests/FolderCopyTests.cs b/tests/Filee.App.Tests/FolderCopyTests.csnew file mode 100644index 00000000..f6c04bf5--- /dev/null+++ b/tests/Filee.App.Tests/FolderCopyTests.cs@@ -0,0 +1,139 @@+using Avalonia;+using Avalonia.Controls;+using Avalonia.Headless.XUnit;+using Filee.App.Controls;+using Filee.App.Services;+using Filee.App.ViewModels;+using Filee.App.ViewModels.Pages;+using Filee.App.Views;+using Filee.Core.Formats;+using Filee.Core.Localization;+using Filee.Core.Presets;+using Filee.Core.Settings;+using Filee.Core.Web;++namespace Filee.App.Tests;++[Collection("Motion")]+public class FolderCopyTests+{+ private static Preset Copy(string name, string folder) => new()+ {+ Name = name,+ Kind = PresetKind.CopyToFolder,+ TargetFormat = Preset.CopyTarget,+ Output = new OutputRule { Location = OutputLocation.CustomFolder, CustomFolder = folder }+ };++ [AvaloniaFact]+ public async Task Cancelling_ask_creates_no_job_and_releases_the_browser_drop()+ {+ TestServices.EnsureInitialized("en");+ var service = AppHost.Get<ConversionService>();+ var count = service.Jobs.Count;+ var owner = new Owner();+ using var drop = new WebDrop([WebDropItem.FromStream("a.png", _ => throw new Exception("Must not download"), owner: owner)], WebDrop.DefaultWorkRoot);+ var preset = Copy("Ask", ""); preset.Output.AskEveryTime = true;+ var result = await service.AskThenStartAsync(drop.Placeholders, preset, drop, (_, one) =>+ {+ Assert.True(one);+ return Task.FromResult<Preset?>(null);+ });+ Assert.Null(result); Assert.Equal(count, service.Jobs.Count);+ Assert.True(owner.Disposed); Assert.False(Directory.Exists(drop.WorkFolder));+ }++ private sealed class Owner : IDisposable+ {+ public bool Disposed { get; private set; }+ public void Dispose() => Disposed = true;+ }++ [AvaloniaFact]+ public void Copy_is_usable_for_unknown_types_folders_and_every_profile()+ {+ TestServices.EnsureInitialized("en");+ var availability = AppHost.Get<PresetAvailability>();+ var copy = Copy("Projects", "C:\\Projects");+ Assert.Null(availability.Check(copy, []));+ foreach (var format in FormatRegistry.Known)+ Assert.Null(availability.Check(copy, [format]));+ Assert.True(copy.IsTool);+ Assert.False(copy.IsCropTool);+ Assert.DoesNotContain(BuiltInData.CreatePresets(), p => p.IsCopyToFolder);+ }++ [AvaloniaTheory]+ [InlineData("en")]+ [InlineData("zh-CN")]+ public void Editor_reuses_destination_choices_and_only_allows_numbered_conflicts(string language)+ {+ TestServices.EnsureInitialized(language);+ var loc = AppHost.Get<ILocalizer>();+ var preset = Copy(language == "en" ? "Project icons" : "项目图标", "C:\\Projects\\Icons");+ var editor = new PresetEditorViewModel(preset, loc);+ Assert.Equal(2, editor.Locations.Count);+ Assert.Equal(ConflictPolicy.Rename, Assert.Single(editor.Conflicts).Value);+ Assert.False(editor.CanChangeTarget); Assert.False(editor.ShowImage); Assert.False(editor.ShowConversionOutput);+ var window = new PresetEditorWindow { DataContext = editor };+ try+ {+ window.Show(); RenderTests.Pump();+ RenderTests.Save(window, $"copy-folder-editor-{language}.png");+ editor.Location = editor.Locations.Single(l => l.Value is null);+ Assert.True(editor.Apply()); Assert.True(preset.Output.AskEveryTime);+ Assert.Equal(PresetKind.CopyToFolder, preset.Kind);+ editor.Location = editor.Locations.Single(l => l.Value == OutputLocation.CustomFolder);+ editor.CustomFolder = "";+ Assert.False(editor.Apply()); Assert.NotNull(editor.DestinationError);+ }+ finally { window.Close(); }+ }++ [AvaloniaTheory]+ [InlineData("en")]+ [InlineData("zh-CN")]+ public void Folder_presets_fan_out_on_the_back_face_and_reject_front_placement(string language)+ {+ TestServices.EnsureInitialized(language);+ var store = AppHost.Get<UserDataStore>();+ var loc = AppHost.Get<ILocalizer>();+ var copies = new[] { Copy("Projects", "C:\\Projects"), Copy("References", "C:\\References"), Copy("Icons", "C:\\Icons") };+ var group = new Preset { Kind = PresetKind.Group, TargetFormat = Preset.GroupTarget, Name = "Folders", SubPresetIds = copies.Select(p => p.Id).ToList() };+ var profile = store.Profiles.Single(p => p.Id == "images");+ var before = profile.BackPresetIds;+ var motion = Motion.Enabled;+ Window? window = null;+ try+ {+ foreach (var p in copies.Append(group)) store.Presets.Add(p);+ profile.BackPresetIds = ["tool-crop", group.Id, "tool-image-edit"];+ var toolbar = new ToolbarPageViewModel(store, loc, AppHost.Get<WindowService>(), AppHost.Get<PresetAvailability>(), AppHost.Get<Filee.Core.Conversion.ConverterCatalog>(), Microsoft.Extensions.Logging.Abstractions.NullLogger<ToolbarPageViewModel>.Instance);+ toolbar.EditingBack = false;+ Assert.False(toolbar.Insert(copies[0].Id, 0));+ Assert.False(toolbar.Insert(group.Id, 0));+ var radial = new RadialViewModel(store, loc, AppHost.Get<PresetAvailability>());+ radial.Load(["picture.png"], clickMode: true, backFace: true);+ var groupIndex = radial.Items.ToList().FindIndex(i => i.Id == group.Id);+ Assert.True(groupIndex >= 0);+ Assert.Equal(3, radial.Items[groupIndex].Children!.Count);+ Assert.All(radial.Items[groupIndex].Children!, child => Assert.True(child.IsEnabled));+ Motion.Set(false);+ var donut = new DonutMenu { Items = radial.Items, ReserveSubRing = true, CenterTitle = "Folders", CenterSubtitle = "Copy to folder", OuterRadius = 160 };+ window = new Window { Width = 560, Height = 560, Content = donut };+ window.Show(); RenderTests.Pump();+ var center = new Point(donut.Bounds.Width / 2, donut.Bounds.Height / 2);+ var at = DonutGeometry.PointAt(center, donut.OuterRadius * 0.7, DonutGeometry.MidAngle(groupIndex, radial.Items.Count));+ donut.SetExternalHit(donut.HitTest(at), at); donut.ExpandPendingGroup();+ RenderTests.Pump();+ Assert.Equal(DonutHitKind.SubSegment, donut.HitTest(donut.SubSliceCenter(groupIndex, 0)).Kind);+ RenderTests.Save(window, $"copy-folder-group-{language}.png");+ }+ finally+ {+ window?.Close(); Motion.Set(motion); profile.BackPresetIds = before;+ foreach (var p in copies.Append(group)) store.Presets.Remove(p);+ }+ }+}+diff --git a/tests/Filee.Core.Tests/FolderCopyTests.cs b/tests/Filee.Core.Tests/FolderCopyTests.csnew file mode 100644index 00000000..e7decb2c--- /dev/null+++ b/tests/Filee.Core.Tests/FolderCopyTests.cs@@ -0,0 +1,143 @@+using Filee.Core.Conversion;+using Filee.Core.Presets;+using Filee.Core.Watching;+using Filee.Core.Web;++namespace Filee.Core.Tests;++public class FolderCopyTests+{+ private static Preset Copy(string folder) => new()+ {+ Kind = PresetKind.CopyToFolder,+ TargetFormat = Preset.CopyTarget,+ Output = new OutputRule { Location = OutputLocation.CustomFolder, CustomFolder = folder }+ };++ private static async Task<ConversionJob> Run(IReadOnlyList<string> sources, Preset preset, ISourceFetcher? fetcher = null)+ {+ await using var queue = new JobQueue(new ConverterCatalog([]));+ var job = new ConversionJob(sources, preset, "Copy", fetcher);+ await queue.RunAsync(job);+ return job;+ }++ [Fact]+ public async Task Local_file_is_copied_byte_for_byte_without_touching_its_original()+ {+ using var source = new TempDir(); using var target = new TempDir();+ var file = source.File("unregistered.extension");+ var bytes = Enumerable.Range(0, 1000).Select(i => (byte)i).ToArray();+ File.WriteAllBytes(file, bytes);+ var stamp = File.GetLastWriteTimeUtc(file);+ var job = await Run([file], Copy(target.Path));+ Assert.Equal(JobState.Completed, job.State);+ Assert.Equal(bytes, File.ReadAllBytes(Assert.Single(job.Outputs)));+ Assert.Equal(bytes, File.ReadAllBytes(file));+ Assert.Equal(stamp, File.GetLastWriteTimeUtc(file));+ }++ [Fact]+ public async Task Browser_download_bytes_are_preserved_and_the_work_copy_is_cleaned_up()+ {+ using var target = new TempDir(); using var work = new TempDir();+ byte[] bytes = [137, 80, 78, 71, 13, 10, 26, 10, 1, 2, 3, 4];+ using var downloader = new WebDownloader(new Response(bytes));+ using var drop = new WebDrop([WebDropItem.FromAddress("picture.png", new Uri("https://example.test/picture.png"))], work.Path);+ var fetcher = drop.CreateFetcher(new WebDropOptions(target.Path, true), downloader);+ var job = await Run(drop.Placeholders, Copy(target.Path), fetcher);+ Assert.Equal(JobState.Completed, job.State);+ Assert.Equal(bytes, File.ReadAllBytes(Assert.Single(job.Outputs)));+ Assert.False(Directory.Exists(drop.WorkFolder));+ Assert.Single(Directory.GetFiles(target.Path));+ }++ private sealed class Response(byte[] bytes) : HttpMessageHandler+ {+ protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken) =>+ Task.FromResult(new HttpResponseMessage(System.Net.HttpStatusCode.OK) { Content = new ByteArrayContent(bytes) });+ }++ [Fact]+ public async Task Clash_is_numbered_even_when_the_preset_or_save_dialog_requests_overwrite()+ {+ using var source = new TempDir(); using var target = new TempDir();+ var file = source.File("a.txt"); File.WriteAllText(file, "new");+ var existing = target.File("a.txt"); File.WriteAllText(existing, "keep");+ var preset = AskedLocation.ForFile(Copy(target.Path), existing);+ preset.Output.Conflict = ConflictPolicy.Overwrite;+ var job = await Run([file], preset);+ Assert.Equal(Path.Combine(target.Path, "a (2).txt"), Assert.Single(job.Outputs));+ Assert.Equal("keep", File.ReadAllText(existing));+ Assert.Equal("new", File.ReadAllText(job.Outputs.Single()));+ }++ [Fact]+ public async Task Missing_destination_fails_with_a_message_and_is_never_created()+ {+ using var source = new TempDir();+ var missing = Path.Combine(source.Path, "unplugged", "target");+ var job = await Run([source.File("a.txt")], Copy(missing));+ Assert.Equal(JobState.Failed, job.State);+ Assert.Contains("destination folder", Assert.Single(job.Files).ErrorDetail);+ Assert.False(Directory.Exists(Path.GetDirectoryName(missing)));+ }++ [Fact]+ public async Task Same_folder_is_a_no_op()+ {+ using var source = new TempDir(); var file = source.File("a.txt");+ var job = await Run([file], Copy(source.Path));+ Assert.Equal(FileState.Skipped, Assert.Single(job.Files).State);+ Assert.Empty(job.Outputs);+ Assert.Equal([file], Directory.GetFiles(source.Path));+ }++ [Fact]+ public async Task Several_files_and_folders_keep_their_names_structure_and_originals()+ {+ using var source = new TempDir(); using var target = new TempDir();+ var folder = Path.Combine(source.Path, "icons.v1");+ Directory.CreateDirectory(Path.Combine(folder, "empty"));+ File.WriteAllText(Path.Combine(folder, "a.svg"), "svg bytes");+ var file = source.File("photo.xyz");+ var job = await Run([folder, file], Copy(target.Path));+ Assert.Equal(JobState.Completed, job.State);+ Assert.Equal(2, job.Outputs.Count());+ Assert.True(Directory.Exists(Path.Combine(target.Path, "icons.v1", "empty")));+ Assert.Equal("svg bytes", File.ReadAllText(Path.Combine(target.Path, "icons.v1", "a.svg")));+ Assert.True(File.Exists(file)); Assert.True(Directory.Exists(folder));+ var again = await Run([folder], Copy(target.Path));+ Assert.Equal(Path.Combine(target.Path, "icons.v1 (2)"), Assert.Single(again.Outputs));+ }++ [Fact]+ public async Task Destination_inside_the_source_folder_fails_without_recursing()+ {+ using var source = new TempDir();+ var child = Path.Combine(source.Path, "child"); Directory.CreateDirectory(child);+ var job = await Run([source.Path], Copy(child));+ Assert.Equal(JobState.Failed, job.State);+ Assert.Contains("itself", Assert.Single(job.Files).ErrorDetail);+ Assert.Empty(Directory.GetFileSystemEntries(child));+ }++ [Fact]+ public async Task Published_files_in_a_watched_folder_are_eligible_but_staging_files_are_not()+ {+ using var source = new TempDir(); using var target = new TempDir();+ var job = await Run([source.File("a.png")], Copy(target.Path));+ var rule = new WatchRule { Folder = target.Path, IncludeSubfolders = true };+ Assert.False(FolderWatcher.ShouldIgnore(Assert.Single(job.Outputs), rule));+ Assert.True(FolderWatcher.ShouldIgnore(Path.Combine(target.Path, ".filee-copy-test.tmp", "a.png"), rule));+ }++ [Fact]+ public async Task Cancelled_copy_leaves_no_partial_output()+ {+ using var source = new TempDir(); using var target = new TempDir();+ using var cancel = new CancellationTokenSource(); cancel.Cancel();+ await Assert.ThrowsAnyAsync<OperationCanceledException>(() => FolderCopy.CopyAsync(source.File("a.txt"), Copy(target.Path).Output, cancel.Token));+ Assert.Empty(Directory.GetFileSystemEntries(target.Path));+ }+}diff --git a/tests/Filee.Core.Tests/FolderWatcherTests.cs b/tests/Filee.Core.Tests/FolderWatcherTests.csindex f0c62e52..f05cb36f 100644--- a/tests/Filee.Core.Tests/FolderWatcherTests.cs+++ b/tests/Filee.Core.Tests/FolderWatcherTests.cs@@ -39,6 +39,22 @@ public class FolderWatcherTestsreturn (watcher, time, jobs, queue);}+ [Fact]+ public async Task An_atomically_published_folder_is_scanned_after_copying()+ {+ using var source = new TempDir(); using var target = new TempDir();+ var folder = Path.Combine(source.Path, "incoming"); Directory.CreateDirectory(folder);+ File.WriteAllText(Path.Combine(folder, "a.jpg"), "bytes");+ var rule = new WatchRule { Folder = target.Path, IncludeSubfolders = true };+ var (watcher, time, jobs, queue) = Create(rule);+ await using var watcherLifetime = watcher; await using var queueLifetime = queue;+ var output = await FolderCopy.CopyAsync(folder, new OutputRule { Location = OutputLocation.CustomFolder, CustomFolder = target.Path }, TestContext.Current.CancellationToken);+ watcher.Notice(output!); time.Advance(3);+ Assert.Equal(1, await watcher.ProcessPendingAsync());+ Assert.Equal(JobState.Completed, Assert.Single(jobs).State);+ Assert.True(File.Exists(Path.Combine(folder, "a.jpg")));+ }+[Fact]public void Default_wait_is_longer_where_files_being_written_are_not_locked() =>Assert.Equal(TimeSpan.FromSeconds(OperatingSystem.IsWindows() ? 2 : 5), FolderWatcher.DefaultSettleTime);