Even better progress indication

valery-kirichenko · Aug 18, 2021 · cc90fc6 · cc90fc6
1 parent 9fcc571
commit cc90fc6
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/ClipChopper/Applications/ClipChopper.DesktopApp/ClipChopper.DesktopApp.csproj b/ClipChopper/Applications/ClipChopper.DesktopApp/ClipChopper.DesktopApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" ToolsVersion="Current">
   <PropertyGroup Label="Globals">
     <Platforms>x64</Platforms>
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>1.2.1</PackageVersion>
     <Company>Kirichenko Valery</Company>
     <Product>ClipChopper</Product>
     <AssemblyVersion>1.2.1</AssemblyVersion>

diff --git a/ClipChopper/Applications/ClipChopper.DesktopApp/MainWindow.xaml b/ClipChopper/Applications/ClipChopper.DesktopApp/MainWindow.xaml
@@ -18,6 +18,7 @@
         <local:TimeSpanToSecondsConverter x:Key="TimeSpanToSecondsConverter" />
         <local:TimeSpanFormatter x:Key="TimeSpanFormatter" />
     </Window.Resources>
+    <Window.TaskbarItemInfo><TaskbarItemInfo x:Name="TaskbarProgress"></TaskbarItemInfo></Window.TaskbarItemInfo>
 
     <Grid>
         <Grid.ColumnDefinitions>

diff --git a/ClipChopper/Applications/ClipChopper.DesktopApp/MainWindow.xaml.cs b/ClipChopper/Applications/ClipChopper.DesktopApp/MainWindow.xaml.cs
@@ -9,6 +9,7 @@
 using System.Collections.ObjectModel;
 using Ookii.Dialogs.Wpf;
 using System.Threading.Tasks;
+using System.Windows.Shell;
 
 namespace ClipChopper.DesktopApp
 {
@@ -226,9 +227,12 @@ private async void Save_Click(object sender, RoutedEventArgs eventArgs)
 
             var ffmpegPath = Path.Combine(Unosquare.FFME.Library.FFmpegDirectory, "ffmpeg.exe");
             Status.Text = "Looking for keyframes...";
+            TaskbarProgress.ProgressState = TaskbarItemProgressState.Normal;
             var progress = new Progress<int>((value) =>
             {
                 Status.Text = $"Looking for keyframes... {value}%";
+                TaskbarProgress.ProgressValue = value / 100.0d;
+                Console.WriteLine(TaskbarProgress.ProgressValue);
             });
             var startKeyframe = await Task.Run(() => KeyframeProber.FindClosestKeyframeTime(inputFile, _fragment.Start, progress));
 
@@ -247,16 +251,16 @@ private async void Save_Click(object sender, RoutedEventArgs eventArgs)
             };
 
             Status.Text = "Trimming...";
+            TaskbarProgress.ProgressState = TaskbarItemProgressState.Indeterminate;
             await Task.Run(() =>
             {
-                using (var ffmpeg = Process.Start(startInfo))
-                {
-                    Debug.Assert(ffmpeg != null, nameof(ffmpeg) + " != null");
-                    ffmpeg.OutputDataReceived += (s, e) => { Debug.WriteLine(e.Data); };
-                    ffmpeg.WaitForExit();
-                }
+                using var ffmpeg = Process.Start(startInfo);
+                Debug.Assert(ffmpeg != null, nameof(ffmpeg) + " != null");
+                ffmpeg.OutputDataReceived += (s, e) => { Debug.WriteLine(e.Data); };
+                ffmpeg.WaitForExit();
             });
             Status.Text = "Done";
+            TaskbarProgress.ProgressState = TaskbarItemProgressState.None;
             RefreshDirectory_Click(sender, eventArgs);
             await Task.Delay(2000);
             Status.Text = "";

diff --git a/ClipChopper/global.json b/ClipChopper/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "5.0",
+    "rollForward": "latestMajor",
+    "allowPrerelease": false
+  }
+}