mirror of
https://github.com/cyanfish/naps2.git
synced 2024-10-04 11:27:08 +03:00
OCR rework WIP (compiling but not tested)
This commit is contained in:
Ben Olden-Cooligan
parent
3757a2839f
commit
6731f32c06
@ -35,7 +35,7 @@ namespace NAPS2.Automation
|
||||
private readonly ImageSettingsContainer imageSettingsContainer;
|
||||
private readonly IOperationFactory operationFactory;
|
||||
private readonly AppConfigManager appConfigManager;
|
||||
private readonly OcrDependencyManager ocrDependencyManager;
|
||||
private readonly OcrManager ocrManager;
|
||||
private readonly IFormFactory formFactory;
|
||||
|
||||
private readonly AutomatedScanningOptions options;
|
||||
@ -45,7 +45,7 @@ namespace NAPS2.Automation
|
||||
private DateTime startTime;
|
||||
private List<string> actualOutputPaths;
|
||||
|
||||
public AutomatedScanning(AutomatedScanningOptions options, IProfileManager profileManager, IScanPerformer scanPerformer, IErrorOutput errorOutput, IEmailProviderFactory emailProviderFactory, IScannedImageImporter scannedImageImporter, IUserConfigManager userConfigManager, PdfSettingsContainer pdfSettingsContainer, FileNamePlaceholders fileNamePlaceholders, ImageSettingsContainer imageSettingsContainer, IOperationFactory operationFactory, AppConfigManager appConfigManager, OcrDependencyManager ocrDependencyManager, IFormFactory formFactory)
|
||||
public AutomatedScanning(AutomatedScanningOptions options, IProfileManager profileManager, IScanPerformer scanPerformer, IErrorOutput errorOutput, IEmailProviderFactory emailProviderFactory, IScannedImageImporter scannedImageImporter, IUserConfigManager userConfigManager, PdfSettingsContainer pdfSettingsContainer, FileNamePlaceholders fileNamePlaceholders, ImageSettingsContainer imageSettingsContainer, IOperationFactory operationFactory, AppConfigManager appConfigManager, OcrManager ocrManager, IFormFactory formFactory)
|
||||
{
|
||||
this.options = options;
|
||||
this.profileManager = profileManager;
|
||||
@ -59,7 +59,7 @@ namespace NAPS2.Automation
|
||||
this.imageSettingsContainer = imageSettingsContainer;
|
||||
this.operationFactory = operationFactory;
|
||||
this.appConfigManager = appConfigManager;
|
||||
this.ocrDependencyManager = ocrDependencyManager;
|
||||
this.ocrManager = ocrManager;
|
||||
this.formFactory = formFactory;
|
||||
}
|
||||
|
||||
@ -149,29 +149,26 @@ namespace NAPS2.Automation
|
||||
|
||||
private void InstallComponents()
|
||||
{
|
||||
var availableComponents = new List<(DownloadInfo download, ExternalComponent component)>();
|
||||
if (ocrDependencyManager.Components.Tesseract304.IsSupported)
|
||||
var availableComponents = new List<ExternalComponent>();
|
||||
var ocrEngine = ocrManager.EngineToInstall;
|
||||
if (ocrEngine != null)
|
||||
{
|
||||
availableComponents.Add((ocrDependencyManager.Downloads.Tesseract304, ocrDependencyManager.Components.Tesseract304));
|
||||
availableComponents.Add(ocrEngine.Component);
|
||||
availableComponents.AddRange(ocrEngine.LanguageComponents);
|
||||
}
|
||||
else if (ocrDependencyManager.Components.Tesseract304Xp.IsSupported)
|
||||
if (GhostscriptPdfRenderer.Dependencies.GhostscriptComponent.IsSupported)
|
||||
{
|
||||
availableComponents.Add((ocrDependencyManager.Downloads.Tesseract304Xp, ocrDependencyManager.Components.Tesseract304Xp));
|
||||
availableComponents.Add(GhostscriptPdfRenderer.Dependencies.GhostscriptComponent);
|
||||
}
|
||||
foreach (var lang in ocrDependencyManager.Languages.Keys)
|
||||
{
|
||||
availableComponents.Add((ocrDependencyManager.Downloads.Tesseract304Languages[lang], ocrDependencyManager.Components.Tesseract304Languages[lang]));
|
||||
}
|
||||
availableComponents.Add((GhostscriptPdfRenderer.Dependencies.GhostscriptDownload, GhostscriptPdfRenderer.Dependencies.GhostscriptComponent));
|
||||
|
||||
var componentDict = availableComponents.ToDictionary(x => x.component.Id.ToLowerInvariant());
|
||||
var componentDict = availableComponents.ToDictionary(x => x.Id.ToLowerInvariant());
|
||||
var installId = options.Install.ToLowerInvariant();
|
||||
if (!componentDict.TryGetValue(installId, out var toInstall))
|
||||
{
|
||||
Console.WriteLine(ConsoleResources.ComponentNotAvailable);
|
||||
return;
|
||||
}
|
||||
if (toInstall.component.IsInstalled)
|
||||
if (toInstall.IsInstalled)
|
||||
{
|
||||
Console.WriteLine(ConsoleResources.ComponentAlreadyInstalled);
|
||||
return;
|
||||
@ -179,18 +176,18 @@ namespace NAPS2.Automation
|
||||
// Using a form here is not ideal (since this is supposed to be a console app), but good enough for now
|
||||
// Especially considering wia/twain often show forms anyway
|
||||
var progressForm = formFactory.Create<FDownloadProgress>();
|
||||
if (toInstall.component.Id.StartsWith("ocr-") && componentDict.TryGetValue("ocr", out var ocrExe) && !ocrExe.component.IsInstalled)
|
||||
if (toInstall.Id.StartsWith("ocr-", StringComparison.InvariantCulture) && componentDict.TryGetValue("ocr", out var ocrExe) && !ocrExe.IsInstalled)
|
||||
{
|
||||
progressForm.QueueFile(ocrExe.download, ocrExe.component.Install);
|
||||
progressForm.QueueFile(ocrExe);
|
||||
if (options.Verbose)
|
||||
{
|
||||
Console.WriteLine(ConsoleResources.Installing, ocrExe.component.Id);
|
||||
Console.WriteLine(ConsoleResources.Installing, ocrExe.Id);
|
||||
}
|
||||
}
|
||||
progressForm.QueueFile(toInstall.download, toInstall.component.Install);
|
||||
progressForm.QueueFile(toInstall);
|
||||
if (options.Verbose)
|
||||
{
|
||||
Console.WriteLine(ConsoleResources.Installing, toInstall.component.Id);
|
||||
Console.WriteLine(ConsoleResources.Installing, toInstall.Id);
|
||||
}
|
||||
progressForm.ShowDialog();
|
||||
}
|
||||
@ -526,7 +523,8 @@ namespace NAPS2.Automation
|
||||
var pdfSettings = new PdfSettings { Metadata = metadata, Encryption = encryption, Compat = compat };
|
||||
|
||||
bool useOcr = !options.DisableOcr && (options.EnableOcr || options.OcrLang != null || userConfigManager.Config.EnableOcr || appConfigManager.Config.OcrState == OcrState.Enabled);
|
||||
string ocrLanguageCode = useOcr ? (options.OcrLang ?? ocrDependencyManager.DefaultLanguageCode) : null;
|
||||
string ocrLanguageCode = useOcr ? (options.OcrLang ?? ocrManager.DefaultParams?.LanguageCode) : null;
|
||||
var ocrParams = new OcrParams(ocrLanguageCode, ocrManager.DefaultParams?.Mode ?? OcrMode.Default);
|
||||
|
||||
int scanIndex = 0;
|
||||
foreach (var fileContents in scanList)
|
||||
@ -543,7 +541,7 @@ namespace NAPS2.Automation
|
||||
};
|
||||
int digits = (int)Math.Floor(Math.Log10(scanList.Count)) + 1;
|
||||
string actualPath = fileNamePlaceholders.SubstitutePlaceholders(path, startTime, true, scanIndex++, scanList.Count > 1 ? digits : 0);
|
||||
op.Start(actualPath, startTime, fileContents, pdfSettings, ocrLanguageCode, email);
|
||||
op.Start(actualPath, startTime, fileContents, pdfSettings, ocrParams, email);
|
||||
op.WaitUntilFinished();
|
||||
if (!op.Status.Success)
|
||||
{
|
||||
|
||||
@ -6,10 +6,10 @@ namespace NAPS2.Dependencies
|
||||
{
|
||||
public class DownloadInfo
|
||||
{
|
||||
public DownloadInfo(string fileName, List<(PlatformSupport, string)> urlFormats, double size, string sha1, DownloadFormat format)
|
||||
public DownloadInfo(string fileName, List<DownloadMirror> mirrors, double size, string sha1, DownloadFormat format)
|
||||
{
|
||||
FileName = fileName;
|
||||
Urls = urlFormats.Where(x => x.Item1.Validate()).Select(x => string.Format(x.Item2, fileName)).ToList();
|
||||
Urls = mirrors.Where(x => x.IsSupported).Select(x => x.Url(fileName)).ToList();
|
||||
Size = size;
|
||||
Sha1 = sha1;
|
||||
Format = format;
|
||||
|
||||
25
NAPS2.Core/Dependencies/DownloadMirror.cs
Normal file
25
NAPS2.Core/Dependencies/DownloadMirror.cs
Normal file
@ -0,0 +1,25 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace NAPS2.Dependencies
|
||||
{
|
||||
public class DownloadMirror
|
||||
{
|
||||
private readonly PlatformSupport platformSupport;
|
||||
private readonly string urlFormat;
|
||||
|
||||
public DownloadMirror(PlatformSupport platformSupport, string urlFormat)
|
||||
{
|
||||
this.platformSupport = platformSupport;
|
||||
this.urlFormat = urlFormat;
|
||||
}
|
||||
|
||||
public bool IsSupported => platformSupport.Validate();
|
||||
|
||||
public string Url(string subpath)
|
||||
{
|
||||
return string.Format(urlFormat, subpath);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -74,22 +74,22 @@ namespace NAPS2.ImportExport.Pdf
|
||||
|
||||
public static class Dependencies
|
||||
{
|
||||
private static readonly List<(PlatformSupport, string)> UrlFormats = new List<(PlatformSupport, string)>
|
||||
private static readonly List<DownloadMirror> Mirrors = new List<DownloadMirror>
|
||||
{
|
||||
(PlatformSupport.ModernWindows, @"https://github.com/cyanfish/naps2-components/releases/download/gs-9.21/{0}"),
|
||||
(PlatformSupport.ModernWindows, @"https://sourceforge.net/projects/naps2/files/components/gs-9.21/{0}/download"),
|
||||
(PlatformSupport.WindowsXp, @"http://xp-mirror.naps2.com/gs-9.21/{0}")
|
||||
new DownloadMirror(PlatformSupport.ModernWindows, @"https://github.com/cyanfish/naps2-components/releases/download/gs-9.21/{0}"),
|
||||
new DownloadMirror(PlatformSupport.ModernWindows, @"https://sourceforge.net/projects/naps2/files/components/gs-9.21/{0}/download"),
|
||||
new DownloadMirror(PlatformSupport.WindowsXp, @"http://xp-mirror.naps2.com/gs-9.21/{0}")
|
||||
};
|
||||
|
||||
private static readonly DownloadInfo GhostscriptDownload32 = new DownloadInfo("gsdll32.dll.gz", UrlFormats, 10.39, "fd7446a05efaf467f5f6a7123c525b0fc7bde711", DownloadFormat.Gzip);
|
||||
private static readonly DownloadInfo GhostscriptDownload32 = new DownloadInfo("gsdll32.dll.gz", Mirrors, 10.39, "fd7446a05efaf467f5f6a7123c525b0fc7bde711", DownloadFormat.Gzip);
|
||||
|
||||
private static readonly DownloadInfo GhostscriptDownload64 = new DownloadInfo("gsdll64.dll.gz", UrlFormats, 10.78, "de173f9020c21784727f8c749190d610e4856a0c", DownloadFormat.Gzip);
|
||||
private static readonly DownloadInfo GhostscriptDownload64 = new DownloadInfo("gsdll64.dll.gz", Mirrors, 10.78, "de173f9020c21784727f8c749190d610e4856a0c", DownloadFormat.Gzip);
|
||||
|
||||
public static DownloadInfo GhostscriptDownload => Environment.Is64BitProcess ? GhostscriptDownload64 : GhostscriptDownload32;
|
||||
|
||||
private static readonly ExternalComponent GhostscriptComponent32 = new ExternalComponent("generic-import", Path.Combine("gs-9.21", "gsdll32.dll"), PlatformSupport.Windows);
|
||||
private static readonly ExternalComponent GhostscriptComponent32 = new ExternalComponent("generic-import", Path.Combine(ExternalComponent.BasePath, "gs-9.21", "gsdll32.dll"), PlatformSupport.Windows);
|
||||
|
||||
private static readonly ExternalComponent GhostscriptComponent64 = new ExternalComponent("generic-import", Path.Combine("gs-9.21", "gsdll64.dll"), PlatformSupport.Windows);
|
||||
private static readonly ExternalComponent GhostscriptComponent64 = new ExternalComponent("generic-import", Path.Combine(ExternalComponent.BasePath, "gs-9.21", "gsdll64.dll"), PlatformSupport.Windows);
|
||||
|
||||
public static ExternalComponent GhostscriptComponent => Environment.Is64BitProcess ? GhostscriptComponent64 : GhostscriptComponent32;
|
||||
}
|
||||
|
||||
@ -127,6 +127,7 @@
|
||||
<Compile Include="Automation\ConsoleOverwritePrompt.cs" />
|
||||
<Compile Include="Automation\ConsolePdfPasswordProvider.cs" />
|
||||
<Compile Include="Automation\ConsoleComponentInstallPrompt.cs" />
|
||||
<Compile Include="Dependencies\DownloadMirror.cs" />
|
||||
<Compile Include="Dependencies\ExternalSystemComponent.cs" />
|
||||
<Compile Include="Dependencies\IExternalComponent.cs" />
|
||||
<Compile Include="Ocr\OcrManager.cs" />
|
||||
@ -293,7 +294,6 @@
|
||||
<Compile Include="Util\NullLogger.cs" />
|
||||
<Compile Include="Ocr\IOcrEngine.cs" />
|
||||
<Compile Include="Ocr\TesseractBaseEngine.cs" />
|
||||
<Compile Include="Ocr\OcrDependencyManager.cs" />
|
||||
<Compile Include="Ocr\OcrResult.cs" />
|
||||
<Compile Include="Ocr\OcrResultElement.cs" />
|
||||
<Compile Include="Scan\Exceptions\NoFeederSupportException.cs" />
|
||||
|
||||
@ -21,6 +21,8 @@ namespace NAPS2.Ocr
|
||||
|
||||
IEnumerable<Language> InstalledLanguages { get; }
|
||||
|
||||
IEnumerable<Language> NotInstalledLanguages { get; }
|
||||
|
||||
ExternalComponent Component { get; }
|
||||
|
||||
IEnumerable<ExternalComponent> LanguageComponents { get; }
|
||||
|
||||
@ -1,275 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using NAPS2.Config;
|
||||
using NAPS2.Dependencies;
|
||||
|
||||
namespace NAPS2.Ocr
|
||||
{
|
||||
public class OcrDependencyManager
|
||||
{
|
||||
private readonly AppConfigManager appConfigManager;
|
||||
private readonly IUserConfigManager userConfigManager;
|
||||
|
||||
public OcrDependencyManager(AppConfigManager appConfigManager, IUserConfigManager userConfigManager)
|
||||
{
|
||||
this.appConfigManager = appConfigManager;
|
||||
this.userConfigManager = userConfigManager;
|
||||
ExternalComponent.InitBasePath(appConfigManager);
|
||||
Components = new OcrComponents();
|
||||
Downloads = new OcrDownloads();
|
||||
}
|
||||
|
||||
public readonly OcrComponents Components;
|
||||
|
||||
public readonly OcrDownloads Downloads;
|
||||
|
||||
public string DefaultLanguageCode
|
||||
{
|
||||
get
|
||||
{
|
||||
// Prioritize app-level overrides
|
||||
if (appConfigManager.Config.OcrState == OcrState.Disabled)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (appConfigManager.Config.OcrState == OcrState.Enabled)
|
||||
{
|
||||
// Prioritize the app-level language
|
||||
if (!string.IsNullOrWhiteSpace(appConfigManager.Config.OcrDefaultLanguage))
|
||||
{
|
||||
return appConfigManager.Config.OcrDefaultLanguage;
|
||||
}
|
||||
// Fall back to the user-selected language
|
||||
if (!string.IsNullOrWhiteSpace(userConfigManager.Config.OcrLanguageCode))
|
||||
{
|
||||
return userConfigManager.Config.OcrLanguageCode;
|
||||
}
|
||||
// Fall back to an arbitrary installed language (probably there is only one)
|
||||
return InstalledTesseractLanguages.OrderBy(x => x.Name).Select(x => x.Code).FirstOrDefault();
|
||||
}
|
||||
// No overrides, so prioritize the user settings
|
||||
if (userConfigManager.Config.EnableOcr)
|
||||
{
|
||||
// Prioritize the user-selected language
|
||||
if (!string.IsNullOrWhiteSpace(userConfigManager.Config.OcrLanguageCode))
|
||||
{
|
||||
return userConfigManager.Config.OcrLanguageCode;
|
||||
}
|
||||
// Fall back to the app-level language
|
||||
if (!string.IsNullOrWhiteSpace(appConfigManager.Config.OcrDefaultLanguage))
|
||||
{
|
||||
return appConfigManager.Config.OcrDefaultLanguage;
|
||||
}
|
||||
// Fall back to an arbitrary installed language (probably there is only one)
|
||||
return InstalledTesseractLanguages.OrderBy(x => x.Name).Select(x => x.Code).FirstOrDefault();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public bool HasInstalledTesseractExe => Components.Tesseract304Xp.IsInstalled ||
|
||||
Components.Tesseract304.IsInstalled ||
|
||||
Components.Tesseract302.IsInstalled ||
|
||||
Components.Tesseract304Linux.IsInstalled;
|
||||
|
||||
public IExternalComponent InstalledAndSupportedTesseractExe
|
||||
{
|
||||
get
|
||||
{
|
||||
IExternalComponent InstalledAndSupported(IExternalComponent component)
|
||||
{
|
||||
return component.IsInstalled && component.IsSupported ? component : null;
|
||||
}
|
||||
return InstalledAndSupported(Components.Tesseract304Xp) ??
|
||||
InstalledAndSupported(Components.Tesseract304) ??
|
||||
InstalledAndSupported(Components.Tesseract302) ??
|
||||
InstalledAndSupported(Components.Tesseract304Linux);
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerable<Language> InstalledTesseractLanguages
|
||||
{
|
||||
get
|
||||
{
|
||||
var languageComponents = HasNewTesseractExe
|
||||
? Components.Tesseract304Languages
|
||||
: Components.Tesseract302Languages;
|
||||
return languageComponents.Where(x => x.Value.IsInstalled).Select(x => Languages[x.Key]);
|
||||
}
|
||||
}
|
||||
|
||||
public bool HasNewTesseractExe => Components.Tesseract304.IsInstalled ||
|
||||
Components.Tesseract304Xp.IsInstalled ||
|
||||
Components.Tesseract304Linux.IsInstalled;
|
||||
|
||||
public bool IsOcrSupported => PlatformSupport.Windows.Or(PlatformSupport.Linux).Validate();
|
||||
|
||||
public bool TesseractExeRequiresFix => HasInstalledTesseractExe && InstalledAndSupportedTesseractExe == null && IsOcrSupported;
|
||||
|
||||
#region Language Data (auto-generated)
|
||||
|
||||
private static readonly OcrLanguage[] LanguageData =
|
||||
{
|
||||
new OcrLanguage { Filename = "afr.traineddata.gz", Code = "afr", LangName = "Afrikaans", Size = 1.93, Sha1 = "a669186130bf1fc6c78226ac868c82b70a44c70b" },
|
||||
new OcrLanguage { Filename = "amh.traineddata.gz", Code = "amh", LangName = "Amharic", Size = 1.03, Sha1 = "1153cbbac7306d42e72ca639ff3f36f45dcb15a2" },
|
||||
new OcrLanguage { Filename = "ara.traineddata.gz", Code = "ara", LangName = "Arabic", Size = 1.62, Sha1 = "87b76c73fdcc4c54ec1f03d83b6df665430c2b06", RTL = true },
|
||||
new OcrLanguage { Filename = "asm.traineddata.gz", Code = "asm", LangName = "Assamese", Size = 6.56, Sha1 = "223900790d10f638b7dca2a8b8e8a15295d1f19c" },
|
||||
new OcrLanguage { Filename = "aze.traineddata.gz", Code = "aze", LangName = "Azerbaijani", Size = 2.54, Sha1 = "01607e49fe6ba6604f65d9b57c77b403ab74040a" },
|
||||
new OcrLanguage { Filename = "aze_cyrl.traineddata.gz", Code = "aze_cyrl", LangName = "Azerbaijani (Cyrillic)", Size = 0.97, Sha1 = "f9c9b153e8825bb92d9c8005342ac3d5ea81d0bc" },
|
||||
new OcrLanguage { Filename = "bel.traineddata.gz", Code = "bel", LangName = "Belarusian", Size = 2.43, Sha1 = "3ac0935dd22f4f2730286d5cb127324d27718410" },
|
||||
new OcrLanguage { Filename = "ben.traineddata.gz", Code = "ben", LangName = "Bengali", Size = 6.45, Sha1 = "479674b283db6e84fdfb17386056f2e9a5b41b9c" },
|
||||
new OcrLanguage { Filename = "bod.traineddata.gz", Code = "bod", LangName = "Tibetan", Size = 10.74, Sha1 = "3ff199544dc9e7994658231cbc999878e23463db" },
|
||||
new OcrLanguage { Filename = "bos.traineddata.gz", Code = "bos", LangName = "Bosnian", Size = 1.87, Sha1 = "9d0bb89c53251789bba06de1452cf1a74d978f35" },
|
||||
new OcrLanguage { Filename = "bul.traineddata.gz", Code = "bul", LangName = "Bulgarian", Size = 2.20, Sha1 = "ac0481cc1fe62c3af5a34d57fa1571dfd2a95865" },
|
||||
new OcrLanguage { Filename = "cat.traineddata.gz", Code = "cat", LangName = "Catalan", Size = 1.97, Sha1 = "e1e1dc2e37f6b085bdefdb9d0d63d3ad086ef1f4" },
|
||||
new OcrLanguage { Filename = "ceb.traineddata.gz", Code = "ceb", LangName = "Cebuano", Size = 0.58, Sha1 = "f867102f828b6495996370eea6ed8688af219b17" },
|
||||
new OcrLanguage { Filename = "ces.traineddata.gz", Code = "ces", LangName = "Czech", Size = 4.65, Sha1 = "155f60a0994f1590d3d3ba29ec1a5bca3f16efdd" },
|
||||
new OcrLanguage { Filename = "chi_sim.traineddata.gz", Code = "chi_sim", LangName = "Chinese (Simplified)", Size = 17.60, Sha1 = "9bd65dcecd2581e8f588cec11cd1e2f754885fcb" },
|
||||
new OcrLanguage { Filename = "chi_tra.traineddata.gz", Code = "chi_tra", LangName = "Chinese (Traditional)", Size = 24.11, Sha1 = "5abef9af8a4fd83a0d156ee2e1d5234c80bb836b" },
|
||||
new OcrLanguage { Filename = "chr.traineddata.gz", Code = "chr", LangName = "Cherokee", Size = 0.36, Sha1 = "d3677cb6c57ec1b14625a5594dad159a1ad9ec93" },
|
||||
new OcrLanguage { Filename = "cym.traineddata.gz", Code = "cym", LangName = "Welsh", Size = 1.36, Sha1 = "a5d5733d45710f6da1c4b19f0903bf5edb10a484" },
|
||||
new OcrLanguage { Filename = "dan.traineddata.gz", Code = "dan", LangName = "Danish", Size = 2.76, Sha1 = "eb813b0c299261b9535a2c684e51f159f05ae8ea" },
|
||||
new OcrLanguage { Filename = "dan_frak.traineddata.gz", Code = "dan_frak", LangName = "Danish (Fraktur)", Size = 0.65, Sha1 = "dcb540024688da096399e52ff9826aad1d71479c" },
|
||||
new OcrLanguage { Filename = "deu.traineddata.gz", Code = "deu", LangName = "German", Size = 5.48, Sha1 = "f575f3fcb554077b906aaaac8850d5bd56967cbd" },
|
||||
new OcrLanguage { Filename = "deu_frak.traineddata.gz", Code = "deu_frak", LangName = "German (Fraktur)", Size = 0.78, Sha1 = "28ac257129f881b3a09c099004048bf6de4bc952" },
|
||||
new OcrLanguage { Filename = "dzo.traineddata.gz", Code = "dzo", LangName = "Dzongkha", Size = 1.32, Sha1 = "6eb0c943242e4d906cbebec2cf43b2ca63979424" },
|
||||
new OcrLanguage { Filename = "ell.traineddata.gz", Code = "ell", LangName = "Greek", Size = 2.00, Sha1 = "e54ab7455c1d4715652253321f693e221b61ac8b" },
|
||||
new OcrLanguage { Filename = "eng.traineddata.gz", Code = "eng", LangName = "English", Size = 9.02, Sha1 = "36bfd5953540b3c294c62402e303f381cee156f3" },
|
||||
new OcrLanguage { Filename = "enm.traineddata.gz", Code = "enm", LangName = "Middle English (1100-1500)", Size = 0.77, Sha1 = "02486b802f4f83b5d9198309955cbf4aa38e5e05" },
|
||||
new OcrLanguage { Filename = "epo.traineddata.gz", Code = "epo", LangName = "Esperanto", Size = 2.42, Sha1 = "465dfb934eb45116ebe7f3c4e3adf28826e49dca" },
|
||||
new OcrLanguage { Filename = "equ.traineddata.gz", Code = "equ", LangName = "Math / equation detection", Size = 0.78, Sha1 = "c9bc582875cf7c7903b529a9cdb0b9f4669b840d" },
|
||||
new OcrLanguage { Filename = "est.traineddata.gz", Code = "est", LangName = "Estonian", Size = 3.62, Sha1 = "d743f2456fa32ce7bbbb80cb40951eb742692596" },
|
||||
new OcrLanguage { Filename = "eus.traineddata.gz", Code = "eus", LangName = "Basque", Size = 1.83, Sha1 = "d991552b861e5ea1dca59ffca7e295b323e62bbf" },
|
||||
new OcrLanguage { Filename = "fas.traineddata.gz", Code = "fas", LangName = "Persian", Size = 1.75, Sha1 = "c8a7a6b11c3f455b07a397af2e51705a68ff5f77", RTL = true },
|
||||
new OcrLanguage { Filename = "fin.traineddata.gz", Code = "fin", LangName = "Finnish", Size = 4.98, Sha1 = "90232ad3572901a35bd4bbc736d47184171fa0fd" },
|
||||
new OcrLanguage { Filename = "fra.traineddata.gz", Code = "fra", LangName = "French", Size = 5.65, Sha1 = "2bebc5a4c981443c1cbff254e0ca3120004a6c7b" },
|
||||
new OcrLanguage { Filename = "frk.traineddata.gz", Code = "frk", LangName = "Frankish", Size = 6.64, Sha1 = "1a6984f8b5768ae663f293ea04594fca229bdb16" },
|
||||
new OcrLanguage { Filename = "frm.traineddata.gz", Code = "frm", LangName = "Middle French (ca. 1400-1600)", Size = 6.34, Sha1 = "64e0c6e00352833b206f8b26b6410d0d544b798d" },
|
||||
new OcrLanguage { Filename = "gle.traineddata.gz", Code = "gle", LangName = "Irish", Size = 1.25, Sha1 = "994c111e9c24e74bf7105f42a3e39d87ea24f258" },
|
||||
new OcrLanguage { Filename = "glg.traineddata.gz", Code = "glg", LangName = "Galician", Size = 2.04, Sha1 = "201c627e518099c15dbbecd72e6e4782e389f619" },
|
||||
new OcrLanguage { Filename = "grc.traineddata.gz", Code = "grc", LangName = "Ancient Greek", Size = 1.88, Sha1 = "ae58a943620c485d33ba95b3fcaca79314105d56" },
|
||||
new OcrLanguage { Filename = "guj.traineddata.gz", Code = "guj", LangName = "Gujarati", Size = 4.39, Sha1 = "f469d7257f39dcdd0668d768886f19084816b10e" },
|
||||
new OcrLanguage { Filename = "hat.traineddata.gz", Code = "hat", LangName = "Haitian", Size = 0.49, Sha1 = "1667e25ebfe6dc74695af413f291e20f1eec552a" },
|
||||
new OcrLanguage { Filename = "heb.traineddata.gz", Code = "heb", LangName = "Hebrew", Size = 1.51, Sha1 = "64401c999ef08d6190a11a4347c8f9acf40a8e50", RTL = true },
|
||||
new OcrLanguage { Filename = "hin.traineddata.gz", Code = "hin", LangName = "Hindi", Size = 6.28, Sha1 = "dae6a9a729ad84eded87fef69004d89249170d44" },
|
||||
new OcrLanguage { Filename = "hrv.traineddata.gz", Code = "hrv", LangName = "Croatian", Size = 3.33, Sha1 = "b05db705553607afe3d3f2385dc7f272f348a59c" },
|
||||
new OcrLanguage { Filename = "hun.traineddata.gz", Code = "hun", LangName = "Hungarian", Size = 4.62, Sha1 = "250f8b5ad6464e3f0ad8694c0b54392cf6c9d73b" },
|
||||
new OcrLanguage { Filename = "iku.traineddata.gz", Code = "iku", LangName = "Inuktitut", Size = 0.30, Sha1 = "119af8b174547aa9cb00f04512d4960d523863ad" },
|
||||
new OcrLanguage { Filename = "ind.traineddata.gz", Code = "ind", LangName = "Indonesian", Size = 2.51, Sha1 = "f46f56473ba850408499678c349bdb6dc544dc67" },
|
||||
new OcrLanguage { Filename = "isl.traineddata.gz", Code = "isl", LangName = "Icelandic", Size = 2.28, Sha1 = "54004c851361c36ddf48b4443caf79188fa757b6" },
|
||||
new OcrLanguage { Filename = "ita.traineddata.gz", Code = "ita", LangName = "Italian", Size = 5.40, Sha1 = "1730f0e32cad3bd76a4f58de67d7c8e2cde17b51" },
|
||||
new OcrLanguage { Filename = "ita_old.traineddata.gz", Code = "ita_old", LangName = "Italian (Old)", Size = 5.35, Sha1 = "b7a4293b464cbcce08fd5dc15a9831cff888cdf0" },
|
||||
new OcrLanguage { Filename = "jav.traineddata.gz", Code = "jav", LangName = "Javanese", Size = 1.60, Sha1 = "3caa600f063705a2649be289038f381ecdaa8989" },
|
||||
new OcrLanguage { Filename = "jpn.traineddata.gz", Code = "jpn", LangName = "Japanese", Size = 13.65, Sha1 = "7545927e6c60888a61556af4247e81c7a08cc17d" },
|
||||
new OcrLanguage { Filename = "kan.traineddata.gz", Code = "kan", LangName = "Kannada", Size = 15.12, Sha1 = "53d26da4fde19b5663f4e7748809ba4baf12fe96" },
|
||||
new OcrLanguage { Filename = "kat.traineddata.gz", Code = "kat", LangName = "Georgian", Size = 2.23, Sha1 = "8c48267883781ad2278f052259fe4094c64ef9bb" },
|
||||
new OcrLanguage { Filename = "kat_old.traineddata.gz", Code = "kat_old", LangName = "Georgian (Old)", Size = 0.19, Sha1 = "88e8312c3fc30ba03811d5d571e44158bc0ab5bf" },
|
||||
new OcrLanguage { Filename = "kaz.traineddata.gz", Code = "kaz", LangName = "Kazakh", Size = 1.65, Sha1 = "45c6603afcfe4d81990439df3bed13dd1b4c654b" },
|
||||
new OcrLanguage { Filename = "khm.traineddata.gz", Code = "khm", LangName = "Central Khmer", Size = 20.96, Sha1 = "d5a542959114b154db4db61419cd57aba1e3cf5a" },
|
||||
new OcrLanguage { Filename = "kir.traineddata.gz", Code = "kir", LangName = "Kirghiz", Size = 2.02, Sha1 = "ee9ba20cde7597688140fc43b14e49417d1052b7" },
|
||||
new OcrLanguage { Filename = "kor.traineddata.gz", Code = "kor", LangName = "Korean", Size = 5.11, Sha1 = "39b452ede31b196c66442ea580b5664377eabdab" },
|
||||
new OcrLanguage { Filename = "kur.traineddata.gz", Code = "kur", LangName = "Kurdish", Size = 0.73, Sha1 = "a36683c3f62415e1d12529b7642b9463c880db0c", RTL = true },
|
||||
new OcrLanguage { Filename = "lao.traineddata.gz", Code = "lao", LangName = "Lao", Size = 8.70, Sha1 = "95dbad397571d2d2c13ed63ddc16a51fca343cfb" },
|
||||
new OcrLanguage { Filename = "lat.traineddata.gz", Code = "lat", LangName = "Latin", Size = 2.04, Sha1 = "43dc27088ecce88915f6de15c7f6ec9037eebfee" },
|
||||
new OcrLanguage { Filename = "lav.traineddata.gz", Code = "lav", LangName = "Latvian", Size = 2.91, Sha1 = "db4e13d875a4c88bd6d8873a7db95fcbd7f9114b" },
|
||||
new OcrLanguage { Filename = "lit.traineddata.gz", Code = "lit", LangName = "Lithuanian", Size = 3.28, Sha1 = "fae20b8933a2c49fb9d98539299c7452d530514a" },
|
||||
new OcrLanguage { Filename = "mal.traineddata.gz", Code = "mal", LangName = "Malayalam", Size = 3.49, Sha1 = "77a6553e0a37ddf5935a4e81b918850b8babb379" },
|
||||
new OcrLanguage { Filename = "mar.traineddata.gz", Code = "mar", LangName = "Marathi", Size = 5.85, Sha1 = "36297ba7adad4e476815a1ab962b556994e85196" },
|
||||
new OcrLanguage { Filename = "mkd.traineddata.gz", Code = "mkd", LangName = "Macedonian", Size = 1.36, Sha1 = "63a9ce25d9e2ce9e169ac17e422564809be21fb2" },
|
||||
new OcrLanguage { Filename = "mlt.traineddata.gz", Code = "mlt", LangName = "Maltese", Size = 1.96, Sha1 = "18cb93ee612c4c7989c005cdf3a228c4e524db67" },
|
||||
new OcrLanguage { Filename = "msa.traineddata.gz", Code = "msa", LangName = "Malay", Size = 2.47, Sha1 = "a40a2af1a06db7cbf4ecef903bff645d7ee3cfc3" },
|
||||
new OcrLanguage { Filename = "mya.traineddata.gz", Code = "mya", LangName = "Burmese", Size = 29.36, Sha1 = "f5875d22dc164da4176856ced8521790dfa986a8" },
|
||||
new OcrLanguage { Filename = "nep.traineddata.gz", Code = "nep", LangName = "Nepali", Size = 6.53, Sha1 = "55940992c6269123a49c0f0f616d766f9cb3aa4c" },
|
||||
new OcrLanguage { Filename = "nld.traineddata.gz", Code = "nld", LangName = "Dutch", Size = 6.83, Sha1 = "7a19402e128c97ffb5044780c055344e4b92cceb" },
|
||||
new OcrLanguage { Filename = "nor.traineddata.gz", Code = "nor", LangName = "Norwegian", Size = 3.14, Sha1 = "33fd288a93a5260954b0fca37894ce50d8872971" },
|
||||
new OcrLanguage { Filename = "ori.traineddata.gz", Code = "ori", LangName = "Oriya", Size = 3.06, Sha1 = "cc4951bf162f3e06f83a7f63868dc0ba2a86c83c" },
|
||||
// new OcrLanguage { Filename = "osd.traineddata.gz", Code = "osd", LangName = "", Size = 4.08, Sha1 = "d8c10c1fca9b954ca2500e6abeee94b50329f486" },
|
||||
new OcrLanguage { Filename = "pan.traineddata.gz", Code = "pan", LangName = "Panjabi", Size = 4.06, Sha1 = "ec846c1a93576f85878de4b06fa82241782cf2a4" },
|
||||
new OcrLanguage { Filename = "pol.traineddata.gz", Code = "pol", LangName = "Polish", Size = 5.41, Sha1 = "55a31b8724722219ce80f0a75685f267ae221d3d" },
|
||||
new OcrLanguage { Filename = "por.traineddata.gz", Code = "por", LangName = "Portuguese", Size = 5.06, Sha1 = "c486d3ba8ad2d7555f894352313f4c5cfb287dca" },
|
||||
new OcrLanguage { Filename = "pus.traineddata.gz", Code = "pus", LangName = "Pushto", Size = 0.88, Sha1 = "c45f471412ae0a7b4ed92141c828963911fa5f15" },
|
||||
new OcrLanguage { Filename = "ron.traineddata.gz", Code = "ron", LangName = "Romanian", Size = 2.99, Sha1 = "e21ef667ff7bb90904cf0d731ebe184854cde616" },
|
||||
new OcrLanguage { Filename = "rus.traineddata.gz", Code = "rus", LangName = "Russian", Size = 6.05, Sha1 = "96d7897ddecc7f944b5c1751e9ff44416cc3ee21" },
|
||||
new OcrLanguage { Filename = "san.traineddata.gz", Code = "san", LangName = "Sanskrit", Size = 9.52, Sha1 = "c324b96fc4f1dcd2295329081f18be98e1c71053" },
|
||||
new OcrLanguage { Filename = "sin.traineddata.gz", Code = "sin", LangName = "Sinhala", Size = 2.60, Sha1 = "145f8b7da56fe12340d4a0ce3f0c1385e437398c" },
|
||||
new OcrLanguage { Filename = "slk.traineddata.gz", Code = "slk", LangName = "Slovakian", Size = 3.45, Sha1 = "abe9737fb49c9284a10cbb87b9efa773234af5c3" },
|
||||
new OcrLanguage { Filename = "slk_frak.traineddata.gz", Code = "slk_frak", LangName = "Slovakian (Fraktur)", Size = 0.28, Sha1 = "e12b4fd2b4d2739656ed28142ba5db081d49fce2" },
|
||||
new OcrLanguage { Filename = "slv.traineddata.gz", Code = "slv", LangName = "Slovenian", Size = 2.47, Sha1 = "d94468d01fec2bbcb8be23e97ec5329ef58c541f" },
|
||||
new OcrLanguage { Filename = "spa.traineddata.gz", Code = "spa", LangName = "Spanish", Size = 6.31, Sha1 = "89160dbb92dbb5bcd6c48237315f6aa892450ef1" },
|
||||
new OcrLanguage { Filename = "spa_old.traineddata.gz", Code = "spa_old", LangName = "Spanish (Old)", Size = 6.57, Sha1 = "9d13656da6a91ca4717f9235340f0304c7f77110" },
|
||||
new OcrLanguage { Filename = "sqi.traineddata.gz", Code = "sqi", LangName = "Albanian", Size = 2.40, Sha1 = "30957e11c55610634dfdd2704ff0d6036c2e4ca5" },
|
||||
new OcrLanguage { Filename = "srp.traineddata.gz", Code = "srp", LangName = "Serbian", Size = 1.56, Sha1 = "5a7ef0c3c37d7f1891bde5a96b92b2fd3e48783a" },
|
||||
new OcrLanguage { Filename = "srp_latn.traineddata.gz", Code = "srp_latn", LangName = "Serbian (Latin)", Size = 2.27, Sha1 = "2aa8ff0e22440d3aab1a59e47b416bcd7ab2e7ae" },
|
||||
new OcrLanguage { Filename = "swa.traineddata.gz", Code = "swa", LangName = "Swahili", Size = 1.43, Sha1 = "6010b9255c1cd98c8bda39cd18904bf7782942e1" },
|
||||
new OcrLanguage { Filename = "swe.traineddata.gz", Code = "swe", LangName = "Swedish", Size = 3.64, Sha1 = "1bd6fd11f36b3ca04342a521773179269c5410e3" },
|
||||
new OcrLanguage { Filename = "syr.traineddata.gz", Code = "syr", LangName = "Syriac", Size = 1.06, Sha1 = "01aa53fd62897bcbfc053401405485d6f6aa9df9" },
|
||||
new OcrLanguage { Filename = "tam.traineddata.gz", Code = "tam", LangName = "Tamil", Size = 1.99, Sha1 = "eaca5e8c91d7995894ff2dafc4b824f305d6fff0" },
|
||||
new OcrLanguage { Filename = "tel.traineddata.gz", Code = "tel", LangName = "Telugu", Size = 16.81, Sha1 = "1f5b1e2f3d8a772b406e4a2b9d8ec38f1eec4cc6" },
|
||||
new OcrLanguage { Filename = "tgk.traineddata.gz", Code = "tgk", LangName = "Tajik", Size = 0.40, Sha1 = "b839d70a88e1dc2a019d1b7e76b83e5dcb0df440" },
|
||||
new OcrLanguage { Filename = "tgl.traineddata.gz", Code = "tgl", LangName = "Tagalog", Size = 1.56, Sha1 = "0bdbb9e5f763ebfeef8fc9cd0ba1913bd7309755" },
|
||||
new OcrLanguage { Filename = "tha.traineddata.gz", Code = "tha", LangName = "Thai", Size = 5.61, Sha1 = "7a171182716c99c19c1cc9b934a70ef5bee7893a" },
|
||||
new OcrLanguage { Filename = "tir.traineddata.gz", Code = "tir", LangName = "Tigrinya", Size = 0.60, Sha1 = "4292700b180a505c4a45666a13eac6e144b48615" },
|
||||
new OcrLanguage { Filename = "tur.traineddata.gz", Code = "tur", LangName = "Turkish", Size = 5.61, Sha1 = "8d72dc5ec5f22073f6b3ae2f79534e36aa8f63e8" },
|
||||
new OcrLanguage { Filename = "uig.traineddata.gz", Code = "uig", LangName = "Uighur", Size = 0.72, Sha1 = "d20262f24476229539b4b87efa9327428052b241" },
|
||||
new OcrLanguage { Filename = "ukr.traineddata.gz", Code = "ukr", LangName = "Ukrainian", Size = 2.92, Sha1 = "0871744dfacfa446e212e5c7e671c790b5fdd2f0" },
|
||||
new OcrLanguage { Filename = "urd.traineddata.gz", Code = "urd", LangName = "Urdu", Size = 1.83, Sha1 = "be2964ca83114ee04b3a258e71525b8a1a670c97", RTL = true },
|
||||
new OcrLanguage { Filename = "uzb.traineddata.gz", Code = "uzb", LangName = "Uzbek", Size = 1.55, Sha1 = "8de3127c90628514d61c0ded9510d4b2728f4b69" },
|
||||
new OcrLanguage { Filename = "uzb_cyrl.traineddata.gz", Code = "uzb_cyrl", LangName = "Uzbek (Cyrillic)", Size = 1.19, Sha1 = "e1190d147d6ce3770d768724c82e103b06c93061" },
|
||||
new OcrLanguage { Filename = "vie.traineddata.gz", Code = "vie", LangName = "Vietnamese", Size = 2.27, Sha1 = "571e132cd3ed26f5c33943efe7aa17835d277a15" },
|
||||
new OcrLanguage { Filename = "yid.traineddata.gz", Code = "yid", LangName = "Yiddish", Size = 1.60, Sha1 = "0dbb6e19b660b57283f954eb5183cc2f3677fdda" },
|
||||
};
|
||||
|
||||
#endregion
|
||||
|
||||
public readonly IDictionary<string, Language> Languages = LanguageData.ToDictionary(x => x.Code, x => new Language(x.Code, x.LangName, x.RTL));
|
||||
|
||||
public class OcrComponents
|
||||
{
|
||||
public readonly ExternalSystemComponent Tesseract304Linux = new ExternalSystemComponent("tesseract", "tesseract-3.0.4", PlatformSupport.Linux);
|
||||
|
||||
public readonly ExternalComponent Tesseract304Xp = new ExternalComponent("ocr", Path.Combine("tesseract-3.0.4", "tesseract_xp.exe"), PlatformSupport.Windows);
|
||||
|
||||
public readonly ExternalComponent Tesseract304 = new ExternalComponent("ocr", Path.Combine("tesseract-3.0.4", "tesseract.exe"), PlatformSupport.Windows.Except(PlatformSupport.WindowsXp));
|
||||
|
||||
public readonly ExternalComponent Tesseract302 = new ExternalComponent("ocr", Path.Combine("tesseract-3.0.2", "tesseract.exe"), PlatformSupport.Windows);
|
||||
|
||||
public readonly IDictionary<string, ExternalComponent> Tesseract304Languages = LanguageData.ToDictionary(x => x.Code, x => new ExternalComponent($"ocr-{x.Code}", Path.Combine("tesseract-3.0.4", "tessdata", x.Filename.Replace(".gz", ""))));
|
||||
|
||||
// The set of 302 languages is actually smaller, but that has no practical effect so we don't have to store the difference anywhere
|
||||
public readonly IDictionary<string, ExternalComponent> Tesseract302Languages = LanguageData.ToDictionary(x => x.Code, x => new ExternalComponent($"ocr-{x.Code}", Path.Combine("tesseract-3.0.2", "tessdata", x.Filename.Replace(".gz", ""))));
|
||||
}
|
||||
|
||||
public class OcrDownloads
|
||||
{
|
||||
private static readonly List<(PlatformSupport, string)> UrlFormats = new List<(PlatformSupport, string)>
|
||||
{
|
||||
(PlatformSupport.ModernWindows.Or(PlatformSupport.Linux), @"https://github.com/cyanfish/naps2-components/releases/download/tessseract-3.04/{0}"),
|
||||
(PlatformSupport.ModernWindows.Or(PlatformSupport.Linux), @"https://sourceforge.net/projects/naps2/files/components/tesseract-3.04/{0}/download"),
|
||||
(PlatformSupport.WindowsXp, @"http://xp-mirror.naps2.com/tesseract-3.04/{0}")
|
||||
};
|
||||
|
||||
public readonly DownloadInfo Tesseract304Xp = new DownloadInfo("tesseract_xp.exe.gz", UrlFormats, 1.32, "98d15e4765caae864f16fa2ab106e3fd6adbe8c3", DownloadFormat.Gzip);
|
||||
|
||||
public readonly DownloadInfo Tesseract304 = new DownloadInfo("tesseract.exe.gz", UrlFormats, 1.32, "0b0fd21cd886c04c60ed5c3f38b9120b408139b3", DownloadFormat.Gzip);
|
||||
|
||||
public readonly IDictionary<string, DownloadInfo> Tesseract304Languages = LanguageData.ToDictionary(x => x.Code, x => new DownloadInfo(x.Filename, UrlFormats, x.Size, x.Sha1, DownloadFormat.Gzip));
|
||||
}
|
||||
|
||||
private class OcrLanguage
|
||||
{
|
||||
public string Filename { get; set; }
|
||||
|
||||
public string Code { get; set; }
|
||||
|
||||
public string LangName { get; set; }
|
||||
|
||||
public double Size { get; set; }
|
||||
|
||||
public string Sha1 { get; set; }
|
||||
|
||||
public bool RTL { get; set; }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -18,6 +18,10 @@ namespace NAPS2.Ocr
|
||||
{
|
||||
this.userConfigManager = userConfigManager;
|
||||
this.appConfigManager = appConfigManager;
|
||||
|
||||
ExternalComponent.InitBasePath(appConfigManager);
|
||||
|
||||
// Order is important here. Newer/preferred first
|
||||
engines = new List<IOcrEngine>
|
||||
{
|
||||
t400B4,
|
||||
@ -44,10 +48,34 @@ namespace NAPS2.Ocr
|
||||
|
||||
public IOcrEngine ActiveEngine => engines.FirstOrDefault(x => x.IsSupported && x.IsInstalled && x.InstalledLanguages.Any());
|
||||
|
||||
public IOcrEngine InstalledEngine => engines.FirstOrDefault(x => x.IsInstalled && x.InstalledLanguages.Any());
|
||||
|
||||
public IOcrEngine EngineToInstall => engines.FirstOrDefault(x => x.IsSupported && x.CanInstall);
|
||||
|
||||
public OcrParams DefaultParams
|
||||
{
|
||||
get
|
||||
{
|
||||
OcrParams AppLevelParams()
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(appConfigManager.Config.OcrDefaultLanguage))
|
||||
{
|
||||
return new OcrParams(appConfigManager.Config.OcrDefaultLanguage, appConfigManager.Config.OcrDefaultMode);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
OcrParams UserLevelParams()
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(userConfigManager.Config.OcrLanguageCode))
|
||||
{
|
||||
return new OcrParams(userConfigManager.Config.OcrLanguageCode, userConfigManager.Config.OcrMode);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
OcrParams ArbitraryParams() => new OcrParams(ActiveEngine?.InstalledLanguages.OrderBy(x => x.Name).Select(x => x.Code).FirstOrDefault(), OcrMode.Default);
|
||||
|
||||
// Prioritize app-level overrides
|
||||
if (appConfigManager.Config.OcrState == OcrState.Disabled)
|
||||
{
|
||||
@ -55,34 +83,12 @@ namespace NAPS2.Ocr
|
||||
}
|
||||
if (appConfigManager.Config.OcrState == OcrState.Enabled)
|
||||
{
|
||||
// Prioritize the app-level language
|
||||
if (!string.IsNullOrWhiteSpace(appConfigManager.Config.OcrDefaultLanguage))
|
||||
{
|
||||
return new OcrParams(appConfigManager.Config.OcrDefaultLanguage, appConfigManager.Config.OcrDefaultMode);
|
||||
}
|
||||
// Fall back to the user-selected language
|
||||
if (!string.IsNullOrWhiteSpace(userConfigManager.Config.OcrLanguageCode))
|
||||
{
|
||||
return new OcrParams(userConfigManager.Config.OcrLanguageCode, userConfigManager.Config.OcrMode);
|
||||
}
|
||||
// Fall back to an arbitrary installed language (probably there is only one)
|
||||
return new OcrParams(ActiveEngine?.InstalledLanguages.OrderBy(x => x.Name).Select(x => x.Code).FirstOrDefault(), OcrMode.Default);
|
||||
return AppLevelParams() ?? UserLevelParams() ?? ArbitraryParams();
|
||||
}
|
||||
// No overrides, so prioritize the user settings
|
||||
if (userConfigManager.Config.EnableOcr)
|
||||
{
|
||||
// Prioritize the user-selected language
|
||||
if (!string.IsNullOrWhiteSpace(userConfigManager.Config.OcrLanguageCode))
|
||||
{
|
||||
return new OcrParams(userConfigManager.Config.OcrLanguageCode, userConfigManager.Config.OcrMode);
|
||||
}
|
||||
// Fall back to the app-level language
|
||||
if (!string.IsNullOrWhiteSpace(appConfigManager.Config.OcrDefaultLanguage))
|
||||
{
|
||||
return new OcrParams(appConfigManager.Config.OcrDefaultLanguage, appConfigManager.Config.OcrDefaultMode);
|
||||
}
|
||||
// Fall back to an arbitrary installed language (probably there is only one)
|
||||
return new OcrParams(ActiveEngine?.InstalledLanguages.OrderBy(x => x.Name).Select(x => x.Code).FirstOrDefault(), OcrMode.Default);
|
||||
return UserLevelParams() ?? AppLevelParams() ?? ArbitraryParams();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -13,34 +13,16 @@ namespace NAPS2.Ocr
|
||||
{
|
||||
}
|
||||
|
||||
protected override string TesseractExePath => Path.Combine(ExternalComponent.BasePath, "tesseract-3.0.2", "tesseract.exe");
|
||||
protected override string TesseractBasePath => Path.Combine(ExternalComponent.BasePath, "tesseract-3.0.2");
|
||||
|
||||
protected override string TesseractExePath => "tesseract.exe";
|
||||
|
||||
protected override string TesseractHocrExtension => ".html";
|
||||
|
||||
protected override string TesseractDataPath => Path.Combine(ExternalComponent.BasePath, "tesseract-3.0.2");
|
||||
|
||||
protected override string TesseractPrefixPath => Path.Combine(ExternalComponent.BasePath, "tesseract-3.0.2");
|
||||
|
||||
protected override PlatformSupport PlatformSupport => PlatformSupport.Windows;
|
||||
|
||||
public override bool IsInstalled => Component.IsInstalled;
|
||||
|
||||
public override bool IsUpgradable => true;
|
||||
|
||||
public override bool CanInstall => false;
|
||||
|
||||
public override IEnumerable<Language> InstalledLanguages => LanguageComponents.Where(x => x.IsInstalled).Select(x => Languages[x.Id.Substring(4)]);
|
||||
|
||||
public override ExternalComponent Component => new ExternalComponent("ocr", Path.Combine("tesseract-3.0.2", "tesseract.exe"), PlatformSupport.Windows);
|
||||
|
||||
public override IEnumerable<ExternalComponent> LanguageComponents => LanguageData.Select(x => new ExternalComponent($"ocr-{x.Code}", Path.Combine("tesseract-3.0.2", "tessdata", x.Filename.Replace(".gz", ""))));
|
||||
|
||||
public override IEnumerable<OcrMode> SupportedModes => null;
|
||||
|
||||
// TODO:
|
||||
// Move common stuff to base
|
||||
// Extract redundant information
|
||||
// FIgure out how to handle laziness/repeated computation
|
||||
// Include download information (not for 302 of course)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using NAPS2.Config;
|
||||
using NAPS2.Dependencies;
|
||||
|
||||
namespace NAPS2.Ocr
|
||||
{
|
||||
@ -10,5 +12,19 @@ namespace NAPS2.Ocr
|
||||
public Tesseract304Engine(AppConfigManager appConfigManager) : base(appConfigManager)
|
||||
{
|
||||
}
|
||||
|
||||
protected override string TesseractBasePath => Path.Combine(ExternalComponent.BasePath, "tesseract-3.0.4");
|
||||
|
||||
protected override string TesseractExePath => "tesseract.exe";
|
||||
|
||||
protected override string TesseractHocrExtension => ".hocr";
|
||||
|
||||
protected override PlatformSupport PlatformSupport => PlatformSupport.ModernWindows;
|
||||
|
||||
public override bool IsUpgradable => false;
|
||||
|
||||
public override bool CanInstall => true;
|
||||
|
||||
protected override DownloadInfo DownloadInfo => new DownloadInfo("tesseract.exe.gz", TesseractMirrors, 1.32, "0b0fd21cd886c04c60ed5c3f38b9120b408139b3", DownloadFormat.Gzip);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using NAPS2.Config;
|
||||
using NAPS2.Dependencies;
|
||||
|
||||
namespace NAPS2.Ocr
|
||||
{
|
||||
@ -10,5 +12,11 @@ namespace NAPS2.Ocr
|
||||
public Tesseract304XpEngine(AppConfigManager appConfigManager) : base(appConfigManager)
|
||||
{
|
||||
}
|
||||
|
||||
protected override string TesseractExePath => "tesseract_xp.exe";
|
||||
|
||||
protected override PlatformSupport PlatformSupport => PlatformSupport.Windows;
|
||||
|
||||
protected override DownloadInfo DownloadInfo => new DownloadInfo("tesseract_xp.exe.gz", TesseractMirrors, 1.32, "98d15e4765caae864f16fa2ab106e3fd6adbe8c3", DownloadFormat.Gzip);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using NAPS2.Config;
|
||||
using NAPS2.Dependencies;
|
||||
|
||||
namespace NAPS2.Ocr
|
||||
{
|
||||
@ -10,5 +12,19 @@ namespace NAPS2.Ocr
|
||||
public Tesseract400Beta4Engine(AppConfigManager appConfigManager) : base(appConfigManager)
|
||||
{
|
||||
}
|
||||
|
||||
protected override string TesseractBasePath => Path.Combine(ExternalComponent.BasePath, "tesseract-4.0.0b4");
|
||||
|
||||
protected override string TesseractExePath => "tesseract.exe";
|
||||
|
||||
protected override string TesseractPrefixPath => Path.Combine(TesseractBasePath, "tessdata");
|
||||
|
||||
protected override string TesseractHocrExtension => ".html";
|
||||
|
||||
protected override PlatformSupport PlatformSupport => PlatformSupport.ModernWindows;
|
||||
|
||||
public override bool IsUpgradable => false;
|
||||
|
||||
public override bool CanInstall => false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,7 +16,7 @@ namespace NAPS2.Ocr
|
||||
{
|
||||
private const int DEFAULT_TIMEOUT = 120 * 1000;
|
||||
private const int CHECK_INTERVAL = 500;
|
||||
|
||||
|
||||
private readonly AppConfigManager appConfigManager;
|
||||
|
||||
protected TesseractBaseEngine(AppConfigManager appConfigManager)
|
||||
@ -42,16 +42,22 @@ namespace NAPS2.Ocr
|
||||
{
|
||||
var startInfo = new ProcessStartInfo
|
||||
{
|
||||
FileName = TesseractExePath,
|
||||
FileName = Path.Combine(TesseractBasePath, TesseractExePath),
|
||||
Arguments = $"\"{imagePath}\" \"{tempHocrFilePath}\" -l {ocrParams.LanguageCode} hocr",
|
||||
UseShellExecute = false,
|
||||
CreateNoWindow = true,
|
||||
RedirectStandardOutput = true,
|
||||
RedirectStandardError = true
|
||||
};
|
||||
startInfo.EnvironmentVariables["TESSDATA_PREFIX"] = TesseractPrefixPath;
|
||||
var tessdata = new DirectoryInfo(Path.Combine(TesseractDataPath, "tessdata"));
|
||||
EnsureHocrConfigExists(tessdata);
|
||||
if (TesseractPrefixPath != null)
|
||||
{
|
||||
startInfo.EnvironmentVariables["TESSDATA_PREFIX"] = Path.Combine(TesseractBasePath, TesseractPrefixPath);
|
||||
}
|
||||
if (TesseractDataPath != null)
|
||||
{
|
||||
var tessdata = new DirectoryInfo(Path.Combine(TesseractBasePath, TesseractDataPath, "tessdata"));
|
||||
EnsureHocrConfigExists(tessdata);
|
||||
}
|
||||
var tesseractProcess = Process.Start(startInfo);
|
||||
if (tesseractProcess == null)
|
||||
{
|
||||
@ -165,31 +171,46 @@ namespace NAPS2.Ocr
|
||||
return bounds;
|
||||
}
|
||||
|
||||
protected abstract string TesseractBasePath { get; }
|
||||
|
||||
protected abstract string TesseractExePath { get; }
|
||||
|
||||
protected abstract string TesseractHocrExtension { get; }
|
||||
|
||||
protected abstract string TesseractDataPath { get; }
|
||||
protected virtual string TesseractDataPath => "";
|
||||
|
||||
protected abstract string TesseractPrefixPath { get; }
|
||||
protected virtual string TesseractPrefixPath => "";
|
||||
|
||||
public virtual bool IsSupported => PlatformSupport.Validate();
|
||||
protected virtual DownloadInfo DownloadInfo => null;
|
||||
|
||||
protected abstract PlatformSupport PlatformSupport { get; }
|
||||
|
||||
public abstract bool IsInstalled { get; }
|
||||
public virtual bool IsSupported => PlatformSupport.Validate();
|
||||
|
||||
public virtual bool IsInstalled => Component.IsInstalled;
|
||||
|
||||
public abstract bool IsUpgradable { get; }
|
||||
|
||||
public abstract bool CanInstall { get; }
|
||||
|
||||
public abstract IEnumerable<Language> InstalledLanguages { get; }
|
||||
public virtual IEnumerable<Language> InstalledLanguages => LanguageComponents.Where(x => x.IsInstalled).Select(x => Languages[x.Id]);
|
||||
|
||||
public abstract ExternalComponent Component { get; }
|
||||
public virtual IEnumerable<Language> NotInstalledLanguages => LanguageComponents.Where(x => !x.IsInstalled).Select(x => Languages[x.Id]);
|
||||
|
||||
public abstract IEnumerable<ExternalComponent> LanguageComponents { get; }
|
||||
public virtual ExternalComponent Component => new ExternalComponent("ocr", Path.Combine(TesseractBasePath, TesseractExePath), PlatformSupport, DownloadInfo);
|
||||
|
||||
public abstract IEnumerable<OcrMode> SupportedModes { get; }
|
||||
public virtual IEnumerable<ExternalComponent> LanguageComponents => TesseractLanguageData.Select(x =>
|
||||
new ExternalComponent($"ocr-{x.Code}",Path.Combine(TesseractBasePath, "tessdata", x.Filename.Replace(".gz", "")), PlatformSupport,
|
||||
CanInstall ? new DownloadInfo(x.Filename, TesseractMirrors, x.Size, x.Sha1, DownloadFormat.Gzip) : null));
|
||||
|
||||
public virtual IEnumerable<OcrMode> SupportedModes => null;
|
||||
|
||||
protected static readonly List<DownloadMirror> TesseractMirrors = new List<DownloadMirror>
|
||||
{
|
||||
new DownloadMirror(PlatformSupport.ModernWindows.Or(PlatformSupport.Linux), @"https://github.com/cyanfish/naps2-components/releases/download/tessseract-3.04/{0}"),
|
||||
new DownloadMirror(PlatformSupport.ModernWindows.Or(PlatformSupport.Linux), @"https://sourceforge.net/projects/naps2/files/components/tesseract-3.04/{0}/download"),
|
||||
new DownloadMirror(PlatformSupport.WindowsXp, @"http://xp-mirror.naps2.com/tesseract-3.04/{0}")
|
||||
};
|
||||
|
||||
protected class TesseractLanguage
|
||||
{
|
||||
@ -206,11 +227,11 @@ namespace NAPS2.Ocr
|
||||
public bool RTL { get; set; }
|
||||
}
|
||||
|
||||
protected readonly IDictionary<string, Language> Languages = LanguageData.ToDictionary(x => x.Code, x => new Language(x.Code, x.LangName, x.RTL));
|
||||
protected readonly IDictionary<string, Language> Languages = TesseractLanguageData.ToDictionary(x => $"ocr-{x.Code}", x => new Language(x.Code, x.LangName, x.RTL));
|
||||
|
||||
#region Language Data (auto-generated)
|
||||
|
||||
protected static readonly TesseractLanguage[] LanguageData =
|
||||
protected static readonly TesseractLanguage[] TesseractLanguageData =
|
||||
{
|
||||
new TesseractLanguage { Filename = "afr.traineddata.gz", Code = "afr", LangName = "Afrikaans", Size = 1.93, Sha1 = "a669186130bf1fc6c78226ac868c82b70a44c70b" },
|
||||
new TesseractLanguage { Filename = "amh.traineddata.gz", Code = "amh", LangName = "Amharic", Size = 1.03, Sha1 = "1153cbbac7306d42e72ca639ff3f36f45dcb15a2" },
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using NAPS2.Config;
|
||||
using NAPS2.Dependencies;
|
||||
|
||||
namespace NAPS2.Ocr
|
||||
{
|
||||
@ -10,5 +11,21 @@ namespace NAPS2.Ocr
|
||||
public TesseractSystemEngine(AppConfigManager appConfigManager) : base(appConfigManager)
|
||||
{
|
||||
}
|
||||
|
||||
protected override string TesseractBasePath => "";
|
||||
|
||||
protected override string TesseractExePath => "tesseract";
|
||||
|
||||
protected override string TesseractDataPath => null;
|
||||
|
||||
protected override string TesseractPrefixPath => null;
|
||||
|
||||
protected override string TesseractHocrExtension => ".hocr";
|
||||
|
||||
protected override PlatformSupport PlatformSupport => PlatformSupport.Linux;
|
||||
|
||||
public override bool IsUpgradable => false;
|
||||
|
||||
public override bool CanInstall => false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -9,38 +9,39 @@ namespace NAPS2.WinForms
|
||||
{
|
||||
public partial class FOcrLanguageDownload : FormBase
|
||||
{
|
||||
private readonly OcrDependencyManager ocrDependencyManager;
|
||||
private readonly OcrManager ocrManager;
|
||||
private readonly IOcrEngine engineToInstall;
|
||||
|
||||
public FOcrLanguageDownload(OcrDependencyManager ocrDependencyManager)
|
||||
public FOcrLanguageDownload(OcrManager ocrManager)
|
||||
{
|
||||
this.ocrDependencyManager = ocrDependencyManager;
|
||||
this.ocrManager = ocrManager;
|
||||
engineToInstall = ocrManager.EngineToInstall;
|
||||
InitializeComponent();
|
||||
|
||||
var initialSelection = new HashSet<string>();
|
||||
if (!ocrDependencyManager.HasNewTesseractExe && ocrDependencyManager.Components.Tesseract302.IsInstalled)
|
||||
if (ocrManager.InstalledEngine != null && ocrManager.InstalledEngine != engineToInstall)
|
||||
{
|
||||
// Upgrading from an old version, so pre-select previously used languages
|
||||
foreach (var lang in ocrDependencyManager.Components.Tesseract302Languages.Where(x => x.Value.IsInstalled))
|
||||
foreach (var lang in ocrManager.InstalledEngine.LanguageComponents.Where(x => x.IsInstalled))
|
||||
{
|
||||
initialSelection.Add(lang.Key);
|
||||
initialSelection.Add(lang.Id);
|
||||
}
|
||||
}
|
||||
|
||||
if (!ocrDependencyManager.InstalledTesseractLanguages.Any())
|
||||
if (!engineToInstall.InstalledLanguages.Any())
|
||||
{
|
||||
// Fresh install, so pre-select English as a sensible default
|
||||
initialSelection.Add("eng");
|
||||
initialSelection.Add("ocr-eng");
|
||||
}
|
||||
|
||||
// Populate the list of language options
|
||||
// Special case for English: sorted to the top of the list
|
||||
var languageOptions = ocrDependencyManager.Components.Tesseract304Languages.Where(x => !x.Value.IsInstalled)
|
||||
.Select(x => ocrDependencyManager.Languages[x.Key])
|
||||
var languageOptions = engineToInstall.NotInstalledLanguages
|
||||
.OrderBy(x => x.Code == "eng" ? "AAA" : x.Name);
|
||||
foreach (var languageOption in languageOptions)
|
||||
{
|
||||
var item = new ListViewItem { Text = languageOption.Name, Tag = languageOption.Code };
|
||||
if (initialSelection.Contains(languageOption.Code))
|
||||
if (initialSelection.Contains($"ocr-{languageOption.Code}"))
|
||||
{
|
||||
item.Checked = true;
|
||||
}
|
||||
@ -65,28 +66,22 @@ namespace NAPS2.WinForms
|
||||
|
||||
private void UpdateView()
|
||||
{
|
||||
var selectedLanguages = lvLanguages.Items.Cast<ListViewItem>().Where(x => x.Checked).Select(x => ((string)x.Tag));
|
||||
double downloadSize = selectedLanguages.Select(x => ocrDependencyManager.Downloads.Tesseract304Languages[x].Size).Sum();
|
||||
var selectedLanguages = SelectedLanguages;
|
||||
double downloadSize = engineToInstall.LanguageComponents.Where(x => selectedLanguages.Contains(x.Id)).Select(x => x.DownloadInfo.Size).Sum();
|
||||
|
||||
if (ocrDependencyManager.InstalledAndSupportedTesseractExe == null)
|
||||
if (!engineToInstall.IsInstalled)
|
||||
{
|
||||
if (ocrDependencyManager.Components.Tesseract304.IsSupported)
|
||||
{
|
||||
downloadSize += ocrDependencyManager.Downloads.Tesseract304.Size;
|
||||
}
|
||||
else if (ocrDependencyManager.Components.Tesseract304Xp.IsSupported)
|
||||
{
|
||||
downloadSize += ocrDependencyManager.Downloads.Tesseract304Xp.Size;
|
||||
}
|
||||
else if (ocrDependencyManager.Components.Tesseract304Linux.IsSupported)
|
||||
{
|
||||
downloadSize += ocrDependencyManager.Downloads.Tesseract304Xp.Size;
|
||||
}
|
||||
downloadSize += engineToInstall.Component.DownloadInfo.Size;
|
||||
}
|
||||
|
||||
labelSizeEstimate.Text = string.Format(MiscResources.EstimatedDownloadSize, downloadSize.ToString("f1"));
|
||||
|
||||
btnDownload.Enabled = lvLanguages.Items.Cast<ListViewItem>().Any(x => x.Checked) || ocrDependencyManager.TesseractExeRequiresFix;
|
||||
btnDownload.Enabled = lvLanguages.Items.Cast<ListViewItem>().Any(x => x.Checked) || engineToInstall.InstalledLanguages.Any() && !engineToInstall.IsInstalled;
|
||||
}
|
||||
|
||||
private HashSet<string> SelectedLanguages
|
||||
{
|
||||
get { return new HashSet<string>(lvLanguages.Items.Cast<ListViewItem>().Where(x => x.Checked).Select(x => $"ocr-{x.Tag}")); }
|
||||
}
|
||||
|
||||
private void lvLanguages_ItemChecked(object sender, ItemCheckedEventArgs e)
|
||||
@ -103,31 +98,15 @@ namespace NAPS2.WinForms
|
||||
{
|
||||
var progressForm = FormFactory.Create<FDownloadProgress>();
|
||||
|
||||
if (ocrDependencyManager.InstalledAndSupportedTesseractExe == null)
|
||||
if (!engineToInstall.IsInstalled)
|
||||
{
|
||||
if (ocrDependencyManager.Components.Tesseract304.IsSupported)
|
||||
{
|
||||
progressForm.QueueFile(ocrDependencyManager.Downloads.Tesseract304,
|
||||
path => ocrDependencyManager.Components.Tesseract304.Install(path));
|
||||
}
|
||||
else if (ocrDependencyManager.Components.Tesseract304Xp.IsSupported)
|
||||
{
|
||||
progressForm.QueueFile(ocrDependencyManager.Downloads.Tesseract304Xp,
|
||||
path => ocrDependencyManager.Components.Tesseract304Xp.Install(path));
|
||||
}
|
||||
else if (ocrDependencyManager.Components.Tesseract304Linux.IsSupported)
|
||||
{
|
||||
//progressForm.QueueFile(ocrDependencyManager.Downloads.Tesseract304Linux,
|
||||
// path => ocrDependencyManager.Components.Tesseract304Linux.Install(path));
|
||||
}
|
||||
progressForm.QueueFile(engineToInstall.Component);
|
||||
}
|
||||
|
||||
foreach (
|
||||
var langCode in
|
||||
lvLanguages.Items.Cast<ListViewItem>().Where(x => x.Checked).Select(x => (string)x.Tag))
|
||||
var selectedLanguages = SelectedLanguages;
|
||||
foreach (var langComponent in engineToInstall.LanguageComponents.Where(x => selectedLanguages.Contains(x.Id)))
|
||||
{
|
||||
progressForm.QueueFile(ocrDependencyManager.Downloads.Tesseract304Languages[langCode],
|
||||
path => ocrDependencyManager.Components.Tesseract304Languages[langCode].Install(path));
|
||||
progressForm.QueueFile(langComponent);
|
||||
}
|
||||
|
||||
Close();
|
||||
|
||||
@ -9,12 +9,12 @@ namespace NAPS2.WinForms
|
||||
{
|
||||
public partial class FOcrSetup : FormBase
|
||||
{
|
||||
private readonly OcrDependencyManager ocrDependencyManager;
|
||||
private readonly OcrManager ocrManager;
|
||||
private readonly AppConfigManager appConfigManager;
|
||||
|
||||
public FOcrSetup(OcrDependencyManager ocrDependencyManager, AppConfigManager appConfigManager)
|
||||
public FOcrSetup(OcrManager ocrManager, AppConfigManager appConfigManager)
|
||||
{
|
||||
this.ocrDependencyManager = ocrDependencyManager;
|
||||
this.ocrManager = ocrManager;
|
||||
this.appConfigManager = appConfigManager;
|
||||
InitializeComponent();
|
||||
}
|
||||
@ -65,7 +65,7 @@ namespace NAPS2.WinForms
|
||||
|
||||
private void LoadLanguages()
|
||||
{
|
||||
var languages = ocrDependencyManager.InstalledTesseractLanguages
|
||||
var languages = ocrManager.ActiveEngine?.InstalledLanguages
|
||||
.OrderBy(x => x.Name)
|
||||
.ToList();
|
||||
comboLanguages.DataSource = languages;
|
||||
|
||||
@ -24,10 +24,10 @@ namespace NAPS2.WinForms
|
||||
private readonly ChangeTracker changeTracker;
|
||||
private readonly IOperationFactory operationFactory;
|
||||
private readonly IFormFactory formFactory;
|
||||
private readonly OcrDependencyManager ocrDependencyManager;
|
||||
private readonly OcrManager ocrManager;
|
||||
private readonly IEmailProviderFactory emailProviderFactory;
|
||||
|
||||
public WinFormsExportHelper(PdfSettingsContainer pdfSettingsContainer, ImageSettingsContainer imageSettingsContainer, EmailSettingsContainer emailSettingsContainer, DialogHelper dialogHelper, FileNamePlaceholders fileNamePlaceholders, ChangeTracker changeTracker, IOperationFactory operationFactory, IFormFactory formFactory, OcrDependencyManager ocrDependencyManager, IEmailProviderFactory emailProviderFactory)
|
||||
public WinFormsExportHelper(PdfSettingsContainer pdfSettingsContainer, ImageSettingsContainer imageSettingsContainer, EmailSettingsContainer emailSettingsContainer, DialogHelper dialogHelper, FileNamePlaceholders fileNamePlaceholders, ChangeTracker changeTracker, IOperationFactory operationFactory, IFormFactory formFactory, OcrManager ocrManager, IEmailProviderFactory emailProviderFactory)
|
||||
{
|
||||
this.pdfSettingsContainer = pdfSettingsContainer;
|
||||
this.imageSettingsContainer = imageSettingsContainer;
|
||||
@ -37,7 +37,7 @@ namespace NAPS2.WinForms
|
||||
this.changeTracker = changeTracker;
|
||||
this.operationFactory = operationFactory;
|
||||
this.formFactory = formFactory;
|
||||
this.ocrDependencyManager = ocrDependencyManager;
|
||||
this.ocrManager = ocrManager;
|
||||
this.emailProviderFactory = emailProviderFactory;
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ namespace NAPS2.WinForms
|
||||
|
||||
var pdfSettings = pdfSettingsContainer.PdfSettings;
|
||||
pdfSettings.Metadata.Creator = MiscResources.NAPS2;
|
||||
if (op.Start(filename, DateTime.Now, images, pdfSettings, ocrDependencyManager.DefaultLanguageCode, email))
|
||||
if (op.Start(filename, DateTime.Now, images, pdfSettings, ocrManager.DefaultParams, email))
|
||||
{
|
||||
progressForm.ShowDialog();
|
||||
}
|
||||
|
||||
@ -36,7 +36,6 @@ namespace NAPS2.DI.Modules
|
||||
// Export
|
||||
Bind<IPdfExporter>().To<PdfSharpExporter>();
|
||||
Bind<IScannedImagePrinter>().To<PrintDocumentPrinter>();
|
||||
Bind<IOcrEngine>().To<TesseractOcrEngine>();
|
||||
Bind<IEmailProviderFactory>().To<NinjectEmailProviderFactory>();
|
||||
|
||||
// Scan
|
||||
|
||||
Loading…
Reference in New Issue
Block a user