cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-09-17 10:47:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement DownloadProgressForm

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2022-11-01 21:22:09 -07:00
parent 0b9487dd63
commit 3495097646
7 changed files with 227 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NAPS2.Lib.WinForms/EtoForms/WinForms/WinFormsEtoPlatform.cs
View File

@ -3,6 +3,7 @@ using Eto.Drawing;
using Eto.Forms;
using Eto.WinForms;
using Eto.WinForms.Forms.Controls;
using NAPS2.EtoForms.Layout;
using NAPS2.Images.Gdi;
using sd = System.Drawing;
using wf = System.Windows.Forms;
@ -102,4 +103,9 @@ public class WinFormsEtoPlatform : EtoPlatform
{
container.ToNative().Controls.Add(control.ToNative());
}
public override LayoutElement FormatProgressBar(ProgressBar progressBar)
{
return progressBar.Size(420, 40);
}
}

6
NAPS2.Lib/EtoForms/EtoPlatform.cs
View File

@ -1,5 +1,6 @@
using Eto.Drawing;
using Eto.Forms;
using NAPS2.EtoForms.Layout;
namespace NAPS2.EtoForms;
@ -60,4 +61,9 @@ public abstract class EtoPlatform
{
return control.GetPreferredSize(availableSpace);
}
public virtual LayoutElement FormatProgressBar(ProgressBar progressBar)
{
return progressBar.Width(420).Padding(top: 10, bottom: 10);
}
}

193
NAPS2.Lib/EtoForms/Ui/DownloadProgressForm.cs Normal file
View File

@ -0,0 +1,193 @@
using System.ComponentModel;
using System.Net;
using System.Security.Cryptography;
using Eto.Drawing;
using Eto.Forms;
using NAPS2.Dependencies;
using NAPS2.EtoForms.Layout;
using Label = Eto.Forms.Label;
namespace NAPS2.EtoForms.Ui;
public class DownloadProgressForm : EtoDialogBase
{
private readonly Label _totalStatus = new();
private readonly Label _fileStatus = new();
private readonly ProgressBar _totalProgressBar = new();
private readonly ProgressBar _fileProgressBar = new();
private readonly List<QueueItem> _filesToDownload = new List<QueueItem>();
private int _filesDownloaded = 0;
private int _urlIndex = 0;
private double _currentFileSize = 0.0;
private double _currentFileProgress = 0.0;
private bool _hasError;
private bool _cancel;
private readonly WebClient _client = new WebClient();
public DownloadProgressForm(Naps2Config config) : base(config)
{
FormStateController.RestoreFormState = false;
Title = UiStrings.DownloadProgressFormTitle;
Icon = new Icon(1f, Icons.text_small.ToEtoImage());
Resizable = true;
// TODO: Is this needed for net462?
ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
_client.DownloadFileCompleted += client_DownloadFileCompleted;
_client.DownloadProgressChanged += client_DownloadProgressChanged;
LayoutController.Content = L.Column(
_totalStatus,
EtoPlatform.Current.FormatProgressBar(_totalProgressBar),
EtoPlatform.Current.FormatProgressBar(_fileProgressBar),
L.Row(
_fileStatus.XScale()
.Align(EtoPlatform.Current.IsWinForms ? LayoutAlignment.Center : LayoutAlignment.Leading),
C.Button(UiStrings.Cancel, Close)
)
);
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
DisplayProgress();
StartNextDownload();
}
void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
Console.WriteLine($"bytes {e.BytesReceived} {e.TotalBytesToReceive}");
_currentFileProgress = e.BytesReceived;
_currentFileSize = e.TotalBytesToReceive;
DisplayProgress();
}
void client_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
{
var file = _filesToDownload[_filesDownloaded];
if (e.Error != null)
{
_hasError = true;
if (!_cancel)
{
Log.ErrorException("Error downloading file: " + file.DownloadInfo.FileName, e.Error);
}
}
else if (file.DownloadInfo.Sha1 != CalculateSha1((Path.Combine(file.TempFolder, file.DownloadInfo.FileName))))
{
_hasError = true;
Log.Error("Error downloading file (invalid checksum): " + file.DownloadInfo.FileName);
}
else
{
_filesDownloaded++;
}
_currentFileProgress = 0;
_currentFileSize = 0;
DisplayProgress();
StartNextDownload();
}
private string CalculateSha1(string filePath)
{
using var sha = new SHA1CryptoServiceProvider();
using FileStream stream = File.OpenRead(filePath);
byte[] checksum = sha.ComputeHash(stream);
string str = BitConverter.ToString(checksum).Replace("-", String.Empty).ToLowerInvariant();
return str;
}
private void StartNextDownload()
{
if (_hasError)
{
var prev = _filesToDownload[_filesDownloaded];
Directory.Delete(prev.TempFolder, true);
if (_cancel)
{
return;
}
// Retry if possible
_urlIndex++;
_hasError = false;
}
else
{
_urlIndex = 0;
}
if (_filesDownloaded > 0 && _urlIndex == 0)
{
var prev = _filesToDownload[_filesDownloaded - 1];
var filePath = Path.Combine(prev.TempFolder, prev.DownloadInfo.FileName);
try
{
var preparedFilePath = prev.DownloadInfo.Format.Prepare(filePath);
prev.FileCallback(preparedFilePath);
}
catch (Exception ex)
{
Log.ErrorException("Error preparing downloaded file", ex);
MessageBox.Show(MiscResources.FilesCouldNotBeDownloaded, MiscResources.DownloadError, MessageBoxButtons.OK, MessageBoxType.Error);
}
Directory.Delete(prev.TempFolder, true);
}
if (_filesDownloaded >= _filesToDownload.Count)
{
// Close();
return;
}
if (_urlIndex >= _filesToDownload[_filesDownloaded].DownloadInfo.Urls.Count)
{
Close();
MessageBox.Show(MiscResources.FilesCouldNotBeDownloaded, MiscResources.DownloadError, MessageBoxButtons.OK, MessageBoxType.Error);
return;
}
var next = _filesToDownload[_filesDownloaded];
next.TempFolder = Path.Combine(Paths.Temp, Path.GetRandomFileName());
Directory.CreateDirectory(next.TempFolder);
_client.DownloadFileAsync(new Uri(next.DownloadInfo.Urls[_urlIndex]), Path.Combine(next.TempFolder, next.DownloadInfo.FileName));
}
public void QueueFile(DownloadInfo downloadInfo, Action<string> fileCallback)
{
_filesToDownload.Add(new QueueItem { DownloadInfo = downloadInfo, FileCallback = fileCallback });
}
public void QueueFile(IExternalComponent component)
{
_filesToDownload.Add(new QueueItem { DownloadInfo = component.DownloadInfo, FileCallback = component.Install });
}
private void DisplayProgress()
{
_totalStatus.Text = string.Format(MiscResources.FilesProgressFormat, _filesDownloaded, _filesToDownload.Count);
_totalProgressBar.MaxValue = _filesToDownload.Count * 1000;
_totalProgressBar.Value = _filesDownloaded * 1000 + (_currentFileSize == 0 ? 0 : (int)(_currentFileProgress / _currentFileSize * 1000));
_fileStatus.Text = string.Format(MiscResources.SizeProgress, (_currentFileProgress / 1e6).ToString("f1"), (_currentFileSize / 1e6).ToString("f1"));
if (_currentFileSize > 0)
{
_fileProgressBar.MaxValue = (int) (_currentFileSize);
_fileProgressBar.Value = (int) (_currentFileProgress);
}
}
protected override void OnClosing(CancelEventArgs e)
{
base.OnClosing(e);
_cancel = true;
_client.CancelAsync();
}
private class QueueItem
{
public DownloadInfo DownloadInfo { get; set; }
public string TempFolder { get; set; }
public Action<string> FileCallback { get; set; }
}
}

24
NAPS2.Lib/EtoForms/Ui/OcrDownloadForm.cs
View File

@ -59,9 +59,9 @@ public class OcrDownloadForm : EtoDialogBase
private void UpdateView()
{
var selectedLanguageComponents = SelectedLanguageComponents;
var selected = SelectedLanguageComponents;
double downloadSize = _tesseractLanguageManager.LanguageComponents
.Where(x => selectedLanguageComponents.Contains(x.Id))
.Where(x => selected.Contains(x.Id))
.Select(x => x.DownloadInfo.Size)
.Sum();
@ -77,15 +77,15 @@ public class OcrDownloadForm : EtoDialogBase
private void Download()
{
// var progressForm = FormFactory.Create<DownloadProgressForm>();
//
// var selectedLanguages = SelectedLanguages;
// foreach (var langComponent in _tesseractLanguageManager.LanguageComponents.Where(x => selectedLanguages.Contains(x.Id)))
// {
// progressForm.QueueFile(langComponent);
// }
//
// Close();
// progressForm.ShowDialog();
var progressForm = FormFactory.Create<DownloadProgressForm>();
var selected = SelectedLanguageComponents;
foreach (var langComponent in _tesseractLanguageManager.LanguageComponents.Where(x => selected.Contains(x.Id)))
{
progressForm.QueueFile(langComponent);
}
Close();
progressForm.ShowModal();
}
}

2
NAPS2.Lib/EtoForms/Ui/ProgressForm.cs
View File

@ -28,7 +28,7 @@ public class ProgressForm : EtoDialogBase
LayoutController.Content = L.Column(
_status,
_progressBar.Size(420, 40),
EtoPlatform.Current.FormatProgressBar(_progressBar),
L.Row(
_numeric,
C.Filler(),

6
NAPS2.Lib/Lang/Resources/UiStrings.Designer.cs generated
View File

@ -668,5 +668,11 @@ namespace NAPS2.Lang.Resources {
return ResourceManager.GetString("Download", resourceCulture);
}
}
internal static string DownloadProgressFormTitle {
get {
return ResourceManager.GetString("DownloadProgressFormTitle", resourceCulture);
}
}
}
}

3
NAPS2.Lib/Lang/Resources/UiStrings.resx
View File

@ -429,4 +429,7 @@
<data name="Download" xml:space="preserve">
<value>Download</value>
</data>
<data name="DownloadProgressFormTitle" xml:space="preserve">
<value>Download Progress</value>
</data>
</root>