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
fix(translation): address review feedback on formats, pdf route, safe server stop, and donut placement
return {name:"chinchi-codes"}b7dbcdc356b4
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.jsonindex 0f263ef5..c521442b 100644--- a/src/Filee.App/Assets/i18n/ar.json+++ b/src/Filee.App/Assets/i18n/ar.json@@ -1280,6 +1280,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "اختبار الاتصال","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/de.json b/src/Filee.App/Assets/i18n/de.jsonindex dee67298..e85be0fb 100644--- a/src/Filee.App/Assets/i18n/de.json+++ b/src/Filee.App/Assets/i18n/de.json@@ -1279,6 +1279,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Verbindung testen","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.jsonindex b2f6e1ba..9fc8b03b 100644--- a/src/Filee.App/Assets/i18n/es.json+++ b/src/Filee.App/Assets/i18n/es.json@@ -1281,6 +1281,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Probar conexión","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/fr.json b/src/Filee.App/Assets/i18n/fr.jsonindex 6d6eaa3d..0658e8c3 100644--- a/src/Filee.App/Assets/i18n/fr.json+++ b/src/Filee.App/Assets/i18n/fr.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Tester la connexion","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.jsonindex b8230ebb..94ea6f52 100644--- a/src/Filee.App/Assets/i18n/hi.json+++ b/src/Filee.App/Assets/i18n/hi.json@@ -1281,6 +1281,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "कनेक्शन जांचें","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/id.json b/src/Filee.App/Assets/i18n/id.jsonindex 10e4e583..9ef85aeb 100644--- a/src/Filee.App/Assets/i18n/id.json+++ b/src/Filee.App/Assets/i18n/id.json@@ -1279,6 +1279,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Uji Koneksi","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/it.json b/src/Filee.App/Assets/i18n/it.jsonindex 52e99721..16e50f1b 100644--- a/src/Filee.App/Assets/i18n/it.json+++ b/src/Filee.App/Assets/i18n/it.json@@ -1279,6 +1279,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Testa connessione","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.jsonindex 7ac10a5f..52d5605c 100644--- a/src/Filee.App/Assets/i18n/ja.json+++ b/src/Filee.App/Assets/i18n/ja.json@@ -1281,6 +1281,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "接続テスト","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.jsonindex 1ea86764..254750cf 100644--- a/src/Filee.App/Assets/i18n/ko.json+++ b/src/Filee.App/Assets/i18n/ko.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "연결 테스트","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/ne.json b/src/Filee.App/Assets/i18n/ne.jsonindex d532f011..ef1d3c6c 100644--- a/src/Filee.App/Assets/i18n/ne.json+++ b/src/Filee.App/Assets/i18n/ne.json@@ -1281,6 +1281,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "जडान परीक्षण","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.jsonindex bc047b68..0a2b81f3 100644--- a/src/Filee.App/Assets/i18n/pl.json+++ b/src/Filee.App/Assets/i18n/pl.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Testuj połączenie","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.jsonindex 0d3abe4e..ccd0f1da 100644--- a/src/Filee.App/Assets/i18n/pt-BR.json+++ b/src/Filee.App/Assets/i18n/pt-BR.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Testar conexão","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/pt-PT.json b/src/Filee.App/Assets/i18n/pt-PT.jsonindex 4565937f..25f58406 100644--- a/src/Filee.App/Assets/i18n/pt-PT.json+++ b/src/Filee.App/Assets/i18n/pt-PT.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Testar ligação","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.jsonindex a2f93e99..23aafefa 100644--- a/src/Filee.App/Assets/i18n/ru.json+++ b/src/Filee.App/Assets/i18n/ru.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Проверить соединение","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/th.json b/src/Filee.App/Assets/i18n/th.jsonindex 8e249458..d1817b66 100644--- a/src/Filee.App/Assets/i18n/th.json+++ b/src/Filee.App/Assets/i18n/th.json@@ -1281,6 +1281,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "ทดสอบการเชื่อมต่อ","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/tr.json b/src/Filee.App/Assets/i18n/tr.jsonindex f9f98e4e..9b5e8e05 100644--- a/src/Filee.App/Assets/i18n/tr.json+++ b/src/Filee.App/Assets/i18n/tr.json@@ -1279,6 +1279,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "Bağlantıyı Test Et","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.jsonindex e11f5b0d..3343c6ac 100644--- a/src/Filee.App/Assets/i18n/zh-CN.json+++ b/src/Filee.App/Assets/i18n/zh-CN.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "测试连接","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Assets/i18n/zh-TW.json b/src/Filee.App/Assets/i18n/zh-TW.jsonindex 91918331..43d57d26 100644--- a/src/Filee.App/Assets/i18n/zh-TW.json+++ b/src/Filee.App/Assets/i18n/zh-TW.json@@ -1301,6 +1301,7 @@"presets.translate_content": "Translate document","presets.translate_hint": "Translates the document or book into the target language on your computer.","presets.target_language": "Target language",+ "presets.test_connection": "測試連線","engines.package.translator.name": "Translator (Offline AI)","engines.package.translator.description": "Translates documents and books locally on your PC without uploading them. Works offline using local Ollama or bundled models.","engines.package.translator.sizes": "Offline Local AI · http://127.0.0.1:11434",diff --git a/src/Filee.App/Services/ConversionService.cs b/src/Filee.App/Services/ConversionService.csindex ded8bfc0..da8868ea 100644--- a/src/Filee.App/Services/ConversionService.cs+++ b/src/Filee.App/Services/ConversionService.cs@@ -84,6 +84,11 @@ public sealed class ConversionService}// A preset on "Default" saves where Settings > General says (read now, so a changed default applies at once).preset = _store.Settings.WithDefaultOutput(preset);+ if (preset.Translate.Enabled && string.IsNullOrWhiteSpace(preset.Translate.Model) && !string.IsNullOrWhiteSpace(_store.Settings.PreferredOllamaModel))+ {+ preset = preset.Clone();+ preset.Translate.Model = _store.Settings.PreferredOllamaModel;+ }WebDropFetcher? fetcher = null;if (web is not null){diff --git a/src/Filee.App/Services/EngineDownloadService.cs b/src/Filee.App/Services/EngineDownloadService.csindex 36d67ab6..76a15e85 100644--- a/src/Filee.App/Services/EngineDownloadService.cs+++ b/src/Filee.App/Services/EngineDownloadService.cs@@ -43,16 +43,12 @@ public sealed partial class EnginePackageState : ObservableObjectpublic bool HasSettings => Package.Id is "libreoffice" or "translator";public string SettingsLabel => Package.Id == "translator"-- ? (_loc["engines.ollama.manage"] != "engines.ollama.manage" ? _loc["engines.ollama.manage"] : "Manage Ollama")-- : (_loc["engines.settings"] != "engines.settings" ? _loc["engines.settings"] : "Settings");+ ? _loc["engines.ollama.manage"]+ : _loc["engines.settings"];public string SettingsTooltip => Package.Id == "translator"-- ? (_loc["engines.ollama.manage_hint"] != "engines.ollama.manage_hint" ? _loc["engines.ollama.manage_hint"] : "Manage local Ollama models, start/stop server, and install offline models")-- : (_loc["engines.lo_title"] != "engines.lo_title" ? _loc["engines.lo_title"] : "LibreOffice options");+ ? _loc["engines.ollama.manage_hint"]+ : _loc["engines.lo_title"];public string Description => _loc[$"engines.package.{Package.Id}.description"];public bool IsTranslator => Package.Id == "translator";@@ -267,175 +263,91 @@ public sealed class EngineDownloadServiceprivate EnginePackageStatus StatusOfTranslator(EnginePackageState state)-{-var id = state.Package.Id;-var own = EngineEnvironment.OwnCopyFolder(id);-var system = own is null && !_installer.IsInstalled(state.Package) ? EngineEnvironment.SystemCopyFolder(id) : null;-state.OwnCopyFolder = own ?? system;-state.FromSystem = system is not null;-state.UpdateNote = null;-state.IsOutdated = false;--_ = CheckOllamaAsync(state);--return state.OwnCopyFolder is not null ? EnginePackageStatus.OwnCopy-: _installer.IsInstalled(state.Package) ? EnginePackageStatus.Installed-: EnginePackageStatus.NotInstalled;-}--private async Task CheckOllamaAsync(EnginePackageState state)-{-try-{-using var response = await SharedOllamaClient.GetAsync("http://127.0.0.1:11434/api/tags");-if (response.IsSuccessStatusCode)-{-using var stream = await response.Content.ReadAsStreamAsync();-using var doc = await System.Text.Json.JsonDocument.ParseAsync(stream);-int totalCount = 0;-int cloudCount = 0;-int localCount = 0;--if (doc.RootElement.TryGetProperty("models", out var models) && models.ValueKind == System.Text.Json.JsonValueKind.Array)-{-foreach (var m in models.EnumerateArray())-{-var name = m.TryGetProperty("name", out var n) ? n.GetString() : null;-if (string.IsNullOrWhiteSpace(name)) continue;-totalCount++;-if (Filee.Engines.Translation.TranslationService.IsCloudModel(name))-cloudCount++;-else-localCount++;-}-}--await Dispatcher.UIThread.InvokeAsync(() =>-{-if (localCount > 0)-{-state.Status = EnginePackageStatus.OwnCopy;-state.OwnCopyFolder ??= "http://127.0.0.1:11434 (Local Ollama)";-state.UpdateNote = cloudCount > 0-? _loc.Format("engines.package.translator.cloud_skipped", cloudCount)-: null;-}-else if (totalCount > 0 && cloudCount == totalCount)-{-state.Status = EnginePackageStatus.NotInstalled;-state.UpdateNote = _loc["engines.package.translator.only_cloud_models"];-}-else-{-state.Status = EnginePackageStatus.NotInstalled;-state.UpdateNote = _loc["engines.package.translator.no_model"];-}-+ _catalog.Refresh();});-return;-}-}-catch-{-// Ollama not reachable-}--var ollamaExe = EngineEnvironment.SystemProgram("ollama", "ollama.exe");-if (ollamaExe is not null)-{-await Dispatcher.UIThread.InvokeAsync(() =>-{-if (state.Status != EnginePackageStatus.OwnCopy)-{-state.Status = EnginePackageStatus.NotInstalled;-state.UpdateNote = _loc["engines.package.translator.not_running"];-}-});-}-}diff --git a/src/Filee.App/ViewModels/OllamaModelManagerViewModel.cs b/src/Filee.App/ViewModels/OllamaModelManagerViewModel.csindex 26d13ffa..5c4b90fb 100644--- a/src/Filee.App/ViewModels/OllamaModelManagerViewModel.cs+++ b/src/Filee.App/ViewModels/OllamaModelManagerViewModel.cs@@ -32,6 +32,7 @@ public sealed partial class OllamaModelItem : ObservableObjectpublic sealed partial class OllamaModelManagerViewModel : ObservableObject{private static readonly Uri OllamaBase = new("http://127.0.0.1:11434");+ private static Process? _fileeStartedOllamaProcess;private readonly ILocalizer _loc;private readonly UserDataStore _store;@@ -44,10 +45,14 @@ public sealed partial class OllamaModelManagerViewModel : ObservableObject{_loc = loc;_store = store;- _activeModelName = store.Settings.PreferredOllamaModel ?? TranslationService.ActiveOllamaModel ?? "";+ _activeModelName = store.Settings.PreferredOllamaModel ?? "";+ UpdateCanStopServer();_ = RefreshStatusAsync();}+ [ObservableProperty]+ private bool _canStopServer;+[ObservableProperty]private bool _isOllamaInstalled;@@ -159,8 +164,14 @@ public sealed partial class OllamaModelManagerViewModel : ObservableObjectreturn false;}+ private void UpdateCanStopServer()+ {+ CanStopServer = _fileeStartedOllamaProcess is { HasExited: false };+ }+private async Task CheckServerAndLoadModelsAsync(){+ UpdateCanStopServer();try{using var client = new HttpClient { Timeout = TimeSpan.FromMilliseconds(500) };@@ -204,7 +215,6 @@ public sealed partial class OllamaModelManagerViewModel : ObservableObjectfirstLocal.ActionText = _loc["engines.ollama.using_model"];firstLocal.IsActionEnabled = false;ActiveModelName = firstLocal.Name;- TranslationService.ActiveOllamaModel = firstLocal.Name;}Models = new ObservableCollection<OllamaModelItem>(list);@@ -253,7 +263,6 @@ public sealed partial class OllamaModelManagerViewModel : ObservableObject}ActiveModelName = item.Name;- TranslationService.ActiveOllamaModel = item.Name;_store.Settings.PreferredOllamaModel = item.Name;_store.SaveSettings();@@ -265,37 +274,21 @@ public sealed partial class OllamaModelManagerViewModel : ObservableObject[RelayCommand]public async Task StopServerAsync(){- try+ if (_fileeStartedOllamaProcess is not null && !_fileeStartedOllamaProcess.HasExited){- if (OperatingSystem.IsWindows())+ try{- var psi = new ProcessStartInfo- {- FileName = "powershell",- Arguments = "-NoProfile -Command \"Get-Process *ollama* -ErrorAction SilentlyContinue | Stop-Process -Force\"",- CreateNoWindow = true,- UseShellExecute = false- };- using var p = Process.Start(psi);- if (p is not null)- await p.WaitForExitAsync();+ _fileeStartedOllamaProcess.Kill(entireProcessTree: true);+ await _fileeStartedOllamaProcess.WaitForExitAsync();}- else+ catch { }+ finally{- var psi = new ProcessStartInfo- {- FileName = "pkill",- Arguments = "-f ollama",- CreateNoWindow = true,- UseShellExecute = false- };- using var p = Process.Start(psi);- if (p is not null)- await p.WaitForExitAsync();+ _fileeStartedOllamaProcess.Dispose();+ _fileeStartedOllamaProcess = null;}}- catch { }-+ UpdateCanStopServer();await Task.Delay(300);await RefreshStatusAsync();}@@ -315,7 +308,8 @@ public sealed partial class OllamaModelManagerViewModel : ObservableObjectCreateNoWindow = true,UseShellExecute = false};- Process.Start(psi);+ _fileeStartedOllamaProcess = Process.Start(psi);+ UpdateCanStopServer();}catch { }diff --git a/src/Filee.App/ViewModels/PresetEditorViewModel.cs b/src/Filee.App/ViewModels/PresetEditorViewModel.csindex a422fd4b..649c9034 100644--- a/src/Filee.App/ViewModels/PresetEditorViewModel.cs+++ b/src/Filee.App/ViewModels/PresetEditorViewModel.cs@@ -9,6 +9,8 @@ using Filee.Core.Formats;using Filee.Core.Localization;using Filee.Core.Presets;using Filee.Engines.Ocr;+using Filee.App.Services;+using Filee.Core.Settings;using Filee.Engines.Translation;namespace Filee.App.ViewModels;@@ -302,11 +304,14 @@ public sealed partial class PresetEditorViewModel : ObservableObjecttry{var targetLang = TargetLanguage?.Value ?? "es";- var service = new TranslationService(new TranslateOptions { TargetLanguage = targetLang });+ var preferred = AppHost.Get<UserDataStore>()?.Settings.PreferredOllamaModel;+ var model = !string.IsNullOrWhiteSpace(_edit.Translate.Model) ? _edit.Translate.Model+ : !string.IsNullOrWhiteSpace(preferred) ? preferred+ : await TranslationService.GetPreferredLocalOllamaModelAsync();+ var service = new TranslationService(new TranslateOptions { TargetLanguage = targetLang, Model = model });var sample = "Hello, world!";var translated = await service.TranslateTextAsync(sample, targetLang);- var model = await TranslationService.GetPreferredLocalOllamaModelAsync() ?? TranslationService.ActiveOllamaModel ?? "local model";- TestTranslationResult = $"\"{sample}\" → \"{translated}\" ({model})";+ TestTranslationResult = $"\"{sample}\" → \"{translated}\" ({model ?? "local model"})";TestTranslationHasError = false;}catch (Exception ex)diff --git a/src/Filee.App/Views/OllamaModelManagerWindow.axaml b/src/Filee.App/Views/OllamaModelManagerWindow.axamlindex b18ea3de..6cd0b713 100644--- a/src/Filee.App/Views/OllamaModelManagerWindow.axaml+++ b/src/Filee.App/Views/OllamaModelManagerWindow.axaml@@ -25,7 +25,7 @@<StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="8"><Button Content="{DynamicResource presets.test_connection}" IsVisible="{Binding IsServerRunning}"Command="{Binding TestConnectionCommand}" IsEnabled="{Binding !IsTesting}" />- <Button Content="{DynamicResource engines.ollama.stop_server}" IsVisible="{Binding IsServerRunning}"+ <Button Content="{DynamicResource engines.ollama.stop_server}" IsVisible="{Binding CanStopServer}"Command="{Binding StopServerCommand}" /><Button Classes="accent" Content="{DynamicResource engines.ollama.start_server}" IsVisible="{Binding !IsServerRunning}"Command="{Binding StartServerCommand}" />diff --git a/src/Filee.Core/Presets/BuiltInData.cs b/src/Filee.Core/Presets/BuiltInData.csindex 06bcda54..d6a040ef 100644--- a/src/Filee.Core/Presets/BuiltInData.cs+++ b/src/Filee.Core/Presets/BuiltInData.cs@@ -46,19 +46,12 @@ public static class BuiltInData.. TrimPresets(),new()-{-Id = "translate",-NameKey = "preset.translate",-TargetFormat = SameAsSource,-Translate = new TranslateOptions { Enabled = true, TargetLanguage = "en" },-- Output = { FileNamePattern = "{name}_{lang}" },-+ Output = { FileNamePattern = "{name}_translated" },},new(){@@ -604,7 +597,7 @@ public static class BuiltInDataId = "pdf", NameKey = "profile.pdf",Extensions = ["pdf"],PresetIds = [.. PdfDonut],- BackPresetIds = ["pdf-edit", "compress-pdf", "to-webp", "to-tiff", "to-html", "to-odt", "to-rtf", "to-azw3", "to-cbz", "translate", "remove-metadata", "zip-all"],+ BackPresetIds = ["pdf-edit", "compress-pdf", "to-webp", "to-tiff", "to-html", "to-odt", "to-rtf", "to-azw3", "to-cbz", "remove-metadata", "zip-all"],},new(){@@ -620,7 +613,7 @@ public static class BuiltInDataId = "hwp", NameKey = "profile.hwp",Extensions = ["hwp", "hwpx"],PresetIds = ["to-pdf", "to-docx", "to-hwpx", "to-hwp", "to-png", "to-jpg", "to-txt", "to-md", "to-epub", "merge-pdf"],- BackPresetIds = ["translate", "to-html", "to-odt", "to-rtf", "pdf-long-image", "to-azw3", "zip-all"],+ BackPresetIds = ["to-html", "to-odt", "to-rtf", "pdf-long-image", "to-azw3", "zip-all"],},TextProfile(),.. WithSubtitleProfile(CatalogProfiles()),diff --git a/src/Filee.Core/Presets/Preset.cs b/src/Filee.Core/Presets/Preset.csindex b5434f83..fef2cc37 100644--- a/src/Filee.Core/Presets/Preset.cs+++ b/src/Filee.Core/Presets/Preset.cs@@ -158,26 +158,19 @@ public sealed class Preset&& Formats.FormatRegistry.FindById(TargetFormat) is { Category: Formats.FormatCategory.Archive } archive&& archive.Id != Formats.FormatRegistry.Folder;- /// <summary>- /// True if converting a <paramref name="sourceFormat"/> file saves every frame as a picture- /// (<see cref="MediaOptions.SaveEveryFrame"/>): the file is a video and the target one of- /// <see cref="MediaOptions.FrameTargets"/>. Other files, and other targets, convert as usual.- /// </summary>- public bool TranslatesDocument(string sourceFormat)- {- if (!Translate.Enabled)- return false;- var fmt = Formats.FormatRegistry.FindById(sourceFormat);- if (fmt is null)- return false;- return fmt.Category is Formats.FormatCategory.Document- or Formats.FormatCategory.Ebook- or Formats.FormatCategory.Text- or Formats.FormatCategory.Data- or Formats.FormatCategory.Subtitle- || sourceFormat == "pdf";- }-+ /// <summary>True if converting a document or e-book using local AI translation.</summary>+ public bool TranslatesDocument(string sourceFormat)+ {+ if (!Translate.Enabled)+ return false;+ var fmt = Formats.FormatRegistry.FindById(sourceFormat);+ if (fmt is null)+ return false;+ return fmt.Category is Formats.FormatCategory.Document+ or Formats.FormatCategory.Ebook+ or Formats.FormatCategory.Text;+ }+public bool SavesFramesOf(string sourceFormat) =>Media.SaveEveryFrame&& !MakesLivePhotoOf(sourceFormat)@@ -1305,22 +1298,12 @@ public sealed class CadOptions/// <summary>Options for offline AI document translation.</summary>-public sealed class TranslateOptions-{-- public bool Enabled { get; set; } = false;-+ public bool Enabled { get; set; }public string TargetLanguage { get; set; } = "en";-public string SourceLanguage { get; set; } = "auto";-public string? Model { get; set; }--public TranslateOptions Clone() => (TranslateOptions)MemberwiseClone();-}-diff --git a/src/Filee.Core/Settings/UserDataStore.cs b/src/Filee.Core/Settings/UserDataStore.csindex 70320bcd..b4ff9dd2 100644--- a/src/Filee.Core/Settings/UserDataStore.cs+++ b/src/Filee.Core/Settings/UserDataStore.cs@@ -281,14 +281,23 @@ public sealed class UserDataStore/// <summary>Removes dangling preset references and guarantees at least one mixed-selection profile.</summary>private void EnsureConsistency(){- if (Presets.All(p => p.Id != "translate"))- {- if (BuiltInData.CreatePresets().FirstOrDefault(p => p.Id == "translate") is { } translatePreset)- Presets.Add(translatePreset);- }var ids = Presets.Select(p => p.Id).ToHashSet();foreach (var profile in Profiles){+ if (profile.Id is "pdf" or "hwp" or "data")+ {+ profile.PresetIds.Remove("translate");+ profile.BackPresetIds?.Remove("translate");+ }+ else if (profile.Id is "office" or "text" or "ebooks")+ {+ if (profile.PresetIds.Remove("translate"))+ {+ profile.BackPresetIds ??= [];+ if (!profile.BackPresetIds.Contains("translate"))+ profile.BackPresetIds.Add("translate");+ }+ }profile.PresetIds = profile.PresetIds.Where(ids.Contains).Distinct().Take(ToolbarProfile.MaxSlices).ToList();// No back face known by now (a donut the user made, read from an older file): it has none.profile.BackPresetIds = (profile.BackPresetIds ?? []).Where(ids.Contains).Distinct().Take(ToolbarProfile.MaxSlices).ToList();diff --git a/src/Filee.Engines/Infrastructure/EngineDownloads.cs b/src/Filee.Engines/Infrastructure/EngineDownloads.csindex 55b6358c..3fbf8b6c 100644--- a/src/Filee.Engines/Infrastructure/EngineDownloads.cs+++ b/src/Filee.Engines/Infrastructure/EngineDownloads.cs@@ -55,7 +55,7 @@ public static class EngineDownloadsnew("calibre", ["calibre"], 663_000_000, ["calibre"]),new("tesseract", ["tesseract"], 168_000_000, ["tesseract"]),.. (OperatingSystem.IsWindows() ? [new EnginePackage("whisper", ["whisper", "whisper-model"], 156_880_105, ["whisper"])] : Array.Empty<EnginePackage>()),- new("translator", ["translator"], 0, ["translator"]),+ new("translator", [], 0, ["translator"]),];/// <summary>Total download size of a package in bytes.</summary>@@ -85,8 +85,7 @@ public static class EngineDownloads_ => $"No Filee download is available for {RuntimeIdentifier}. Install {package.Id} using your distribution's package manager and select its program folder.",};if (package.Id == "translator")-- return "Install local Ollama (https://ollama.com) with 'ollama run llama3.2' or place a local model in the engines folder. Everything runs 100% offline on your computer.";+ return "Requires local Ollama (https://ollama.com) running on your computer. Everything runs 100% offline.";return $"No Filee download is available for {RuntimeIdentifier}. Select a compatible installed copy.";}diff --git a/src/Filee.Engines/Translation/TranslationService.cs b/src/Filee.Engines/Translation/TranslationService.csindex d814ab38..3ca6b551 100644--- a/src/Filee.Engines/Translation/TranslationService.cs+++ b/src/Filee.Engines/Translation/TranslationService.cs@@ -8,17 +8,20 @@ using Microsoft.Extensions.Logging;namespace Filee.Engines.Translation;/// <summary>-/// Offline document and text translation service powered by local AI (Ollama or local offline models).+/// Offline document and text translation service powered by local AI (Ollama)./// Strictly runs on the user's computer: no text is ever uploaded or sent to third-party web services./// </summary>public sealed class TranslationService : ITranslationService{private static readonly TimeSpan OllamaTimeout = TimeSpan.FromMinutes(2);private static readonly Uri LocalOllamaBase = new("http://127.0.0.1:11434");+ private static readonly HttpClient SharedHttpClient = new() { Timeout = OllamaTimeout };+ private static readonly HttpClient SharedPingClient = new() { Timeout = TimeSpan.FromMilliseconds(500) };private readonly TranslateOptions _options;private readonly ILogger? _logger;private readonly HttpClient? _http;+ private string? _resolvedModel;public TranslationService(TranslateOptions? options = null, HttpClient? httpClient = null, ILogger? logger = null){@@ -41,8 +44,6 @@ public sealed class TranslationService : ITranslationServicereturn CodeToNameMap.TryGetValue(norm, out var name) ? name : code;}- public static string? ActiveOllamaModel { get; set; }-/// <summary>/// Checks whether an Ollama model forwards prompts to the cloud (e.g. models ending in '-cloud' or containing 'cloud')./// Cloud models are strictly prohibited to ensure document text never leaves the computer.@@ -63,8 +64,9 @@ public sealed class TranslationService : ITranslationService{try{- using var client = new HttpClient { Timeout = TimeSpan.FromMilliseconds(500) };- using var res = await client.GetAsync(new Uri(LocalOllamaBase, "/api/tags"), cancellationToken);+ using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);+ cts.CancelAfter(TimeSpan.FromMilliseconds(500));+ using var res = await SharedPingClient.GetAsync(new Uri(LocalOllamaBase, "/api/tags"), cts.Token);return res.IsSuccessStatusCode;}catch@@ -77,12 +79,13 @@ public sealed class TranslationService : ITranslationService{try{- using var client = new HttpClient { Timeout = TimeSpan.FromSeconds(1) };- using var res = await client.GetAsync(new Uri(LocalOllamaBase, "/api/tags"), cancellationToken);+ using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);+ cts.CancelAfter(TimeSpan.FromSeconds(2));+ using var res = await SharedPingClient.GetAsync(new Uri(LocalOllamaBase, "/api/tags"), cts.Token);if (!res.IsSuccessStatusCode)return null;- using var doc = await JsonDocument.ParseAsync(await res.Content.ReadAsStreamAsync(cancellationToken), cancellationToken: cancellationToken);+ using var doc = await JsonDocument.ParseAsync(await res.Content.ReadAsStreamAsync(cts.Token), cancellationToken: cts.Token);if (doc.RootElement.TryGetProperty("models", out var models) && models.ValueKind == JsonValueKind.Array){var names = models.EnumerateArray()@@ -94,9 +97,6 @@ public sealed class TranslationService : ITranslationServiceif (names.Count == 0)return null;- if (!string.IsNullOrWhiteSpace(ActiveOllamaModel) && names.Any(n => string.Equals(n, ActiveOllamaModel, StringComparison.OrdinalIgnoreCase) || n.StartsWith(ActiveOllamaModel + ":", StringComparison.OrdinalIgnoreCase)))- return names.First(n => string.Equals(n, ActiveOllamaModel, StringComparison.OrdinalIgnoreCase) || n.StartsWith(ActiveOllamaModel + ":", StringComparison.OrdinalIgnoreCase));-// Prefer specialized or standard instruction modelsstring[] preferred = ["translategemma", "qwen2.5", "llama3.2", "llama3", "mistral", "gemma2", "phi3", "phi4"];foreach (var p in preferred)@@ -115,6 +115,30 @@ public sealed class TranslationService : ITranslationServicereturn null;}+ private async Task<string> EnsureModelResolvedAsync(CancellationToken cancellationToken)+ {+ if (!string.IsNullOrWhiteSpace(_resolvedModel))+ return _resolvedModel;++ if (!string.IsNullOrWhiteSpace(_options.Model))+ {+ if (IsCloudModel(_options.Model))+ throw new InvalidOperationException("Security Block: Cloud-forwarded models (-cloud) are blocked to ensure document text never leaves your computer.");+ _resolvedModel = _options.Model;+ return _resolvedModel;+ }++ var preferred = await GetPreferredLocalOllamaModelAsync(cancellationToken);+ if (string.IsNullOrWhiteSpace(preferred))+ throw new InvalidOperationException("engines.package.translator.no_model");++ if (IsCloudModel(preferred))+ throw new InvalidOperationException("Security Block: Cloud-forwarded models (-cloud) are blocked to ensure document text never leaves your computer.");++ _resolvedModel = preferred;+ return _resolvedModel;+ }+public async Task<string> TranslateTextAsync(string text, string toLang, string fromLang = "auto", CancellationToken cancellationToken = default){if (string.IsNullOrWhiteSpace(text))@@ -126,27 +150,8 @@ public sealed class TranslationService : ITranslationServiceif (string.Equals(sourceLang, targetLang, StringComparison.OrdinalIgnoreCase))return text;- if (!string.IsNullOrWhiteSpace(_options.Model) && IsCloudModel(_options.Model))- throw new InvalidOperationException("Security Block: Cloud-forwarded models (-cloud) are blocked to ensure document text never leaves your computer.");-- // 1. Try local Ollama (100% offline on http://127.0.0.1:11434)- if (await IsLocalOllamaAvailableAsync(cancellationToken))- {- var model = (!string.IsNullOrWhiteSpace(_options.Model) ? _options.Model : await GetPreferredLocalOllamaModelAsync(cancellationToken)) ?? "llama3.2";- if (IsCloudModel(model))- throw new InvalidOperationException("Security Block: Cloud-forwarded models (-cloud) are blocked to ensure document text never leaves your computer.");- return await TranslateWithLocalOllamaAsync(text, targetLang, sourceLang, model, cancellationToken);- }-- // 2. Try local CLI engine if installed in Filee's engines folder- if (LocateLocalEngine() is { } cli && File.Exists(cli))- {- return await TranslateWithLocalCliAsync(cli, text, targetLang, sourceLang, cancellationToken);- }-- throw new InvalidOperationException(- "Local offline translation requires Ollama running on your computer (http://localhost:11434) or the Translator engine in Settings → Engines. " +- "Filee converts files on your own computer and never uploads them.");+ var model = await EnsureModelResolvedAsync(cancellationToken);+ return await TranslateWithLocalOllamaAsync(text, targetLang, sourceLang, model, cancellationToken);}public async Task<IReadOnlyList<string>> TranslateBatchAsync(IReadOnlyList<string> texts, string toLang, string fromLang = "auto", CancellationToken cancellationToken = default)@@ -154,6 +159,9 @@ public sealed class TranslationService : ITranslationServiceif (texts.Count == 0)return [];+ // Ensure model is resolved once before launching batch tasks+ await EnsureModelResolvedAsync(cancellationToken);+var results = new string[texts.Count];var semaphore = new SemaphoreSlim(4, 4);var tasks = new List<Task>();@@ -204,7 +212,7 @@ public sealed class TranslationService : ITranslationServiceoptions = new { temperature = 0.1 }};- using var client = _http ?? new HttpClient { Timeout = OllamaTimeout };+ var client = _http ?? SharedHttpClient;using var response = await client.PostAsJsonAsync(new Uri(LocalOllamaBase, "/api/generate"), requestBody, cancellationToken);response.EnsureSuccessStatusCode();@@ -215,39 +223,6 @@ public sealed class TranslationService : ITranslationServicereturn text;}- private static async Task<string> TranslateWithLocalCliAsync(string cliPath, string text, string targetLang, string sourceLang, CancellationToken cancellationToken)- {- var targetName = LanguageDisplayName(targetLang);- var prompt = $"Translate into {targetName}:\n{text}";-- var psi = new ProcessStartInfo- {- FileName = cliPath,- Arguments = $"-p \"{prompt.Replace("\"", "\\\"")}\" --temp 0.1",- RedirectStandardOutput = true,- RedirectStandardError = true,- UseShellExecute = false,- CreateNoWindow = true- };-- using var process = Process.Start(psi) ?? throw new InvalidOperationException("Failed to launch local translator process.");- using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);- cts.CancelAfter(TimeSpan.FromMinutes(2));-- var output = await process.StandardOutput.ReadToEndAsync(cts.Token);- await process.WaitForExitAsync(cts.Token);-- return !string.IsNullOrWhiteSpace(output) ? output.Trim() : text;- }-- internal static string? LocateLocalEngine()- {- return EngineEnvironment.OwnProgram("translator", "translator.exe")- ?? EngineEnvironment.BundledProgram("translator", "translator.exe")- ?? EngineEnvironment.SystemProgram("translator", "translator.exe")- ?? EngineEnvironment.SystemProgram("ollama", "ollama.exe");- }-private static readonly Dictionary<string, string> LanguageMap = new(StringComparer.OrdinalIgnoreCase){["en"] = "en",diff --git a/src/Filee.Engines/Translation/TranslatorConverter.cs b/src/Filee.Engines/Translation/TranslatorConverter.csindex 8d497c6e..e56eb212 100644--- a/src/Filee.Engines/Translation/TranslatorConverter.cs+++ b/src/Filee.Engines/Translation/TranslatorConverter.cs@@ -6,11 +6,7 @@ using Filee.Engines.Hwp;using Filee.Engines.Hwp.Hwpx;using Filee.Engines.Hwp.Hwpx.Docx;using Filee.Engines.Infrastructure;-using Filee.Engines.Pdf;using Microsoft.Extensions.Logging;-using PdfSharp;-using PdfSharp.Drawing;-using PdfSharp.Pdf;namespace Filee.Engines.Translation;@@ -22,7 +18,7 @@ public sealed class TranslatorConverter : IConverterprivate static readonly string[] DocumentFormats =["epub", "kepub", "mobi", "azw3", "azw", "prc", "fb2", "htmlz", "txtz",- "md", "txt", "html", "docx", "pdf", "hwpx", "json", "yaml", "toml", "xml", "srt", "vtt", "csv"+ "md", "txt", "html", "docx", "hwpx"];private readonly ITranslationService? _translationService;@@ -49,47 +45,49 @@ public sealed class TranslatorConverter : IConverter.ToList();private static readonly HttpClient SharedStatusClient = new() { Timeout = TimeSpan.FromMilliseconds(200) };- private static (DateTime CheckedAt, bool Available) _cachedOllama;+ private static volatile bool _lastKnownOllamaAvailable;+ private static long _lastCheckedTicks;+ private static readonly object _statusCheckLock = new();public EngineStatus GetStatus(){if (_translationService is not null)return EngineStatus.Available("embedded", "Test Translator");- var now = DateTime.UtcNow;- bool isAvailable;- if (now - _cachedOllama.CheckedAt < TimeSpan.FromSeconds(3))+ var nowTicks = Environment.TickCount64;+ var lastTicks = Interlocked.Read(ref _lastCheckedTicks);+ if (nowTicks - lastTicks > 2500){- isAvailable = _cachedOllama.Available;- }- else- {- try- {- using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(150));- using var res = SharedStatusClient.GetAsync("http://127.0.0.1:11434/api/tags", cts.Token).GetAwaiter().GetResult();- isAvailable = res.IsSuccessStatusCode;- }- catch+ lock (_statusCheckLock){- isAvailable = false;+ lastTicks = Interlocked.Read(ref _lastCheckedTicks);+ if (nowTicks - lastTicks > 2500)+ {+ try+ {+ using var cts = new CancellationTokenSource(TimeSpan.FromMilliseconds(150));+ using var res = SharedStatusClient.GetAsync("http://127.0.0.1:11434/api/tags", cts.Token).GetAwaiter().GetResult();+ _lastKnownOllamaAvailable = res.IsSuccessStatusCode;+ }+ catch+ {+ _lastKnownOllamaAvailable = false;+ }+ Interlocked.Exchange(ref _lastCheckedTicks, nowTicks);+ }}- _cachedOllama = (now, isAvailable);}- if (isAvailable)+ if (_lastKnownOllamaAvailable)return EngineStatus.Available("http://127.0.0.1:11434", "Ollama (Local Offline)");- if (TranslationService.LocateLocalEngine() is { } cli && File.Exists(cli))- return EngineStatus.Available(cli, "Translator (Local)");-return EngineStatus.Unavailable("engine.reason.download_translator");}public async Task<IReadOnlyList<string>> ConvertAsync(ConversionStep step, IProgress<double>? progress, CancellationToken cancellationToken){- var status = GetStatus();- if (!status.IsAvailable && _translationService is null)+ var isAvailable = _translationService is not null || await TranslationService.IsLocalOllamaAvailableAsync(cancellationToken);+ if (!isAvailable)throw new ConversionRefusedException("error.translation_needs_engine");progress?.Report(0.05);@@ -157,7 +155,7 @@ public sealed class TranslatorConverter : IConvertervar document = MarkdownReader.Read(text, Path.GetDirectoryName(Path.GetFullPath(input))!);return (new Book(document, new BookMetadata { Title = document.Title }), document);}- case "txt" or "json" or "yaml" or "toml" or "xml" or "srt" or "vtt" or "csv":+ case "txt":{var text = HwpxConverter.DecodeText(File.ReadAllBytes(input));var document = PlainText.ToDocument(text);@@ -168,11 +166,6 @@ public sealed class TranslatorConverter : IConvertervar document = DocxReader.Read(input, media);return (new Book(document, new BookMetadata { Title = document.Title }), document);}- case "pdf":- {- var document = PdfDocumentReader.Read(input, media);- return (new Book(document, new BookMetadata { Title = document.Title }), document);- }default:throw new NotSupportedException($"Translation from format {step.From} is not supported.");}@@ -201,7 +194,7 @@ public sealed class TranslatorConverter : IConvertercase "docx":DocxWriter.Write(document, output);break;- case "txt" or "json" or "yaml" or "toml" or "xml" or "srt" or "vtt" or "csv":+ case "txt":File.WriteAllText(output, PlainTextWriter.Write(document), new UTF8Encoding(encoderShouldEmitUTF8Identifier: true));break;case "html":@@ -223,113 +216,11 @@ public sealed class TranslatorConverter : IConvertercase "txtz":ZippedText.WriteTxtz(b, output, step.InputPath, work);break;- case "pdf":- WritePdf(document, output, work, cancellationToken);- break;default:throw new NotSupportedException($"Writing to format {step.To} is not supported.");}}- private static void WritePdf(HDocument document, string output, string work, CancellationToken cancellationToken)- {- // 1. Try bundled rhwp (Filee's primary engine for HWPX -> PDF)- var rhwp = EngineEnvironment.FindBundled("rhwp") is { } bundled- ? EngineEnvironment.FirstExisting(Path.Combine(bundled, OperatingSystem.IsWindows() ? "rhwp.exe" : "rhwp"))- : null;-- if (rhwp is not null && File.Exists(rhwp))- {- try- {- var tempHwpx = Path.Combine(work, $"doc-{Guid.NewGuid():N}.hwpx");- HwpxWriter.Write(document, tempHwpx);- var tempPdf = Path.Combine(work, $"rhwp-{Guid.NewGuid():N}.pdf");- var result = ProcessRunner.RunAsync(rhwp, ["export-pdf", tempHwpx, "-o", tempPdf, .. RhwpInput.PdfOptions()], TimeSpan.FromMinutes(3), cancellationToken).GetAwaiter().GetResult();- if (result.ExitCode == 0 && File.Exists(tempPdf) && new FileInfo(tempPdf).Length > 0)- {- File.Move(tempPdf, output, overwrite: true);- return;- }- }- catch- {- // Fall back- }- }-- // 2. Try LibreOffice if available- var lo = EngineEnvironment.FindBundled("libreoffice") is { } loBundled- ? EngineEnvironment.FirstExisting(Path.Combine(loBundled, OperatingSystem.IsWindows() ? "program/soffice.exe" : "program/soffice"))- : null;- lo ??= EngineEnvironment.FirstExisting(OperatingSystem.IsWindows() ? @"C:\Program Files\LibreOffice\program\soffice.exe" : "/usr/bin/soffice");-- if (lo is not null && File.Exists(lo))- {- try- {- var tempDocx = Path.Combine(work, $"doc-{Guid.NewGuid():N}.docx");- DocxWriter.Write(document, tempDocx);- var loOutDir = Path.Combine(work, $"lo-{Guid.NewGuid():N}");- Directory.CreateDirectory(loOutDir);- var result = ProcessRunner.RunAsync(lo, ["--headless", "--convert-to", "pdf", "--outdir", loOutDir, tempDocx], TimeSpan.FromMinutes(3), cancellationToken).GetAwaiter().GetResult();- var produced = Directory.GetFiles(loOutDir, "*.pdf").FirstOrDefault();- if (produced is not null && File.Exists(produced) && new FileInfo(produced).Length > 0)- {- File.Move(produced, output, overwrite: true);- return;- }- }- catch- {- // Fall back- }- }-- // 3. Fallback using SkiaSharp to ensure a valid PDF is always produced- WritePdfFallback(document, output);- }-- private static void WritePdfFallback(HDocument document, string output)- {- using var stream = File.Create(output);- using var doc = SkiaSharp.SKDocument.CreatePdf(stream);- var margin = 40f;- var pageWidth = 595f;- var pageHeight = 842f;-- using var font = new SkiaSharp.SKFont(SkiaSharp.SKTypeface.Default, 11);- using var paint = new SkiaSharp.SKPaint { Color = SkiaSharp.SKColors.Black, IsAntialias = true };-- var text = PlainTextWriter.Write(document);- var lines = text.Split(["\r\n", "\r", "\n"], StringSplitOptions.None);-- var y = margin;- var canvas = doc.BeginPage(pageWidth, pageHeight);-- foreach (var line in lines)- {- if (y > pageHeight - margin)- {- doc.EndPage();- canvas = doc.BeginPage(pageWidth, pageHeight);- y = margin;- }-- if (string.IsNullOrWhiteSpace(line))- {- y += 14f;- continue;- }-- canvas.DrawText(line, margin, y, SkiaSharp.SKTextAlign.Left, font, paint);- y += 14f;- }-- doc.EndPage();- doc.Close();- }-private static string? DataUri(string path, string convertFolder) =>EbookFiles.CommonImage(path, convertFolder, gifAndSvg: true) is ({ } file, { } mediaType)? $"data:{mediaType};base64,{System.Convert.ToBase64String(File.ReadAllBytes(file))}"diff --git a/tests/Filee.App.Tests/EnginesPageTests.cs b/tests/Filee.App.Tests/EnginesPageTests.csindex 60513554..e4c2134a 100644--- a/tests/Filee.App.Tests/EnginesPageTests.cs+++ b/tests/Filee.App.Tests/EnginesPageTests.cs@@ -156,7 +156,7 @@ public class EnginesPageTestsAppHost.Get<EngineDownloadService>());try{- Assert.Equal(["libreoffice"], vm.Packages.Where(p => p.HasSettings).Select(p => p.Package.Id));+ Assert.Equal(["libreoffice", "translator"], vm.Packages.Where(p => p.HasSettings).Select(p => p.Package.Id));var options = new LibreOfficeOptionsWindow { DataContext = vm };options.Show();diff --git a/tests/Filee.Core.Tests/TranslateRouteTests.cs b/tests/Filee.Core.Tests/TranslateRouteTests.csindex a5c0e0d8..4c4b747c 100644--- a/tests/Filee.Core.Tests/TranslateRouteTests.cs+++ b/tests/Filee.Core.Tests/TranslateRouteTests.cs@@ -21,8 +21,6 @@ public class TranslateRouteTestsnew("md", "md", Cost: 10, Translate: true),new("txt", "txt", Cost: 10, Translate: true),new("docx", "docx", Cost: 10, Translate: true),- new("pdf", "pdf", Cost: 10, Translate: true),- new("json", "json", Cost: 10, Translate: true),new("epub", "docx", Cost: 12, Translate: true),];@@ -40,6 +38,7 @@ public class TranslateRouteTestsAssert.True(preset.Translate.Enabled);Assert.Equal(BuiltInData.SameAsSource, preset.TargetFormat);Assert.Equal("en", preset.Translate.TargetLanguage);+ Assert.Equal("{name}_translated", preset.Output.FileNamePattern);}[Theory]@@ -47,10 +46,10 @@ public class TranslateRouteTests[InlineData("md", true)][InlineData("txt", true)][InlineData("docx", true)]- [InlineData("pdf", true)]- [InlineData("json", true)]- [InlineData("yaml", true)]- [InlineData("srt", true)]+ [InlineData("pdf", false)]+ [InlineData("json", false)]+ [InlineData("yaml", false)]+ [InlineData("srt", false)][InlineData("png", false)][InlineData("mp4", false)][InlineData("zip", false)]@@ -88,5 +87,7 @@ public class TranslateRouteTestsAssert.Contains("translate", profiles.First(p => p.Id == "ebooks").BackPresetIds!);Assert.Contains("translate", profiles.First(p => p.Id == "text").BackPresetIds!);Assert.Contains("translate", profiles.First(p => p.Id == "office").BackPresetIds!);+ Assert.DoesNotContain("translate", profiles.First(p => p.Id == "pdf").BackPresetIds!);+ Assert.DoesNotContain("translate", profiles.First(p => p.Id == "hwp").BackPresetIds!);}}diff --git a/tests/Filee.Engines.Tests/TranslationIntegrationTests.cs b/tests/Filee.Engines.Tests/TranslationIntegrationTests.csindex 5a83705f..d3aae1cc 100644--- a/tests/Filee.Engines.Tests/TranslationIntegrationTests.cs+++ b/tests/Filee.Engines.Tests/TranslationIntegrationTests.cs@@ -1,7 +1,6 @@using Filee.Core.Conversion;using Filee.Core.Presets;using Filee.Engines.Translation;-using PdfSharp.Pdf.IO;using Xunit;namespace Filee.Engines.Tests;@@ -148,27 +147,27 @@ public class TranslationIntegrationTests}[Fact]- public async Task Translates_document_to_pdf_producing_valid_openable_pdf()+ public async Task Translates_document_to_docx_producing_valid_output(){- var tempDir = Path.Combine(Path.GetTempPath(), "filee-trans-pdf-" + Guid.NewGuid().ToString("N"));+ var tempDir = Path.Combine(Path.GetTempPath(), "filee-trans-docx-" + Guid.NewGuid().ToString("N"));Directory.CreateDirectory(tempDir);try{var inputFile = Path.Combine(tempDir, "document.txt");- var inputContent = "The Quick Brown Fox Jumps Over The Lazy Dog.\nThis is a sample document for translation into PDF.\n";+ var inputContent = "The Quick Brown Fox Jumps Over The Lazy Dog.\nThis is a sample document for translation into DOCX.\n";await File.WriteAllTextAsync(inputFile, inputContent);var preset = new Preset{Id = "translate",- TargetFormat = "pdf",+ TargetFormat = "docx",Translate = { Enabled = true, TargetLanguage = "es", SourceLanguage = "en" }};var step = new ConversionStep(inputFile,"txt",- "pdf",+ "docx",preset,new TestOutputAllocator(tempDir),tempDir,@@ -179,16 +178,9 @@ public class TranslationIntegrationTestsvar outputs = await converter.ConvertAsync(step, null, default);Assert.Single(outputs);- var pdfPath = outputs[0];- Assert.True(File.Exists(pdfPath));- Assert.True(new FileInfo(pdfPath).Length > 0);-- // Verify that the PDF is genuine, uncorrupted, and can be opened by PDF readers- var header = File.ReadAllBytes(pdfPath).Take(5).ToArray();- Assert.Equal("%PDF-", System.Text.Encoding.ASCII.GetString(header));-- using var pdfDoc = PdfReader.Open(pdfPath, PdfDocumentOpenMode.Import);- Assert.True(pdfDoc.PageCount > 0);+ var docxPath = outputs[0];+ Assert.True(File.Exists(docxPath));+ Assert.True(new FileInfo(docxPath).Length > 0);}finally{diff --git a/tests/Filee.Engines.Tests/TranslationTests.cs b/tests/Filee.Engines.Tests/TranslationTests.csindex b779b3ac..0528cfb3 100644--- a/tests/Filee.Engines.Tests/TranslationTests.cs+++ b/tests/Filee.Engines.Tests/TranslationTests.cs@@ -69,7 +69,7 @@ public class TranslationTestspublic async Task TranslationService_throws_when_no_local_engine_is_available(){var service = new TranslationService();- if (!await TranslationService.IsLocalOllamaAvailableAsync() && TranslationService.LocateLocalEngine() is null)+ if (!await TranslationService.IsLocalOllamaAvailableAsync()){await Assert.ThrowsAsync<InvalidOperationException>(() => service.TranslateTextAsync("Hello", "es", "en"));}