Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Add PDF editing tools to the donut

Perrichenoc6ff54a85478
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.json
index 7ee866f4..83332f2f 100644
--- a/src/Filee.App/Assets/i18n/ar.json
+++ b/src/Filee.App/Assets/i18n/ar.json
@@ -198,6 +198,25 @@
"preset.merge_pdf": "دمج PDF",
"merge.order_title": "اختيار ترتيب الدمج",
"merge.order_hint": "حدّد ملفًا وانقله إلى أعلى أو أسفل. تُدمج الملفات بالترتيب من الأعلى إلى الأسفل. (‎Alt+↑ / Alt+↓‎)",
+ "preset.group_pdf_edit": "تحرير",
+ "preset.pdf_crop": "اقتصاص PDF",
+ "preset.pdf_crop.short": "اقتصاص",
+ "preset.pdf_pages": "ترتيب / حذف الصفحات",
+ "preset.pdf_pages.short": "الصفحات",
+ "preset.pdf_add": "إضافة صفحات",
+ "preset.pdf_add.short": "إضافة",
+ "preset.pdf_extract": "استخراج صفحة",
+ "preset.pdf_extract.short": "استخراج",
+ "preset.split_pdf.short": "استخراج",
+ "pdf_editor.title": "تحرير صفحات PDF",
+ "pdf_editor.hint": "أعد ترتيب الصفحات أو أدرها أو احذفها. أضف صفحات من PDF آخر أو استخرج الصفحة المحددة.",
+ "pdf_editor.add": "إضافة PDF",
+ "pdf_editor.delete": "حذف",
+ "pdf_editor.page": "الصفحة {0}",
+ "pdf_editor.rotation": "تدوير {0}°",
+ "pdf_editor.loading": "جارٍ تحميل الصفحات…",
+ "pdf_editor.saving": "جارٍ حفظ PDF…",
+ "pdf_editor.saved": "تم الحفظ: {0}",
"preset.split_pdf": "تقسيم PDF",
"preset.compress_pdf": "ضغط PDF",
"preset.long_image": "صورة طويلة",
diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.json
index d6024c30..0dcbdefd 100644
--- a/src/Filee.App/Assets/i18n/en.json
+++ b/src/Filee.App/Assets/i18n/en.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "Merge PDF",
"merge.order_title": "Choose merge order",
"merge.order_hint": "Select a file and move it up or down. Files are merged from top to bottom. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "Edit",
+ "preset.pdf_crop": "Crop PDF",
+ "preset.pdf_crop.short": "Crop",
+ "preset.pdf_pages": "Reorder / delete pages",
+ "preset.pdf_pages.short": "Pages",
+ "preset.pdf_add": "Add pages",
+ "preset.pdf_add.short": "Add",
+ "preset.pdf_extract": "Extract page",
+ "preset.pdf_extract.short": "Extract",
+ "preset.split_pdf.short": "Extract",
+ "pdf_editor.title": "Edit PDF pages",
+ "pdf_editor.hint": "Reorder, rotate or delete pages. Add pages from another PDF, or extract the selected page as its own file.",
+ "pdf_editor.add": "Add PDF",
+ "pdf_editor.delete": "Delete",
+ "pdf_editor.page": "Page {0}",
+ "pdf_editor.rotation": "Rotated {0}°",
+ "pdf_editor.loading": "Loading pages…",
+ "pdf_editor.saving": "Saving PDF…",
+ "pdf_editor.saved": "Saved {0}",
"preset.split_pdf": "Split PDF",
"preset.compress_pdf": "Compress PDF",
"preset.long_image": "Long image",
diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.json
index 89007a3e..4f790ae7 100644
--- a/src/Filee.App/Assets/i18n/es.json
+++ b/src/Filee.App/Assets/i18n/es.json
@@ -198,6 +198,25 @@
"preset.merge_pdf": "Combinar PDF",
"merge.order_title": "Elegir el orden de combinación",
"merge.order_hint": "Selecciona un archivo y muévelo arriba o abajo. Los archivos se combinan de arriba abajo. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "Editar",
+ "preset.pdf_crop": "Recortar PDF",
+ "preset.pdf_crop.short": "Recortar",
+ "preset.pdf_pages": "Reordenar / eliminar páginas",
+ "preset.pdf_pages.short": "Páginas",
+ "preset.pdf_add": "Añadir páginas",
+ "preset.pdf_add.short": "Añadir",
+ "preset.pdf_extract": "Extraer página",
+ "preset.pdf_extract.short": "Extraer",
+ "preset.split_pdf.short": "Extraer",
+ "pdf_editor.title": "Editar páginas PDF",
+ "pdf_editor.hint": "Reordena, gira o elimina páginas. Añade páginas de otro PDF o extrae la seleccionada como archivo independiente.",
+ "pdf_editor.add": "Añadir PDF",
+ "pdf_editor.delete": "Eliminar",
+ "pdf_editor.page": "Página {0}",
+ "pdf_editor.rotation": "Girada {0}°",
+ "pdf_editor.loading": "Cargando páginas…",
+ "pdf_editor.saving": "Guardando PDF…",
+ "pdf_editor.saved": "Guardado: {0}",
"preset.split_pdf": "Dividir PDF",
"preset.compress_pdf": "Comprimir PDF",
"preset.long_image": "Imagen larga",
diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.json
index 32197851..a99e378e 100644
--- a/src/Filee.App/Assets/i18n/fr.json
+++ b/src/Filee.App/Assets/i18n/fr.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "Fusionner les PDF",
"merge.order_title": "Choisir l'ordre de fusion",
"merge.order_hint": "Sélectionnez un fichier et déplacez-le vers le haut ou le bas. Les fichiers sont fusionnés de haut en bas. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "Modifier",
+ "preset.pdf_crop": "Rogner le PDF",
+ "preset.pdf_crop.short": "Rogner",
+ "preset.pdf_pages": "Réorganiser / supprimer",
+ "preset.pdf_pages.short": "Pages",
+ "preset.pdf_add": "Ajouter des pages",
+ "preset.pdf_add.short": "Ajouter",
+ "preset.pdf_extract": "Extraire la page",
+ "preset.pdf_extract.short": "Extraire",
+ "preset.split_pdf.short": "Extraire",
+ "pdf_editor.title": "Modifier les pages PDF",
+ "pdf_editor.hint": "Réorganisez, faites pivoter ou supprimez des pages. Ajoutez des pages d’un autre PDF ou extrayez la page sélectionnée.",
+ "pdf_editor.add": "Ajouter un PDF",
+ "pdf_editor.delete": "Supprimer",
+ "pdf_editor.page": "Page {0}",
+ "pdf_editor.rotation": "Rotation {0}°",
+ "pdf_editor.loading": "Chargement des pages…",
+ "pdf_editor.saving": "Enregistrement du PDF…",
+ "pdf_editor.saved": "Enregistré : {0}",
"preset.split_pdf": "Diviser le PDF",
"preset.compress_pdf": "Compresser le PDF",
"preset.long_image": "Image longue",
diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.json
index dde78607..f82d920d 100644
--- a/src/Filee.App/Assets/i18n/hi.json
+++ b/src/Filee.App/Assets/i18n/hi.json
@@ -198,6 +198,25 @@
"preset.merge_pdf": "PDF मर्ज करें",
"merge.order_title": "मर्ज करने का क्रम चुनें",
"merge.order_hint": "फ़ाइल चुनकर उसे ऊपर या नीचे ले जाएँ। फ़ाइलें ऊपर से नीचे के क्रम में मर्ज होंगी। (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "संपादित करें",
+ "preset.pdf_crop": "PDF क्रॉप करें",
+ "preset.pdf_crop.short": "क्रॉप",
+ "preset.pdf_pages": "पुनः क्रम / पृष्ठ हटाएँ",
+ "preset.pdf_pages.short": "पृष्ठ",
+ "preset.pdf_add": "पृष्ठ जोड़ें",
+ "preset.pdf_add.short": "जोड़ें",
+ "preset.pdf_extract": "पृष्ठ निकालें",
+ "preset.pdf_extract.short": "निकालें",
+ "preset.split_pdf.short": "निकालें",
+ "pdf_editor.title": "PDF पृष्ठ संपादित करें",
+ "pdf_editor.hint": "पृष्ठों का क्रम बदलें, घुमाएँ या हटाएँ। दूसरे PDF से पृष्ठ जोड़ें या चुना हुआ पृष्ठ निकालें।",
+ "pdf_editor.add": "PDF जोड़ें",
+ "pdf_editor.delete": "हटाएँ",
+ "pdf_editor.page": "पृष्ठ {0}",
+ "pdf_editor.rotation": "{0}° घुमाया",
+ "pdf_editor.loading": "पृष्ठ लोड हो रहे हैं…",
+ "pdf_editor.saving": "PDF सहेजा जा रहा है…",
+ "pdf_editor.saved": "सहेजा गया: {0}",
"preset.split_pdf": "PDF बाँटें",
"preset.compress_pdf": "PDF कंप्रेस करें",
"preset.long_image": "लंबी इमेज",
diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.json
index afc5f5d3..c9787978 100644
--- a/src/Filee.App/Assets/i18n/ja.json
+++ b/src/Filee.App/Assets/i18n/ja.json
@@ -198,6 +198,25 @@
"preset.merge_pdf": "結合",
"merge.order_title": "結合順序を選択",
"merge.order_hint": "ファイルを選択して上下に移動します。上から順に結合されます。(Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "編集",
+ "preset.pdf_crop": "PDF をトリミング",
+ "preset.pdf_crop.short": "トリミング",
+ "preset.pdf_pages": "並べ替え / 削除",
+ "preset.pdf_pages.short": "ページ",
+ "preset.pdf_add": "ページを追加",
+ "preset.pdf_add.short": "追加",
+ "preset.pdf_extract": "ページを抽出",
+ "preset.pdf_extract.short": "抽出",
+ "preset.split_pdf.short": "抽出",
+ "pdf_editor.title": "PDF ページを編集",
+ "pdf_editor.hint": "ページの並べ替え、回転、削除ができます。別の PDF から追加するか、選択したページを抽出できます。",
+ "pdf_editor.add": "PDF を追加",
+ "pdf_editor.delete": "削除",
+ "pdf_editor.page": "{0} ページ",
+ "pdf_editor.rotation": "{0}° 回転",
+ "pdf_editor.loading": "ページを読み込み中…",
+ "pdf_editor.saving": "PDF を保存中…",
+ "pdf_editor.saved": "保存しました: {0}",
"preset.split_pdf": "分割",
"preset.compress_pdf": "圧縮",
"preset.long_image": "縦連結",
diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.json
index 115bfc7e..4753c693 100644
--- a/src/Filee.App/Assets/i18n/ko.json
+++ b/src/Filee.App/Assets/i18n/ko.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "PDF 병합",
"merge.order_title": "병합 순서 선택",
"merge.order_hint": "파일을 골라 위아래로 옮기세요. 위에서부터 순서대로 병합돼요. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "편집",
+ "preset.pdf_crop": "PDF 자르기",
+ "preset.pdf_crop.short": "자르기",
+ "preset.pdf_pages": "페이지 순서 / 삭제",
+ "preset.pdf_pages.short": "페이지",
+ "preset.pdf_add": "페이지 추가",
+ "preset.pdf_add.short": "추가",
+ "preset.pdf_extract": "페이지 추출",
+ "preset.pdf_extract.short": "추출",
+ "preset.split_pdf.short": "추출",
+ "pdf_editor.title": "PDF 페이지 편집",
+ "pdf_editor.hint": "페이지 순서를 바꾸거나 회전·삭제하세요. 다른 PDF에서 페이지를 추가하거나 선택한 페이지를 추출할 수 있습니다.",
+ "pdf_editor.add": "PDF 추가",
+ "pdf_editor.delete": "삭제",
+ "pdf_editor.page": "{0}페이지",
+ "pdf_editor.rotation": "{0}° 회전",
+ "pdf_editor.loading": "페이지 불러오는 중…",
+ "pdf_editor.saving": "PDF 저장 중…",
+ "pdf_editor.saved": "저장됨: {0}",
"preset.split_pdf": "PDF 분할",
"preset.compress_pdf": "PDF 압축",
"preset.long_image": "긴 이미지",
diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.json
index 2e2da36b..31d4bd6f 100644
--- a/src/Filee.App/Assets/i18n/pl.json
+++ b/src/Filee.App/Assets/i18n/pl.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "Połącz PDF",
"merge.order_title": "Wybierz kolejność scalania",
"merge.order_hint": "Wybierz plik i przesuń go w górę lub w dół. Pliki są scalane od góry do dołu. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "Edytuj",
+ "preset.pdf_crop": "Przytnij PDF",
+ "preset.pdf_crop.short": "Przytnij",
+ "preset.pdf_pages": "Zmień kolejność / usuń",
+ "preset.pdf_pages.short": "Strony",
+ "preset.pdf_add": "Dodaj strony",
+ "preset.pdf_add.short": "Dodaj",
+ "preset.pdf_extract": "Wyodrębnij stronę",
+ "preset.pdf_extract.short": "Wyodrębnij",
+ "preset.split_pdf.short": "Wyodrębnij",
+ "pdf_editor.title": "Edytuj strony PDF",
+ "pdf_editor.hint": "Zmieniaj kolejność, obracaj lub usuwaj strony. Dodaj strony z innego PDF albo wyodrębnij wybraną stronę.",
+ "pdf_editor.add": "Dodaj PDF",
+ "pdf_editor.delete": "Usuń",
+ "pdf_editor.page": "Strona {0}",
+ "pdf_editor.rotation": "Obrót {0}°",
+ "pdf_editor.loading": "Wczytywanie stron…",
+ "pdf_editor.saving": "Zapisywanie PDF…",
+ "pdf_editor.saved": "Zapisano: {0}",
"preset.split_pdf": "Podziel PDF",
"preset.compress_pdf": "Kompresuj PDF",
"preset.long_image": "Długi obraz",
diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.json
index 0b7cd7cd..577b6eda 100644
--- a/src/Filee.App/Assets/i18n/pt-BR.json
+++ b/src/Filee.App/Assets/i18n/pt-BR.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "Mesclar PDF",
"merge.order_title": "Escolha a ordem da mesclagem",
"merge.order_hint": "Selecione um arquivo e mova para cima ou para baixo. Os arquivos são mesclados de cima para baixo. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "Editar",
+ "preset.pdf_crop": "Recortar PDF",
+ "preset.pdf_crop.short": "Recortar",
+ "preset.pdf_pages": "Reordenar / excluir páginas",
+ "preset.pdf_pages.short": "Páginas",
+ "preset.pdf_add": "Adicionar páginas",
+ "preset.pdf_add.short": "Adicionar",
+ "preset.pdf_extract": "Extrair página",
+ "preset.pdf_extract.short": "Extrair",
+ "preset.split_pdf.short": "Extrair",
+ "pdf_editor.title": "Editar páginas do PDF",
+ "pdf_editor.hint": "Reordene, gire ou exclua páginas. Adicione páginas de outro PDF ou extraia a página selecionada.",
+ "pdf_editor.add": "Adicionar PDF",
+ "pdf_editor.delete": "Excluir",
+ "pdf_editor.page": "Página {0}",
+ "pdf_editor.rotation": "Girada {0}°",
+ "pdf_editor.loading": "Carregando páginas…",
+ "pdf_editor.saving": "Salvando PDF…",
+ "pdf_editor.saved": "Salvo: {0}",
"preset.split_pdf": "Dividir PDF",
"preset.compress_pdf": "Comprimir PDF",
"preset.long_image": "Imagem longa",
diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.json
index 3eb526c7..0d2581dd 100644
--- a/src/Filee.App/Assets/i18n/ru.json
+++ b/src/Filee.App/Assets/i18n/ru.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "Объединить PDF",
"merge.order_title": "Выберите порядок объединения",
"merge.order_hint": "Выберите файл и переместите его вверх или вниз. Файлы объединяются сверху вниз. (Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "Изменить",
+ "preset.pdf_crop": "Обрезать PDF",
+ "preset.pdf_crop.short": "Обрезать",
+ "preset.pdf_pages": "Порядок / удаление",
+ "preset.pdf_pages.short": "Страницы",
+ "preset.pdf_add": "Добавить страницы",
+ "preset.pdf_add.short": "Добавить",
+ "preset.pdf_extract": "Извлечь страницу",
+ "preset.pdf_extract.short": "Извлечь",
+ "preset.split_pdf.short": "Извлечь",
+ "pdf_editor.title": "Изменение страниц PDF",
+ "pdf_editor.hint": "Меняйте порядок, поворачивайте и удаляйте страницы. Добавляйте их из другого PDF или извлекайте выбранную страницу.",
+ "pdf_editor.add": "Добавить PDF",
+ "pdf_editor.delete": "Удалить",
+ "pdf_editor.page": "Страница {0}",
+ "pdf_editor.rotation": "Поворот {0}°",
+ "pdf_editor.loading": "Загрузка страниц…",
+ "pdf_editor.saving": "Сохранение PDF…",
+ "pdf_editor.saved": "Сохранено: {0}",
"preset.split_pdf": "Разделить PDF",
"preset.compress_pdf": "Сжать PDF",
"preset.long_image": "Длинная картинка",
diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.json
index 6247a2b0..a00764d1 100644
--- a/src/Filee.App/Assets/i18n/zh-CN.json
+++ b/src/Filee.App/Assets/i18n/zh-CN.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "合并 PDF",
"merge.order_title": "选择合并顺序",
"merge.order_hint": "选择文件并上下移动。文件将按从上到下的顺序合并。(Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "编辑",
+ "preset.pdf_crop": "裁剪 PDF",
+ "preset.pdf_crop.short": "裁剪",
+ "preset.pdf_pages": "排序 / 删除页面",
+ "preset.pdf_pages.short": "页面",
+ "preset.pdf_add": "添加页面",
+ "preset.pdf_add.short": "添加",
+ "preset.pdf_extract": "提取页面",
+ "preset.pdf_extract.short": "提取",
+ "preset.split_pdf.short": "提取",
+ "pdf_editor.title": "编辑 PDF 页面",
+ "pdf_editor.hint": "可重新排序、旋转或删除页面,也可从其他 PDF 添加页面或提取所选页面。",
+ "pdf_editor.add": "添加 PDF",
+ "pdf_editor.delete": "删除",
+ "pdf_editor.page": "第 {0} 页",
+ "pdf_editor.rotation": "已旋转 {0}°",
+ "pdf_editor.loading": "正在加载页面…",
+ "pdf_editor.saving": "正在保存 PDF…",
+ "pdf_editor.saved": "已保存:{0}",
"preset.split_pdf": "拆分 PDF",
"preset.compress_pdf": "压缩 PDF",
"preset.long_image": "长图",
diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.json
index d1a197a1..82392e53 100644
--- a/src/Filee.App/Assets/i18n/zh-TW.json
+++ b/src/Filee.App/Assets/i18n/zh-TW.json
@@ -208,6 +208,25 @@
"preset.merge_pdf": "合併 PDF",
"merge.order_title": "選擇合併順序",
"merge.order_hint": "選擇檔案並上下移動。檔案將按從上到下的順序合併。(Alt+↑ / Alt+↓)",
+ "preset.group_pdf_edit": "編輯",
+ "preset.pdf_crop": "裁剪 PDF",
+ "preset.pdf_crop.short": "裁剪",
+ "preset.pdf_pages": "排序 / 刪除頁面",
+ "preset.pdf_pages.short": "頁面",
+ "preset.pdf_add": "新增頁面",
+ "preset.pdf_add.short": "新增",
+ "preset.pdf_extract": "擷取頁面",
+ "preset.pdf_extract.short": "擷取",
+ "preset.split_pdf.short": "擷取",
+ "pdf_editor.title": "編輯 PDF 頁面",
+ "pdf_editor.hint": "可重新排序、旋轉或刪除頁面,也可從其他 PDF 新增頁面或擷取所選頁面。",
+ "pdf_editor.add": "新增 PDF",
+ "pdf_editor.delete": "刪除",
+ "pdf_editor.page": "第 {0} 頁",
+ "pdf_editor.rotation": "已旋轉 {0}°",
+ "pdf_editor.loading": "正在載入頁面…",
+ "pdf_editor.saving": "正在儲存 PDF…",
+ "pdf_editor.saved": "已儲存:{0}",
"preset.split_pdf": "拆分 PDF",
"preset.compress_pdf": "壓縮 PDF",
"preset.long_image": "長圖",
diff --git a/src/Filee.App/Services/CropService.cs b/src/Filee.App/Services/CropService.cs
index e3a72ce1..a09994de 100644
--- a/src/Filee.App/Services/CropService.cs
+++ b/src/Filee.App/Services/CropService.cs
@@ -6,6 +6,7 @@ using Filee.Core.Localization;
using Filee.Core.Presets;
using Filee.Core.Settings;
using Filee.Engines.Magick;
+using Filee.Engines.Pdf;
using ImageMagick;
using Microsoft.Extensions.Logging;
@@ -33,6 +34,8 @@ public static class CropService
private static void EnsureNotAnimated(string inputPath)
{
+ if (inputPath.EndsWith(".pdf", StringComparison.OrdinalIgnoreCase))
+ return;
if (inputPath.EndsWith(".png", StringComparison.OrdinalIgnoreCase) && Apng.IsAnimated(inputPath))
throw new NotSupportedException("Animated PNG files cannot be cropped interactively.");
@@ -53,6 +56,12 @@ public static class CropService
{
return await Task.Run(() =>
{
+ if (inputPath.EndsWith(".pdf", StringComparison.OrdinalIgnoreCase))
+ {
+ var preview = PdfPageTools.Preview(inputPath);
+ using var previewStream = new MemoryStream(preview.Png);
+ return (new Bitmap(previewStream), preview.Width, preview.Height);
+ }
EnsureNotAnimated(inputPath);
var readSettings = CreateReadSettings(inputPath);
@@ -90,7 +99,9 @@ public static class CropService
Preset preset,
UserDataStore store,
ILocalizer loc,
- ILogger? log = null)
+ ILogger? log = null,
+ int? originalWidth = null,
+ int? originalHeight = null)
{
return await Task.Run(() =>
{
@@ -112,6 +123,19 @@ public static class CropService
if (!string.IsNullOrEmpty(outDir))
Directory.CreateDirectory(outDir);
+ if (ext.Equals("pdf", StringComparison.OrdinalIgnoreCase))
+ {
+ var fullWidth = Math.Max(1, originalWidth ?? x + width);
+ var fullHeight = Math.Max(1, originalHeight ?? y + height);
+ PdfPageTools.CropAll(inputPath, outputPath,
+ (double)x / fullWidth,
+ (double)y / fullHeight,
+ (double)width / fullWidth,
+ (double)height / fullHeight);
+ PreserveDates(inputPath, outputPath, appliedPreset, store, log);
+ return new CropResult(CropStatus.Success, outputPath, null, null);
+ }
+
var readSettings = CreateReadSettings(inputPath);
using var image = readSettings.Format != MagickFormat.Unknown
? new MagickImage(inputPath, readSettings)
@@ -136,18 +160,7 @@ public static class CropService
image.Write(outputPath);
- if (appliedPreset.Output.KeepDates || store.Settings.KeepFileDates)
- {
- try
- {
- File.SetCreationTimeUtc(outputPath, File.GetCreationTimeUtc(inputPath));
- File.SetLastWriteTimeUtc(outputPath, File.GetLastWriteTimeUtc(inputPath));
- }
- catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
- {
- log?.LogDebug(ex, "Could not preserve file timestamps for {Path}", outputPath);
- }
- }
+ PreserveDates(inputPath, outputPath, appliedPreset, store, log);
return new CropResult(CropStatus.Success, outputPath, null, null);
}
@@ -163,4 +176,19 @@ public static class CropService
}
});
}
+
+ private static void PreserveDates(string inputPath, string outputPath, Preset preset, UserDataStore store, ILogger? log)
+ {
+ if (!preset.Output.KeepDates && !store.Settings.KeepFileDates)
+ return;
+ try
+ {
+ File.SetCreationTimeUtc(outputPath, File.GetCreationTimeUtc(inputPath));
+ File.SetLastWriteTimeUtc(outputPath, File.GetLastWriteTimeUtc(inputPath));
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ log?.LogDebug(ex, "Could not preserve file timestamps for {Path}", outputPath);
+ }
+ }
}
diff --git a/src/Filee.App/Services/PresetAvailability.cs b/src/Filee.App/Services/PresetAvailability.cs
index 55ee80f6..64354422 100644
--- a/src/Filee.App/Services/PresetAvailability.cs
+++ b/src/Filee.App/Services/PresetAvailability.cs
@@ -90,6 +90,10 @@ public sealed class PresetAvailability
{
if (preset.IsTool)
{
+ if (preset.Id.StartsWith("tool-pdf-", StringComparison.Ordinal))
+ return formats.Count > 0 && formats.All(f => f.Id == "pdf")
+ ? new(PresetUse.Usable, null)
+ : new(PresetUse.Unusable, _loc["error.unsupported_source"]);
if (formats.Count > 0 && formats.All(f => WritableSingleFrameRasterFormats.Contains(f.Id)))
return new(PresetUse.Usable, null);
return new(PresetUse.Unusable, _loc["error.unsupported_source"]);
diff --git a/src/Filee.App/Services/RadialController.cs b/src/Filee.App/Services/RadialController.cs
index 16e0bdd8..d4231b20 100644
--- a/src/Filee.App/Services/RadialController.cs
+++ b/src/Filee.App/Services/RadialController.cs
@@ -321,7 +321,7 @@ public sealed class RadialController(
var near = _window?.Position;
Close(animate: false);
if (web is null)
- windows.ShowCropOverlay(sources, preset, near);
+ ShowTool(sources, preset, near);
else
_ = ShowToolForBrowserFilesAsync(web, preset, near);
return;
@@ -373,7 +373,23 @@ public sealed class RadialController(
var files = await conversions.SaveBrowserFilesAsync(web, (placeholder, ex) =>
log.LogWarning(ex, "Saving {File} from a browser for {Preset} failed", Path.GetFileName(placeholder), preset.Id));
if (files.Count > 0)
- windows.ShowCropOverlay(files, preset, near);
+ ShowTool(files, preset, near);
+ }
+
+ private void ShowTool(IReadOnlyList<string> files, Preset preset, PixelPoint? near)
+ {
+ switch (preset.Id)
+ {
+ case "tool-pdf-pages":
+ windows.ShowPdfPageEditor(files, preset);
+ break;
+ case "tool-pdf-add":
+ windows.ShowPdfPageEditor(files, preset, addPages: true);
+ break;
+ default:
+ windows.ShowCropOverlay(files, preset, near);
+ break;
+ }
}
/// <summary>
diff --git a/src/Filee.App/Services/WindowService.cs b/src/Filee.App/Services/WindowService.cs
index ac4347e7..ace7d858 100644
--- a/src/Filee.App/Services/WindowService.cs
+++ b/src/Filee.App/Services/WindowService.cs
@@ -31,8 +31,10 @@ public sealed class WindowService(ILocalizer loc, IServiceProvider services, Mem
private CropOverlayWindow? _cropOverlay;
private MergeOrderWindow? _mergeOrder;
+ private PdfPageEditorWindow? _pdfPageEditor;
internal MergeOrderWindow? MergeOrder => _mergeOrder;
+ internal PdfPageEditorWindow? PdfPageEditor => _pdfPageEditor;
/// <summary>Reviews the order of a PDF merge. Closing or cancelling starts no conversion.</summary>
public async Task<IReadOnlyList<string>?> ChooseMergeOrderAsync(IReadOnlyList<string> files)
@@ -75,6 +77,28 @@ public sealed class WindowService(ILocalizer loc, IServiceProvider services, Mem
win.Activate();
}
+ /// <summary>Opens the lossless PDF page organiser. The Add-pages action starts with its file picker open.</summary>
+ public void ShowPdfPageEditor(IReadOnlyList<string> files, Preset preset, bool addPages = false)
+ {
+ if (files.Count == 0)
+ return;
+ _pdfPageEditor?.Close();
+ var store = services.GetRequiredService<UserDataStore>();
+ var log = services.GetService<ILogger<PdfPageEditorViewModel>>();
+ var vm = new PdfPageEditorViewModel(files, preset, loc, store, log);
+ var win = new PdfPageEditorWindow { DataContext = vm };
+ win.Closed += (_, _) =>
+ {
+ if (_pdfPageEditor == win)
+ _pdfPageEditor = null;
+ };
+ if (addPages)
+ win.Opened += async (_, _) => await win.PickAndAddAsync();
+ _pdfPageEditor = win;
+ win.Show();
+ win.Activate();
+ }
+
/// <summary>
/// Shows (or brings to front) the main window, optionally on a page. Going to the tray closes it
/// (<see cref="MainWindow.HideToTray"/>): a new one opens where and on the page the last one was.
diff --git a/src/Filee.App/ViewModels/CropOverlayViewModel.cs b/src/Filee.App/ViewModels/CropOverlayViewModel.cs
index 54e33a09..cd2f8d7e 100644
--- a/src/Filee.App/ViewModels/CropOverlayViewModel.cs
+++ b/src/Filee.App/ViewModels/CropOverlayViewModel.cs
@@ -245,7 +245,8 @@ public sealed partial class CropOverlayViewModel : ObservableObject, IDisposable
try
{
- var result = await CropService.CropFileAsync(path, x, y, w, h, _preset, _store, _loc, _log);
+ var result = await CropService.CropFileAsync(path, x, y, w, h, _preset, _store, _loc, _log,
+ OriginalWidth, OriginalHeight);
if (result.Status == CropStatus.Success && result.OutputPath is not null)
{
_outputs.Add(result.OutputPath);
diff --git a/src/Filee.App/ViewModels/GroupEditorViewModel.cs b/src/Filee.App/ViewModels/GroupEditorViewModel.cs
index d570c2a5..aceaa3fc 100644
--- a/src/Filee.App/ViewModels/GroupEditorViewModel.cs
+++ b/src/Filee.App/ViewModels/GroupEditorViewModel.cs
@@ -30,7 +30,7 @@ public sealed partial class GroupEditorViewModel : ObservableObject
_name = loc.DisplayName(group);
foreach (var id in group.SubPresetIds)
{
- if (store.FindPreset(id) is { IsGroup: false, IsTool: false } preset)
+ if (store.FindPreset(id) is { IsGroup: false } preset)
Members.Add(MemberOf(preset));
}
Members.CollectionChanged += (_, _) => Refresh();
@@ -48,7 +48,7 @@ public sealed partial class GroupEditorViewModel : ObservableObject
/// <summary>The presets the group fans out, in order.</summary>
public ObservableCollection<GroupMember> Members { get; } = [];
- /// <summary>Conversions that can still be added (not groups, not already in it).</summary>
+ /// <summary>Actions that can still be added (not groups, not already in it).</summary>
public ObservableCollection<Choice<string>> Available { get; } = [];
[ObservableProperty]
@@ -140,7 +140,7 @@ public sealed partial class GroupEditorViewModel : ObservableObject
{
var taken = Members.Select(m => m.PresetId).ToHashSet();
Available.Clear();
- foreach (var preset in _store.Presets.Where(p => !p.IsGroup && !p.IsTool && !taken.Contains(p.Id)))
+ foreach (var preset in _store.Presets.Where(p => !p.IsGroup && !taken.Contains(p.Id)))
Available.Add(new Choice<string>(preset.Id, _loc.DisplayName(preset), CaptionOf(preset)));
OnPropertyChanged(nameof(IsFull));
OnPropertyChanged(nameof(IsEmpty));
diff --git a/src/Filee.App/ViewModels/PdfPageEditorViewModel.cs b/src/Filee.App/ViewModels/PdfPageEditorViewModel.cs
new file mode 100644
index 00000000..d0369e2f
--- /dev/null
+++ b/src/Filee.App/ViewModels/PdfPageEditorViewModel.cs
@@ -0,0 +1,277 @@
+// Lightweight PDF page organiser opened from the PDF donut's Edit group. Pages stay as PDF objects: saving copies
+// them in the chosen order and only changes /Rotate where requested.
+
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Filee.App.Services;
+using Filee.Core.Conversion;
+using Filee.Core.History;
+using Filee.Core.Localization;
+using Filee.Core.Platform;
+using Filee.Core.Presets;
+using Filee.Core.Settings;
+using Filee.Engines.Pdf;
+using Microsoft.Extensions.Logging;
+
+namespace Filee.App.ViewModels;
+
+public sealed partial class PdfPageItem(string path, int pageIndex, ILocalizer loc) : ObservableObject
+{
+ public string Path { get; } = path;
+ public int PageIndex { get; } = pageIndex;
+ public int PageNumber => PageIndex + 1;
+ public string PageText => loc.Format("pdf_editor.page", PageIndex + 1);
+ public string SourceName => System.IO.Path.GetFileName(Path);
+
+ [ObservableProperty]
+ [NotifyPropertyChangedFor(nameof(RotationText))]
+ private int _rotation;
+
+ public string RotationText
+ {
+ get
+ {
+ var signed = Rotation > 180 ? Rotation - 360 : Rotation;
+ return signed == 0 ? "" : loc.Format("pdf_editor.rotation", signed);
+ }
+ }
+ public PdfPageReference Reference => new(Path, PageIndex, Rotation);
+}
+
+public sealed partial class PdfPageEditorViewModel : ObservableObject
+{
+ private readonly Preset _preset;
+ private readonly ILocalizer _loc;
+ private readonly UserDataStore _store;
+ private readonly ILogger? _log;
+ private readonly string _primarySource;
+
+ public PdfPageEditorViewModel(IReadOnlyList<string> files, Preset preset, ILocalizer loc, UserDataStore store,
+ ILogger? log = null)
+ {
+ _preset = preset;
+ _loc = loc;
+ _store = store;
+ _log = log;
+ _primarySource = files.First();
+ AddFiles(files);
+ SelectedPage = Pages.FirstOrDefault();
+ }
+
+ public ObservableCollection<PdfPageItem> Pages { get; } = [];
+
+ [ObservableProperty]
+ [NotifyCanExecuteChangedFor(nameof(MoveUpCommand))]
+ [NotifyCanExecuteChangedFor(nameof(MoveDownCommand))]
+ [NotifyCanExecuteChangedFor(nameof(DeleteCommand))]
+ [NotifyCanExecuteChangedFor(nameof(RotateLeftCommand))]
+ [NotifyCanExecuteChangedFor(nameof(RotateRightCommand))]
+ private PdfPageItem? _selectedPage;
+
+ [ObservableProperty]
+ [NotifyPropertyChangedFor(nameof(CanSave))]
+ [NotifyCanExecuteChangedFor(nameof(MoveUpCommand))]
+ [NotifyCanExecuteChangedFor(nameof(MoveDownCommand))]
+ [NotifyCanExecuteChangedFor(nameof(DeleteCommand))]
+ [NotifyCanExecuteChangedFor(nameof(RotateLeftCommand))]
+ [NotifyCanExecuteChangedFor(nameof(RotateRightCommand))]
+ private bool _isBusy;
+
+ [ObservableProperty]
+ [NotifyPropertyChangedFor(nameof(HasStatus))]
+ private string _status = "";
+
+ public bool HasStatus => !string.IsNullOrWhiteSpace(Status);
+ public bool CanSave => !IsBusy && Pages.Count > 0;
+
+ public async Task AddFilesAsync(IReadOnlyList<string> paths)
+ {
+ if (paths.Count == 0 || IsBusy)
+ return;
+ IsBusy = true;
+ Status = _loc["pdf_editor.loading"];
+ try
+ {
+ var counts = await Task.Run(() => paths.Select(path =>
+ {
+ try { return (Path: path, Count: PdfPageTools.PageCount(path), Error: (Exception?)null); }
+ catch (Exception ex) when (ex is not OutOfMemoryException) { return (Path: path, Count: 0, Error: ex); }
+ }).ToList());
+ var failed = false;
+ foreach (var (path, count, error) in counts)
+ {
+ if (error is not null)
+ {
+ failed = true;
+ _log?.LogError(error, "Could not add {Path} to the PDF editor", path);
+ continue;
+ }
+ for (var page = 0; page < count; page++)
+ Pages.Add(new PdfPageItem(path, page, _loc));
+ }
+ SelectedPage ??= Pages.FirstOrDefault();
+ Status = failed ? _loc["error.conversion_failed"] : "";
+ NotifyCollectionChanged();
+ }
+ catch (Exception ex) when (ex is not OutOfMemoryException)
+ {
+ _log?.LogError(ex, "Could not add pages to the PDF editor");
+ Status = _loc["error.conversion_failed"];
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ private void AddFiles(IEnumerable<string> paths)
+ {
+ foreach (var path in paths)
+ {
+ try
+ {
+ for (var page = 0; page < PdfPageTools.PageCount(path); page++)
+ Pages.Add(new PdfPageItem(path, page, _loc));
+ }
+ catch (Exception ex) when (ex is not OutOfMemoryException)
+ {
+ _log?.LogError(ex, "Could not open {Path} in the PDF editor", path);
+ Status = _loc["error.conversion_failed"];
+ }
+ }
+ NotifyCollectionChanged();
+ }
+
+ private bool CanMoveUp() => !IsBusy && SelectedPage is not null && Pages.IndexOf(SelectedPage) > 0;
+ private bool CanMoveDown() => !IsBusy && SelectedPage is not null && Pages.IndexOf(SelectedPage) is >= 0 and var index && index < Pages.Count - 1;
+ private bool CanChangePage() => !IsBusy && SelectedPage is not null;
+ private bool CanDelete() => CanChangePage() && Pages.Count > 1;
+
+ [RelayCommand(CanExecute = nameof(CanMoveUp))]
+ private void MoveUp() => Move(-1);
+
+ [RelayCommand(CanExecute = nameof(CanMoveDown))]
+ private void MoveDown() => Move(1);
+
+ private void Move(int direction)
+ {
+ if (SelectedPage is not { } selected)
+ return;
+ var index = Pages.IndexOf(selected);
+ var target = index + direction;
+ if (index < 0 || target < 0 || target >= Pages.Count)
+ return;
+ Pages.Move(index, target);
+ SelectedPage = selected;
+ NotifyCollectionChanged();
+ }
+
+ [RelayCommand(CanExecute = nameof(CanDelete))]
+ private void Delete()
+ {
+ if (SelectedPage is not { } selected || Pages.Count <= 1)
+ return;
+ var index = Pages.IndexOf(selected);
+ Pages.RemoveAt(index);
+ SelectedPage = Pages[Math.Min(index, Pages.Count - 1)];
+ NotifyCollectionChanged();
+ }
+
+ [RelayCommand(CanExecute = nameof(CanChangePage))]
+ private void RotateLeft() => Rotate(-90);
+
+ [RelayCommand(CanExecute = nameof(CanChangePage))]
+ private void RotateRight() => Rotate(90);
+
+ private void Rotate(int degrees)
+ {
+ if (SelectedPage is not { } selected)
+ return;
+ selected.Rotation = ((selected.Rotation + degrees) % 360 + 360) % 360;
+ }
+
+ public Task<bool> SaveAsync() => WriteAsync(Pages, _preset, closeWhenDone: true);
+
+ public Task<bool> ExtractSelectedAsync()
+ {
+ if (SelectedPage is not { } selected)
+ return Task.FromResult(false);
+ var extract = _preset.Clone();
+ extract.Id = "pdf-extract-page";
+ extract.NameKey = "preset.pdf_extract";
+ extract.Output.FileNamePattern = "{name}_extracted";
+ return WriteAsync([selected], extract, closeWhenDone: false);
+ }
+
+ private async Task<bool> WriteAsync(IEnumerable<PdfPageItem> items, Preset preset, bool closeWhenDone)
+ {
+ if (IsBusy)
+ return false;
+ var pages = items.Select(item => item.Reference).ToList();
+ if (pages.Count == 0)
+ return false;
+ var applied = _store.Settings.WithDefaultOutput(preset);
+ var tokens = new OutputPathResolver.Tokens(_primarySource, _loc.DisplayName(applied), 1, DateTime.Now);
+ var output = OutputPathResolver.Resolve(applied.Output, tokens, "pdf", File.Exists);
+ if (output is null)
+ {
+ Status = _loc["toast.skipped"];
+ return false;
+ }
+
+ IsBusy = true;
+ Status = _loc["pdf_editor.saving"];
+ try
+ {
+ var folder = System.IO.Path.GetDirectoryName(output);
+ if (!string.IsNullOrEmpty(folder))
+ Directory.CreateDirectory(folder);
+ await Task.Run(() => PdfPageTools.Save(pages, output));
+ PreserveDates(output, applied);
+ _store.AddHistory(new HistoryEntry
+ {
+ JobId = Guid.NewGuid().ToString("N")[..10], FinishedAt = DateTime.Now, PresetId = preset.Id,
+ PresetName = _loc.DisplayName(preset), State = JobState.Completed,
+ Sources = pages.Select(p => p.Path).Distinct(FileSystemPaths.Comparer).ToList(), Outputs = [output],
+ });
+ Status = _loc.Format("pdf_editor.saved", System.IO.Path.GetFileName(output));
+ return closeWhenDone;
+ }
+ catch (Exception ex) when (ex is not OutOfMemoryException)
+ {
+ _log?.LogError(ex, "Could not save edited PDF");
+ Status = _loc["error.conversion_failed"];
+ return false;
+ }
+ finally
+ {
+ IsBusy = false;
+ }
+ }
+
+ private void PreserveDates(string output, Preset preset)
+ {
+ if (!preset.Output.KeepDates && !_store.Settings.KeepFileDates)
+ return;
+ try
+ {
+ File.SetCreationTimeUtc(output, File.GetCreationTimeUtc(_primarySource));
+ File.SetLastWriteTimeUtc(output, File.GetLastWriteTimeUtc(_primarySource));
+ }
+ catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+ {
+ _log?.LogDebug(ex, "Could not preserve file timestamps for {Path}", output);
+ }
+ }
+
+ private void NotifyCollectionChanged()
+ {
+ OnPropertyChanged(nameof(CanSave));
+ MoveUpCommand.NotifyCanExecuteChanged();
+ MoveDownCommand.NotifyCanExecuteChanged();
+ DeleteCommand.NotifyCanExecuteChanged();
+ RotateLeftCommand.NotifyCanExecuteChanged();
+ RotateRightCommand.NotifyCanExecuteChanged();
+ }
+}
diff --git a/src/Filee.App/Views/PdfPageEditorWindow.axaml b/src/Filee.App/Views/PdfPageEditorWindow.axaml
new file mode 100644
index 00000000..0bdac5fa
--- /dev/null
+++ b/src/Filee.App/Views/PdfPageEditorWindow.axaml
@@ -0,0 +1,84 @@
+<!-- Lossless PDF page organiser opened by Edit → Pages / Add pages on the donut. -->
+<Window xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:vm="using:Filee.App.ViewModels"
+ x:Class="Filee.App.Views.PdfPageEditorWindow"
+ x:DataType="vm:PdfPageEditorViewModel"
+ Title="{DynamicResource pdf_editor.title}"
+ Icon="avares://Filee/Assets/Icons/filee.ico"
+ Width="620" Height="560" MinWidth="480" MinHeight="360"
+ WindowStartupLocation="CenterScreen">
+ <Window.KeyBindings>
+ <KeyBinding Gesture="Alt+Up" Command="{Binding MoveUpCommand}" />
+ <KeyBinding Gesture="Alt+Down" Command="{Binding MoveDownCommand}" />
+ <KeyBinding Gesture="Delete" Command="{Binding DeleteCommand}" />
+ </Window.KeyBindings>
+ <DockPanel>
+ <Border DockPanel.Dock="Bottom" Padding="20,12" BorderThickness="0,1,0,0"
+ BorderBrush="{DynamicResource SubtleBorderBrush}" Background="{DynamicResource SurfaceBrush}">
+ <DockPanel>
+ <TextBlock Text="{Binding Status}" Classes="caption" VerticalAlignment="Center"
+ TextTrimming="CharacterEllipsis" IsVisible="{Binding HasStatus}" />
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
+ <Button Content="{DynamicResource common.cancel}" Click="OnCancel" IsCancel="True" />
+ <Button Classes="accent" Content="{DynamicResource common.save}" Click="OnSave" IsDefault="True"
+ IsEnabled="{Binding CanSave}" />
+ </StackPanel>
+ </DockPanel>
+ </Border>
+
+ <StackPanel DockPanel.Dock="Top" Margin="20,18,20,10" Spacing="10">
+ <StackPanel Spacing="4">
+ <TextBlock Classes="h2" Text="{DynamicResource pdf_editor.title}" />
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource pdf_editor.hint}" />
+ </StackPanel>
+ <WrapPanel Orientation="Horizontal">
+ <Button Margin="0,0,6,6" Click="OnAdd">
+ <StackPanel Orientation="Horizontal" Spacing="5">
+ <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}" />
+ <TextBlock Text="{DynamicResource pdf_editor.add}" />
+ </StackPanel>
+ </Button>
+ <Button Margin="0,0,6,6" Command="{Binding MoveUpCommand}" ToolTip.Tip="{DynamicResource group.move_up}">
+ <PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowUp}" />
+ </Button>
+ <Button Margin="0,0,6,6" Command="{Binding MoveDownCommand}" ToolTip.Tip="{DynamicResource group.move_down}">
+ <PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowDown}" />
+ </Button>
+ <Button Margin="0,0,6,6" Command="{Binding RotateLeftCommand}" Content="{DynamicResource preset.rotate_left.short}" />
+ <Button Margin="0,0,6,6" Command="{Binding RotateRightCommand}" Content="{DynamicResource preset.rotate_right.short}" />
+ <Button Margin="0,0,6,6" Command="{Binding DeleteCommand}">
+ <StackPanel Orientation="Horizontal" Spacing="5">
+ <PathIcon Width="13" Height="13" Data="{StaticResource Icon.Delete}" />
+ <TextBlock Text="{DynamicResource pdf_editor.delete}" />
+ </StackPanel>
+ </Button>
+ <Button Margin="0,0,6,6" Click="OnExtract" Content="{DynamicResource preset.pdf_extract.short}" />
+ </WrapPanel>
+ </StackPanel>
+
+ <ListBox x:Name="PageOrder" Margin="20,0,20,14" ItemsSource="{Binding Pages}" SelectedItem="{Binding SelectedPage}"
+ ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+ <ListBox.Styles>
+ <Style Selector="ListBoxItem">
+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+ </Style>
+ </ListBox.Styles>
+ <ListBox.ItemTemplate>
+ <DataTemplate x:DataType="vm:PdfPageItem">
+ <Grid ColumnDefinitions="Auto,*,Auto" Margin="5,7">
+ <Border Width="34" Height="34" CornerRadius="8" Background="{DynamicResource SurfaceBrush}"
+ BorderBrush="{DynamicResource SubtleBorderBrush}" BorderThickness="1" Margin="0,0,10,0">
+ <TextBlock Text="{Binding PageNumber}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+ </Border>
+ <StackPanel Grid.Column="1" Spacing="2">
+ <TextBlock Text="{Binding PageText}" />
+ <TextBlock Classes="caption" Text="{Binding SourceName}" TextTrimming="CharacterEllipsis" />
+ </StackPanel>
+ <TextBlock Grid.Column="2" Classes="caption" Text="{Binding RotationText}" VerticalAlignment="Center" />
+ </Grid>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ </ListBox>
+ </DockPanel>
+</Window>
diff --git a/src/Filee.App/Views/PdfPageEditorWindow.axaml.cs b/src/Filee.App/Views/PdfPageEditorWindow.axaml.cs
new file mode 100644
index 00000000..3721ce94
--- /dev/null
+++ b/src/Filee.App/Views/PdfPageEditorWindow.axaml.cs
@@ -0,0 +1,53 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using Filee.App.Services;
+using Filee.App.ViewModels;
+
+namespace Filee.App.Views;
+
+public partial class PdfPageEditorWindow : Window
+{
+ private static readonly FilePickerFileType PdfFiles = new("PDF")
+ {
+ Patterns = ["*.pdf"],
+ MimeTypes = ["application/pdf"],
+ AppleUniformTypeIdentifiers = ["com.adobe.pdf"],
+ };
+
+ public PdfPageEditorWindow()
+ {
+ InitializeComponent();
+ Motion.Track(this);
+ }
+
+ public async Task PickAndAddAsync()
+ {
+ if (DataContext is not PdfPageEditorViewModel vm)
+ return;
+ var picked = await StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
+ {
+ Title = this.FindResource("pdf_editor.add")?.ToString(),
+ AllowMultiple = true,
+ FileTypeFilter = [PdfFiles],
+ });
+ var paths = picked.Select(file => file.TryGetLocalPath()).OfType<string>().ToList();
+ await vm.AddFilesAsync(paths);
+ }
+
+ private async void OnAdd(object? sender, RoutedEventArgs e) => await PickAndAddAsync();
+
+ private async void OnExtract(object? sender, RoutedEventArgs e)
+ {
+ if (DataContext is PdfPageEditorViewModel vm)
+ await vm.ExtractSelectedAsync();
+ }
+
+ private async void OnSave(object? sender, RoutedEventArgs e)
+ {
+ if (DataContext is PdfPageEditorViewModel vm && await vm.SaveAsync())
+ Close();
+ }
+
+ private void OnCancel(object? sender, RoutedEventArgs e) => Close();
+}
diff --git a/src/Filee.Core/Presets/BuiltInData.cs b/src/Filee.Core/Presets/BuiltInData.cs
index 4a3c96c0..5d1c27ce 100644
--- a/src/Filee.Core/Presets/BuiltInData.cs
+++ b/src/Filee.Core/Presets/BuiltInData.cs
@@ -48,6 +48,37 @@ public static class BuiltInData
Id = "tool-crop", NameKey = "preset.crop", TargetFormat = SameAsSource,
Kind = PresetKind.Tool, Output = { FileNamePattern = "{name}_cropped" },
},
+ new()
+ {
+ Id = "tool-pdf-crop", NameKey = "preset.pdf_crop", TargetFormat = SameAsSource,
+ Kind = PresetKind.Tool, Output = { FileNamePattern = "{name}_cropped" },
+ },
+ new()
+ {
+ Id = "tool-pdf-pages", NameKey = "preset.pdf_pages", TargetFormat = SameAsSource,
+ Kind = PresetKind.Tool, Output = { FileNamePattern = "{name}_edited" },
+ },
+ new()
+ {
+ Id = "tool-pdf-add", NameKey = "preset.pdf_add", TargetFormat = SameAsSource,
+ Kind = PresetKind.Tool, Output = { FileNamePattern = "{name}_merged" },
+ },
+ new()
+ {
+ Id = "pdf-rotate-left", NameKey = "preset.rotate_left", TargetFormat = "pdf",
+ Pdf = { Rotation = PdfRotation.Left90 }, Output = { FileNamePattern = "{name}_left" },
+ },
+ new()
+ {
+ Id = "pdf-rotate-right", NameKey = "preset.rotate_right", TargetFormat = "pdf",
+ Pdf = { Rotation = PdfRotation.Right90 }, Output = { FileNamePattern = "{name}_right" },
+ },
+ new()
+ {
+ Id = "pdf-edit", NameKey = "preset.group_pdf_edit", TargetFormat = Preset.GroupTarget,
+ Kind = PresetKind.Group,
+ SubPresetIds = ["tool-pdf-crop", "pdf-rotate-left", "pdf-rotate-right", "tool-pdf-pages", "pdf-split", "tool-pdf-add"],
+ },
.. ImageToolPresets(),
new()
{
@@ -370,7 +401,7 @@ public static class BuiltInData
Id = "pdf", NameKey = "profile.pdf",
Extensions = ["pdf"],
PresetIds = [.. PdfDonut],
- BackPresetIds = ["compress-pdf", "to-webp", "to-tiff", "to-html", "to-odt", "to-rtf", "to-azw3", "to-cbz", "zip-all"],
+ BackPresetIds = ["pdf-edit", "compress-pdf", "to-webp", "to-tiff", "to-html", "to-odt", "to-rtf", "to-azw3", "to-cbz", "zip-all"],
},
new()
{
diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.cs
index ed631510..204d7e03 100644
--- a/src/Filee.Core/Presets/Preset.cs
+++ b/src/Filee.Core/Presets/Preset.cs
@@ -361,6 +361,15 @@ public enum PdfCompression
Print,
}
+/// <summary>A lossless turn applied to every page of a PDF.</summary>
+public enum PdfRotation
+{
+ None,
+ Left90,
+ Right90,
+ Rotate180,
+}
+
/// <summary>PDF related options.</summary>
public sealed class PdfOptions
{
@@ -381,6 +390,10 @@ public sealed class PdfOptions
/// <summary>For PDF → PDF: write every page as its own file.</summary>
public bool SplitPages { get; set; }
+ /// <summary>For PDF → PDF: rotate every selected page without rendering it.</summary>
+ [JsonConverter(typeof(LenientEnumJsonConverter<PdfRotation>))]
+ public PdfRotation Rotation { get; set; }
+
/// <summary>For PDF → image: stack the pages into one tall image instead of one image per page.</summary>
public bool CombinePages { get; set; }
diff --git a/src/Filee.Core/Settings/AppSettings.cs b/src/Filee.Core/Settings/AppSettings.cs
index 4f488dcb..3df95d28 100644
--- a/src/Filee.Core/Settings/AppSettings.cs
+++ b/src/Filee.Core/Settings/AppSettings.cs
@@ -112,7 +112,7 @@ public sealed class DonutSettings
public sealed class AppSettings
{
/// <summary>Current schema version. Increase when the format changes and add a migration.</summary>
- public const int CurrentSchemaVersion = 32;
+ public const int CurrentSchemaVersion = 33;
public int SchemaVersion { get; set; } = CurrentSchemaVersion;
diff --git a/src/Filee.Core/Settings/UserDataStore.cs b/src/Filee.Core/Settings/UserDataStore.cs
index 7aff0c84..a733d130 100644
--- a/src/Filee.Core/Settings/UserDataStore.cs
+++ b/src/Filee.Core/Settings/UserDataStore.cs
@@ -250,12 +250,12 @@ public sealed class UserDataStore
// conversion to "group": still a group, now an empty one, rather than a conversion that can never run.
foreach (var preset in Presets.Where(p => !p.IsGroup && p.TargetFormat == Preset.GroupTarget))
preset.Kind = PresetKind.Group;
- // A group fans out conversions only (no group or tool in a group), each once, at most MaxSubPresets, and has no
+ // A group fans out conversions and tools (but never another group), each once, at most MaxSubPresets, and has no
// target format an older Filee could run it with.
- var conversions = Presets.Where(p => !p.IsGroup && !p.IsTool).Select(p => p.Id).ToHashSet();
+ var actions = Presets.Where(p => !p.IsGroup).Select(p => p.Id).ToHashSet();
foreach (var group in Presets.Where(p => p.IsGroup))
{
- group.SubPresetIds = group.SubPresetIds.Where(conversions.Contains).Distinct().Take(Preset.MaxSubPresets).ToList();
+ group.SubPresetIds = group.SubPresetIds.Where(actions.Contains).Distinct().Take(Preset.MaxSubPresets).ToList();
group.TargetFormat = Preset.GroupTarget;
}
@@ -750,6 +750,28 @@ internal static class SettingsMigrations
// v32: logs and script source, Video CD DAT and Workbench archives learn their donuts; custom claims stay put.
if (from < 32)
changed |= LearnExtensions(profiles, out _, ["log", "py", "pac", "bat", "command", "dat", "wbpz"]);
+ // v33: one "Edit" slice on the back of the PDF donut fans out the common lossless page tools. Existing
+ // customised backs keep their layout; the group is offered at the start when there is room.
+ if (from < 33)
+ {
+ var ids = new[] { "tool-pdf-crop", "tool-pdf-pages", "tool-pdf-add", "pdf-rotate-left", "pdf-rotate-right", "pdf-edit" };
+ var defaults = BuiltInData.CreatePresets();
+ foreach (var id in ids.Where(id => presets.All(p => p.Id != id)))
+ {
+ var item = defaults.Single(p => p.Id == id);
+ var at = defaults.FindIndex(p => p.Id == id);
+ var after = defaults.Take(at).Select(p => presets.FindIndex(existing => existing.Id == p.Id)).LastOrDefault(i => i >= 0, -1);
+ presets.Insert(after + 1, item);
+ changed = true;
+ }
+ if (profiles.FirstOrDefault(p => p.Id == "pdf") is { BackPresetIds: { } back } pdf
+ && !pdf.PresetIds.Contains("pdf-edit") && !back.Contains("pdf-edit")
+ && back.Count < ToolbarProfile.MaxSlices)
+ {
+ back.Insert(0, "pdf-edit");
+ changed = true;
+ }
+ }
return changed;
}
diff --git a/src/Filee.Engines/Pdf/PdfPageTools.cs b/src/Filee.Engines/Pdf/PdfPageTools.cs
new file mode 100644
index 00000000..093888a6
--- /dev/null
+++ b/src/Filee.Engines/Pdf/PdfPageTools.cs
@@ -0,0 +1,133 @@
+// Lossless PDF page tools used by the interactive editor: PDFium supplies previews, while PDFsharp changes page
+// boxes or copies pages without rasterising their text and drawings.
+
+using PDFtoImage;
+using PDFtoImage.Exceptions;
+using Filee.Core.Platform;
+using PdfSharp.Drawing;
+using PdfSharp.Pdf;
+using PdfSharp.Pdf.IO;
+using SkiaSharp;
+
+#pragma warning disable CA1416 // PDFium ships for every desktop platform Filee targets.
+
+namespace Filee.Engines.Pdf;
+
+public sealed record PdfPagePreview(byte[] Png, int Width, int Height);
+
+/// <summary>One page in an edited document. <see cref="Rotation"/> is an additional clockwise turn in degrees.</summary>
+public sealed record PdfPageReference(string Path, int PageIndex, int Rotation = 0);
+
+public static class PdfPageTools
+{
+ public static int PageCount(string path)
+ {
+ using var document = PdfSharpConverter.Open(path, PdfDocumentOpenMode.Import);
+ return document.PageCount;
+ }
+
+ /// <summary>Copies pages in the supplied order, optionally from several PDFs, and applies their lossless turns.</summary>
+ public static void Save(IReadOnlyList<PdfPageReference> pages, string outputPath,
+ CancellationToken cancellationToken = default)
+ {
+ if (pages.Count == 0)
+ throw new InvalidOperationException("A PDF must contain at least one page.");
+ var sources = new Dictionary<string, PdfDocument>(FileSystemPaths.Comparer);
+ try
+ {
+ using var output = new PdfDocument();
+ foreach (var item in pages)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ if (!sources.TryGetValue(item.Path, out var source))
+ {
+ source = PdfSharpConverter.Open(item.Path, PdfDocumentOpenMode.Import);
+ sources.Add(item.Path, source);
+ }
+ if (item.PageIndex < 0 || item.PageIndex >= source.PageCount)
+ throw new InvalidDataException($"Page {item.PageIndex + 1} no longer exists in {Path.GetFileName(item.Path)}.");
+ var page = output.AddPage(source.Pages[item.PageIndex]);
+ if (item.Rotation != 0)
+ page.Rotate = ((page.Rotate + item.Rotation) % 360 + 360) % 360;
+ }
+ output.Save(outputPath);
+ }
+ finally
+ {
+ foreach (var source in sources.Values)
+ source.Dispose();
+ }
+ }
+
+ /// <summary>Renders one page for the crop UI, bounded so a poster-sized page cannot make an enormous bitmap.</summary>
+ public static PdfPagePreview Preview(string path, int pageIndex = 0, int maxDimension = 2560)
+ {
+ var pdf = File.ReadAllBytes(path);
+ try
+ {
+ var sizes = Conversion.GetPageSizes(pdf, null);
+ if (pageIndex < 0 || pageIndex >= sizes.Count)
+ throw new ArgumentOutOfRangeException(nameof(pageIndex));
+ var size = sizes[pageIndex];
+ var longest = Math.Max(size.Width, size.Height);
+ var dpi = longest <= 0 ? 96 : Math.Clamp((int)Math.Floor(maxDimension * 72 / longest), 36, 150);
+ var options = new RenderOptions(Dpi: dpi, WithAnnotations: true, WithFormFill: true, BackgroundColor: SKColors.White);
+ using var bitmap = Conversion.ToImages(pdf, [pageIndex], null, options).Single();
+ using var encoded = bitmap.Encode(SKEncodedImageFormat.Png, 100);
+ return new PdfPagePreview(encoded.ToArray(), bitmap.Width, bitmap.Height);
+ }
+ catch (PdfPasswordProtectedException)
+ {
+ throw PdfDocumentReader.PasswordProtected();
+ }
+ }
+
+ /// <summary>
+ /// Applies one crop rectangle, in the rendered page's normalised top-left coordinates, to every page. Only the
+ /// page crop boxes change; text, vectors, links and pictures remain PDF objects.
+ /// </summary>
+ public static void CropAll(string inputPath, string outputPath, double x, double y, double width, double height,
+ CancellationToken cancellationToken = default)
+ {
+ (x, y, width, height) = Clamp(x, y, width, height);
+ using var source = PdfSharpConverter.Open(inputPath, PdfDocumentOpenMode.Import);
+ using var output = new PdfDocument();
+ foreach (var sourcePage in source.Pages)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ var page = output.AddPage(sourcePage);
+ var box = page.EffectiveCropBoxReadOnly;
+ var (left, bottom, right, top) = MapFromDisplayed(page.Rotate, x, y, width, height);
+ page.CropBox = new PdfRectangle(
+ new XPoint(box.X1 + left * box.Width, box.Y1 + bottom * box.Height),
+ new XPoint(box.X1 + right * box.Width, box.Y1 + top * box.Height));
+ }
+ output.Save(outputPath);
+ }
+
+ private static (double X, double Y, double Width, double Height) Clamp(double x, double y, double width, double height)
+ {
+ x = Math.Clamp(x, 0, 1);
+ y = Math.Clamp(y, 0, 1);
+ width = Math.Clamp(width, 0.0001, 1 - x);
+ height = Math.Clamp(height, 0.0001, 1 - y);
+ return (x, y, width, height);
+ }
+
+ /// <summary>Displayed top-left coordinates to the unrotated PDF box (left, bottom, right, top).</summary>
+ private static (double Left, double Bottom, double Right, double Top) MapFromDisplayed(
+ int rotation, double x, double y, double width, double height)
+ {
+ var u0 = x;
+ var u1 = x + width;
+ var v0 = y;
+ var v1 = y + height;
+ return ((rotation % 360 + 360) % 360) switch
+ {
+ 90 => (v0, u0, v1, u1),
+ 180 => (1 - u1, v0, 1 - u0, v1),
+ 270 => (1 - v1, 1 - u1, 1 - v0, 1 - u0),
+ _ => (u0, 1 - v1, u1, 1 - v0),
+ };
+ }
+}
diff --git a/src/Filee.Engines/Pdf/PdfSharpConverter.cs b/src/Filee.Engines/Pdf/PdfSharpConverter.cs
index 4f64ac75..c7673867 100644
--- a/src/Filee.Engines/Pdf/PdfSharpConverter.cs
+++ b/src/Filee.Engines/Pdf/PdfSharpConverter.cs
@@ -118,7 +118,7 @@ public sealed class PdfSharpConverter : IConverter, IPdfMerger, IImageTransforme
{
ct.ThrowIfCancellationRequested();
using var single = new PdfDocument();
- single.AddPage(source.Pages[pages[i]]);
+ Rotate(single.AddPage(source.Pages[pages[i]]), step.Preset.Pdf.Rotation);
var path = step.Output.Allocate("pdf", $"_p{pages[i] + 1}");
if (path is null)
continue;
@@ -131,7 +131,7 @@ public sealed class PdfSharpConverter : IConverter, IPdfMerger, IImageTransforme
using var extract = new PdfDocument();
foreach (var index in pages)
- extract.AddPage(source.Pages[index]);
+ Rotate(extract.AddPage(source.Pages[index]), step.Preset.Pdf.Rotation);
var output = step.Output.Allocate("pdf");
if (output is null)
return [];
@@ -139,6 +139,19 @@ public sealed class PdfSharpConverter : IConverter, IPdfMerger, IImageTransforme
return [output];
}
+ private static void Rotate(PdfPage page, PdfRotation rotation)
+ {
+ var degrees = rotation switch
+ {
+ PdfRotation.Left90 => -90,
+ PdfRotation.Right90 => 90,
+ PdfRotation.Rotate180 => 180,
+ _ => 0,
+ };
+ if (degrees != 0)
+ page.Rotate = ((page.Rotate + degrees) % 360 + 360) % 360;
+ }
+
/// <summary>
/// PDF → a smaller PDF (<see cref="PdfOptions.Compression"/>), also with a page range or one file per page: the whole
/// file keeps everything (bookmarks, form fields, links, metadata) and is compressed as it is; selected pages are
@@ -162,13 +175,14 @@ public sealed class PdfSharpConverter : IConverter, IPdfMerger, IImageTransforme
foreach (var index in pages)
{
using var single = new PdfDocument();
- single.AddPage(source.Pages[index]);
+ Rotate(single.AddPage(source.Pages[index]), options.Rotation);
var path = Path.Combine(scratch, $"page-{index + 1}.pdf");
single.Save(path);
parts.Add((path, $"_p{index + 1}"));
}
}
- else if (pages.SequenceEqual(Enumerable.Range(0, source.PageCount)))
+ else if (options.Rotation == PdfRotation.None
+ && pages.SequenceEqual(Enumerable.Range(0, source.PageCount)))
{
parts.Add((step.InputPath, null));
}
@@ -176,7 +190,7 @@ public sealed class PdfSharpConverter : IConverter, IPdfMerger, IImageTransforme
{
using var extract = new PdfDocument();
foreach (var index in pages)
- extract.AddPage(source.Pages[index]);
+ Rotate(extract.AddPage(source.Pages[index]), options.Rotation);
var path = Path.Combine(scratch, "pages.pdf");
extract.Save(path);
parts.Add((path, null));
diff --git a/tests/Filee.App.Tests/CropServiceTests.cs b/tests/Filee.App.Tests/CropServiceTests.cs
index fd8fc69e..b0413cfa 100644
--- a/tests/Filee.App.Tests/CropServiceTests.cs
+++ b/tests/Filee.App.Tests/CropServiceTests.cs
@@ -10,6 +10,9 @@ using Filee.Core.Localization;
using Filee.Core.Presets;
using Filee.Core.Settings;
using ImageMagick;
+using PdfSharp.Drawing;
+using PdfSharp.Pdf;
+using PdfSharp.Pdf.IO;
namespace Filee.App.Tests;
@@ -52,6 +55,48 @@ public class CropServiceTests
}
}
+ [AvaloniaFact]
+ public async Task Pdf_preview_and_crop_keep_every_page_as_a_PDF()
+ {
+ TestServices.EnsureInitialized("en");
+ var folder = Directory.CreateTempSubdirectory("filee-pdf-crop-test-").FullName;
+ try
+ {
+ var source = Path.Combine(folder, "pages.pdf");
+ using (var document = new PdfDocument())
+ {
+ foreach (var rotation in new[] { 0, 90 })
+ {
+ var page = document.AddPage();
+ page.Width = XUnit.FromPoint(600);
+ page.Height = XUnit.FromPoint(800);
+ page.Rotate = rotation;
+ }
+ document.Save(source);
+ }
+ var store = AppHost.Get<UserDataStore>();
+ var loc = AppHost.Get<ILocalizer>();
+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-pdf-crop");
+ var preview = await CropService.LoadPreviewAsync(source);
+
+ var result = await CropService.CropFileAsync(source,
+ preview.Width / 10, preview.Height / 5, preview.Width / 2, preview.Height * 3 / 5,
+ preset, store, loc, originalWidth: preview.Width, originalHeight: preview.Height);
+
+ Assert.Equal(CropStatus.Success, result.Status);
+ Assert.EndsWith("pages_cropped.pdf", result.OutputPath);
+ using var cropped = PdfReader.Open(result.OutputPath!, PdfDocumentOpenMode.Import);
+ Assert.Equal(2, cropped.PageCount);
+ Assert.Equal([0, 90], cropped.Pages.Cast<PdfPage>().Select(p => p.Rotate));
+ Assert.InRange(cropped.Pages[0].CropBox.Width, 299, 301);
+ Assert.InRange(cropped.Pages[0].CropBox.Height, 479, 481);
+ }
+ finally
+ {
+ try { Directory.Delete(folder, true); } catch (IOException) { }
+ }
+ }
+
[AvaloniaFact]
public async Task CropFileAsync_honors_conflict_policies()
{
diff --git a/tests/Filee.App.Tests/DonutGroupTests.cs b/tests/Filee.App.Tests/DonutGroupTests.cs
index a7c2dc0b..3d0a9384 100644
--- a/tests/Filee.App.Tests/DonutGroupTests.cs
+++ b/tests/Filee.App.Tests/DonutGroupTests.cs
@@ -395,9 +395,19 @@ public class DonutGroupTests
vm.ResetForDrag(); // dragging: the files (and so the donut) aren't known yet
Assert.True(vm.ReserveSubRing);
- vm.Load([@"C:\docs\a.pdf"], clickMode: true); // the PDF donut has no group
+ vm.Load([@"C:\downloads\a.zip"], clickMode: true); // the archive donut has no group
vm.FitToThisDonut();
Assert.False(vm.ReserveSubRing);
+
+ vm.Load([@"C:\docs\a.pdf"], clickMode: true); // Edit is a group on the PDF donut's back
+ vm.FitToThisDonut();
+ Assert.True(vm.ReserveSubRing);
+ Assert.True(vm.ToggleFace());
+ Assert.True(vm.Items[0].IsGroup);
+ Assert.Equal(Preset.MaxSubPresets, vm.Items[0].Children!.Count);
+ Assert.Equal("tool-pdf-crop", vm.PresetShownAt(0, 0)!.Id);
+ Assert.Equal("tool-pdf-add", vm.PresetShownAt(0, 5)!.Id);
+
vm.Load([@"C:\photos\a.jpg"], clickMode: true); // the image donut has
vm.FitToThisDonut();
Assert.True(vm.ReserveSubRing);
@@ -446,6 +456,22 @@ public class DonutGroupTests
Assert.Equal("This file type isn't supported", availability.Check(crop, []));
}
+ [AvaloniaFact]
+ public void Pdf_tools_are_available_only_when_every_file_is_a_PDF()
+ {
+ TestServices.EnsureInitialized("en");
+ var availability = AppHost.Get<PresetAvailability>();
+ var crop = BuiltInData.CreatePresets().Single(p => p.Id == "tool-pdf-crop");
+ var pdf = Filee.Core.Formats.FormatRegistry.Get("pdf");
+ var png = Filee.Core.Formats.FormatRegistry.Get("png");
+
+ Assert.Null(availability.Check(crop, [pdf]));
+ Assert.Equal(new PresetJudgement(PresetUse.Usable, null), availability.ForPalette([pdf]).Judge(crop));
+ Assert.Equal("This file type isn't supported", availability.Check(crop, [png]));
+ Assert.Equal("This file type isn't supported", availability.Check(crop, [pdf, png]));
+ Assert.Equal("This file type isn't supported", availability.Check(crop, []));
+ }
+
[AvaloniaFact]
public void A_group_left_without_presets_says_why_on_the_donut()
{
diff --git a/tests/Filee.App.Tests/GroupEditorTests.cs b/tests/Filee.App.Tests/GroupEditorTests.cs
index 75ea8cb3..ad62b382 100644
--- a/tests/Filee.App.Tests/GroupEditorTests.cs
+++ b/tests/Filee.App.Tests/GroupEditorTests.cs
@@ -52,6 +52,21 @@ public class GroupEditorTests
Assert.True(group.IsGroup);
}
+ [AvaloniaFact]
+ public void Pdf_edit_group_keeps_its_conversion_and_tool_actions_when_saved()
+ {
+ var group = BuiltInData.CreatePresets().Single(p => p.Id == "pdf-edit");
+ var vm = Edit(group);
+
+ Assert.Equal(group.SubPresetIds, vm.Members.Select(m => m.PresetId));
+ Assert.Equal(Preset.MaxSubPresets, vm.Members.Count);
+ Assert.True(vm.Apply());
+ Assert.Equal([
+ "tool-pdf-crop", "pdf-rotate-left", "pdf-rotate-right",
+ "tool-pdf-pages", "pdf-split", "tool-pdf-add",
+ ], group.SubPresetIds);
+ }
+
[AvaloniaFact]
public void A_group_takes_six_presets_at_most_and_needs_a_name()
{
diff --git a/tests/Filee.App.Tests/PdfPageEditorTests.cs b/tests/Filee.App.Tests/PdfPageEditorTests.cs
new file mode 100644
index 00000000..530b7d7b
--- /dev/null
+++ b/tests/Filee.App.Tests/PdfPageEditorTests.cs
@@ -0,0 +1,103 @@
+using Avalonia.Headless.XUnit;
+using Filee.App.Services;
+using Filee.App.ViewModels;
+using Filee.App.Views;
+using Filee.Core.Localization;
+using Filee.Core.Presets;
+using Filee.Core.Settings;
+using PdfSharp.Drawing;
+using PdfSharp.Pdf;
+using PdfSharp.Pdf.IO;
+
+namespace Filee.App.Tests;
+
+public class PdfPageEditorTests
+{
+ private static string MakePdf(string folder, string name, params (double Width, int Rotation)[] pages)
+ {
+ var path = Path.Combine(folder, name);
+ using var document = new PdfDocument();
+ foreach (var (width, rotation) in pages)
+ {
+ var page = document.AddPage();
+ page.Width = XUnit.FromPoint(width);
+ page.Height = XUnit.FromPoint(500);
+ page.Rotate = rotation;
+ }
+ document.Save(path);
+ return path;
+ }
+
+ [AvaloniaFact]
+ public async Task Editor_adds_reorders_rotates_deletes_and_saves_pages()
+ {
+ TestServices.EnsureInitialized("en");
+ var folder = Directory.CreateTempSubdirectory("filee-pdf-pages-").FullName;
+ try
+ {
+ var first = MakePdf(folder, "source.pdf", (200, 0), (300, 0));
+ var added = MakePdf(folder, "added.pdf", (400, 90));
+ var store = new UserDataStore(Path.Combine(folder, "data"));
+ store.Load();
+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-pdf-pages");
+ preset.Output.Location = OutputLocation.CustomFolder;
+ preset.Output.CustomFolder = folder;
+ var vm = new PdfPageEditorViewModel([first], preset, AppHost.Get<ILocalizer>(), store);
+
+ await vm.AddFilesAsync([added]);
+ vm.SelectedPage = vm.Pages[2];
+ vm.MoveUpCommand.Execute(null);
+ vm.MoveUpCommand.Execute(null);
+ vm.RotateLeftCommand.Execute(null);
+ vm.SelectedPage = vm.Pages[2];
+ vm.DeleteCommand.Execute(null);
+
+ Assert.Equal([400d, 200d], vm.Pages.Select(p => p.Path == added ? 400d : 200d));
+ Assert.Equal("Rotated −90°", vm.Pages[0].RotationText.Replace('-', '−'));
+ Assert.True(await vm.SaveAsync());
+
+ var output = Path.Combine(folder, "source_edited.pdf");
+ using var result = PdfReader.Open(output, PdfDocumentOpenMode.Import);
+ Assert.Equal([400d, 200d], result.Pages.Cast<PdfPage>().Select(p => p.Width.Point));
+ Assert.Equal([0, 0], result.Pages.Cast<PdfPage>().Select(p => p.Rotate));
+ Assert.Contains(store.History, h => h.Outputs.Contains(output));
+ }
+ finally
+ {
+ try { Directory.Delete(folder, true); } catch (IOException) { }
+ }
+ }
+
+ [AvaloniaFact]
+ public void Editor_window_renders_all_actions_without_clipping()
+ {
+ TestServices.EnsureInitialized("en");
+ var folder = Directory.CreateTempSubdirectory("filee-pdf-pages-ui-").FullName;
+ try
+ {
+ var source = MakePdf(folder, "Annual report.pdf", (595, 0), (595, 0), (842, 0), (595, 0));
+ var store = new UserDataStore(Path.Combine(folder, "data"));
+ store.Load();
+ var preset = BuiltInData.CreatePresets().Single(p => p.Id == "tool-pdf-pages");
+ var vm = new PdfPageEditorViewModel([source], preset, AppHost.Get<ILocalizer>(), store)
+ {
+ SelectedPage = null,
+ };
+ vm.SelectedPage = vm.Pages[1];
+ vm.RotateRightCommand.Execute(null);
+ var window = new PdfPageEditorWindow { DataContext = vm };
+ window.Show();
+
+ RenderTests.Pump();
+ RenderTests.Save(window, "pdf-page-editor-en.png");
+
+ Assert.True(window.PageOrder.Bounds.Width > 400);
+ Assert.Equal(4, window.PageOrder.ItemsView.Count);
+ window.Close();
+ }
+ finally
+ {
+ try { Directory.Delete(folder, true); } catch (IOException) { }
+ }
+ }
+}
diff --git a/tests/Filee.Core.Tests/BackFaceTests.cs b/tests/Filee.Core.Tests/BackFaceTests.cs
index 113fd83b..625bbdb0 100644
--- a/tests/Filee.Core.Tests/BackFaceTests.cs
+++ b/tests/Filee.Core.Tests/BackFaceTests.cs
@@ -55,6 +55,42 @@ public class BackFaceTests
Assert.Equal(["archives"], BuiltInData.CreateProfiles().Where(p => p.BackPresetIds!.Count == 0).Select(p => p.Id));
}
+ [Fact]
+ public void Pdf_edit_is_one_back_slice_with_six_real_actions()
+ {
+ var presets = BuiltInData.CreatePresets().ToDictionary(p => p.Id);
+ var pdf = BuiltIn("pdf");
+
+ Assert.Equal("pdf-edit", pdf.BackPresetIds![0]);
+ var edit = presets["pdf-edit"];
+ Assert.True(edit.IsGroup);
+ Assert.Equal([
+ "tool-pdf-crop", "pdf-rotate-left", "pdf-rotate-right",
+ "tool-pdf-pages", "pdf-split", "tool-pdf-add",
+ ], edit.SubPresetIds);
+ Assert.Equal(Preset.MaxSubPresets, edit.SubPresetIds.Count);
+ Assert.All(edit.SubPresetIds, id => Assert.False(presets[id].IsGroup));
+ Assert.All(edit.SubPresetIds.Where(id => id.StartsWith("tool-pdf-")), id => Assert.True(presets[id].IsTool));
+ }
+
+ [Fact]
+ public void Version_32_library_gets_pdf_edit_once_without_replacing_custom_back_slices()
+ {
+ var presets = BuiltInData.CreatePresets();
+ presets.RemoveAll(p => p.Id is "tool-pdf-crop" or "tool-pdf-pages" or "tool-pdf-add"
+ or "pdf-rotate-left" or "pdf-rotate-right" or "pdf-edit");
+ var profiles = BuiltInData.CreateProfiles();
+ var pdf = profiles.Single(p => p.Id == "pdf");
+ pdf.BackPresetIds = ["to-html", "zip-all"];
+
+ Assert.True(SettingsMigrations.ApplyToLibrary(32, presets, profiles));
+
+ Assert.Equal(["pdf-edit", "to-html", "zip-all"], pdf.BackPresetIds);
+ Assert.All(new[] { "tool-pdf-crop", "tool-pdf-pages", "tool-pdf-add", "pdf-rotate-left", "pdf-rotate-right", "pdf-edit" },
+ id => Assert.Single(presets, p => p.Id == id));
+ Assert.False(SettingsMigrations.ApplyToLibrary(32, presets, profiles));
+ }
+
[Fact]
public void The_fronts_stay_as_they_were_before_back_faces()
{
diff --git a/tests/Filee.Engines.Tests/PdfPageToolsTests.cs b/tests/Filee.Engines.Tests/PdfPageToolsTests.cs
new file mode 100644
index 00000000..a454c41e
--- /dev/null
+++ b/tests/Filee.Engines.Tests/PdfPageToolsTests.cs
@@ -0,0 +1,90 @@
+using Filee.Core.Presets;
+using Filee.Engines.Pdf;
+using PdfSharp.Drawing;
+using PdfSharp.Pdf;
+using PdfSharp.Pdf.IO;
+
+namespace Filee.Engines.Tests;
+
+public class PdfPageToolsTests(EngineFixture fx) : IClassFixture<EngineFixture>
+{
+ private static string MakePdf(string folder, string name, params (double Width, double Height, int Rotation)[] pages)
+ {
+ var path = Path.Combine(folder, name);
+ using var document = new PdfDocument();
+ foreach (var (width, height, rotation) in pages)
+ {
+ var page = document.AddPage();
+ page.Width = XUnit.FromPoint(width);
+ page.Height = XUnit.FromPoint(height);
+ page.Rotate = rotation;
+ }
+ document.Save(path);
+ return path;
+ }
+
+ [Fact]
+ public void Save_reorders_combines_and_rotates_pages_without_rasterising()
+ {
+ var folder = fx.NewFolder();
+ var first = MakePdf(folder, "first.pdf", (200, 500, 0), (300, 500, 0));
+ var second = MakePdf(folder, "second.pdf", (400, 500, 90));
+ var output = Path.Combine(folder, "edited.pdf");
+
+ PdfPageTools.Save([
+ new(second, 0, -90),
+ new(first, 1, 90),
+ new(first, 0),
+ ], output, TestContext.Current.CancellationToken);
+
+ using var result = PdfReader.Open(output, PdfDocumentOpenMode.Import);
+ Assert.Equal(3, result.PageCount);
+ Assert.Equal([400d, 300d, 200d], result.Pages.Cast<PdfPage>().Select(p => p.Width.Point));
+ Assert.Equal([0, 90, 0], result.Pages.Cast<PdfPage>().Select(p => p.Rotate));
+ }
+
+ [Fact]
+ public void Crop_applies_displayed_proportions_to_every_page_and_respects_rotation()
+ {
+ var folder = fx.NewFolder();
+ var source = MakePdf(folder, "source.pdf", (600, 800, 0), (600, 800, 90));
+ var output = Path.Combine(folder, "cropped.pdf");
+
+ PdfPageTools.CropAll(source, output, x: .1, y: .2, width: .5, height: .6,
+ TestContext.Current.CancellationToken);
+
+ using var result = PdfReader.Open(output, PdfDocumentOpenMode.Import);
+ Assert.Equal(2, result.PageCount);
+ AssertBox(result.Pages[0].CropBox, 60, 160, 360, 640);
+ AssertBox(result.Pages[1].CropBox, 120, 80, 480, 480);
+ }
+
+ [Theory]
+ [InlineData(PdfCompression.None)]
+ [InlineData(PdfCompression.Ebook)]
+ public async Task Pdf_rotation_preset_turns_all_pages_losslessly(PdfCompression compression)
+ {
+ var folder = fx.NewFolder();
+ var source = MakePdf(folder, "source.pdf", (200, 500, 0), (300, 500, 90));
+ var preset = new Preset
+ {
+ TargetFormat = "pdf",
+ Output = { FileNamePattern = "{name}_right" },
+ Pdf = { Rotation = PdfRotation.Right90, Compression = compression },
+ };
+
+ var job = await fx.ConvertAsync([source], preset);
+
+ Assert.Equal(Filee.Core.Conversion.JobState.Completed, job.State);
+ using var result = PdfReader.Open(Assert.Single(job.Outputs), PdfDocumentOpenMode.Import);
+ Assert.Equal([90, 180], result.Pages.Cast<PdfPage>().Select(p => p.Rotate));
+ }
+
+ private static void AssertBox(PdfRectangle actual, double x1, double y1, double x2, double y2)
+ {
+ Assert.Equal(x1, actual.X1, 6);
+ Assert.Equal(y1, actual.Y1, 6);
+ Assert.Equal(x2, actual.X2, 6);
+ Assert.Equal(y2, actual.Y2, 6);
+ }
+}