Stone_Red/Markdowser
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/Markdowser.git synced 2026-09-09 07:46:29 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

Small UI improvements

Browse Source
This commit is contained in:
Stone_Red
2024-06-04 16:52:56 +02:00
parent e943ed0bd7
commit 813f3b39a0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Markdowser/Processing/Processors/HtmlProcessor.cs
+2 -2
View File
@@ -49,7 +49,7 @@ internal partial class HtmlProcessor : IContentProcessor
{ {
_ = html.AppendLine(await streamReader.ReadLineAsync()); _ = html.AppendLine(await streamReader.ReadLineAsync());
progress.Report(new ProcessingProgress(contentStream.Position, length)); progress.Report(new ProcessingProgress(Encoding.Default.GetByteCount(html.ToString()), length, "Downloading HTML...", true));
} }
HtmlDocument htmlDoc = new HtmlDocument(); HtmlDocument htmlDoc = new HtmlDocument();
@@ -68,7 +68,7 @@ internal partial class HtmlProcessor : IContentProcessor
foreach (string line in lines) foreach (string line in lines)
{ {
progress.Report(new ProcessingProgress(lines.Length, currentLine)); progress.Report(new ProcessingProgress(currentLine, lines.Length, "Processing markdown..."));
currentLine++; currentLine++;
string trimmedLine = line.Trim(); string trimmedLine = line.Trim();
src/Markdowser/ViewModels/MainWindowViewModel.cs
+3 -3
View File
@@ -381,9 +381,6 @@ public partial class MainWindowViewModel : ViewModelBase
private void UpdateProgress(ProcessingProgress progress) private void UpdateProgress(ProcessingProgress progress)
{ {
Progress = progress.Current;
ProgressMax = progress.Total;
if (progress.IsBytes) if (progress.IsBytes)
{ {
ProgressText = $"{progress.Message} ({{1:0}}%) {BytesToString.Convert((long)Progress)}/{BytesToString.Convert((long)ProgressMax)}"; ProgressText = $"{progress.Message} ({{1:0}}%) {BytesToString.Convert((long)Progress)}/{BytesToString.Convert((long)ProgressMax)}";
@@ -392,6 +389,9 @@ public partial class MainWindowViewModel : ViewModelBase
{ {
ProgressText = $"{progress.Message} ({{1:0}}%) {{0}}/{{3}}"; ProgressText = $"{progress.Message} ({{1:0}}%) {{0}}/{{3}}";
} }
ProgressMax = progress.Total;
Progress = progress.Current;
} }
private void UrlChanged(object? sender, EventArgs e) private void UrlChanged(object? sender, EventArgs e)