From 4bc3367e3fc05a16d8a4ae028efeae8552f663d8 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Tue, 6 Sep 2022 23:59:33 +0900
Subject: [PATCH 1/4] - Add 'Free Space in drive' - when Type "d:\", showing
 graph with free space.

---
 Flow.Launcher.Plugin/Result.cs                |  2 +
 Flow.Launcher/ResultListBox.xaml              |  9 +--
 Flow.Launcher/Themes/Base.xaml                | 15 ++++
 .../Search/ResultManager.cs                   | 70 ++++++++++++++++---
 4 files changed, 82 insertions(+), 14 deletions(-)

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index 35c491d35f8..f3f3d2816ca 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -197,5 +197,7 @@ public ValueTask<bool> ExecuteAsync(ActionContext context)
         {
             return AsyncAction?.Invoke(context) ?? ValueTask.FromResult(Action?.Invoke(context) ?? false);
         }
+
+        public int? ProgressBar { get; set; }
     }
 }
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 2a7f9c49440..4c1b068f82f 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -111,7 +111,10 @@
                                 <RowDefinition />
                                 <RowDefinition x:Name="SubTitleRowDefinition" Height="Auto" />
                             </Grid.RowDefinitions>
-
+                            <ProgressBar
+                                x:Name="progressbarResult"
+                                Style="{DynamicResource ProgressBarResult}"
+                                Value="{Binding Result.ProgressBar}" />
                             <TextBlock
                                 x:Name="Title"
                                 VerticalAlignment="Center"
@@ -132,9 +135,7 @@
                                 MinWidth="750"
                                 Style="{DynamicResource ItemSubTitleStyle}"
                                 Text="{Binding Result.SubTitle}"
-                                ToolTip="{Binding ShowSubTitleToolTip}">
-                    
-                            </TextBlock>
+                                ToolTip="{Binding ShowSubTitleToolTip}" />
 
                         </Grid>
 
diff --git a/Flow.Launcher/Themes/Base.xaml b/Flow.Launcher/Themes/Base.xaml
index 087606d0436..dbd5b31c109 100644
--- a/Flow.Launcher/Themes/Base.xaml
+++ b/Flow.Launcher/Themes/Base.xaml
@@ -81,6 +81,21 @@
 
 
     <!--  Item Style  -->
+    <Style x:Key="ProgressBarResult" TargetType="{x:Type ProgressBar}">
+        <Setter Property="Height" Value="18" />
+        <Setter Property="Margin" Value="0,0,0,4" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="Minimum" Value="0" />
+        <Setter Property="Visibility" Value="Visible" />
+        <Setter Property="Foreground" Value="#26a0da " />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Result.ProgressBar}" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
     <Style x:Key="BaseItemTitleStyle" TargetType="{x:Type TextBlock}">
         <Setter Property="Foreground" Value="#FFFFF8" />
         <Setter Property="FontSize" Value="16" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 63310bebd3a..33771a599fe 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -77,6 +77,43 @@ internal static Result CreateFolderResult(string title, string subtitle, string
             };
         }
 
+        private static string toReadableSize(long pDrvSize, int pi)
+        {
+            int mok = 0;
+            double drvSize = pDrvSize;
+            string Space = "Byte";
+            string returnStr = "";
+
+            while (drvSize > 1024.0)
+            {
+                drvSize /= 1024.0;
+                mok++;
+            }
+
+            if (mok == 1)
+                Space =  "KB";
+            else if (mok == 2)
+                Space = " MB";
+            else if (mok == 3)
+                Space = " GB";
+            else if (mok == 4)
+                Space = " TB";
+
+            if (mok != 0)
+                if (pi == 1)
+                    returnStr = string.Format("{0:F1}{1}", drvSize, Space);
+                else if (pi == 2)
+                    returnStr = string.Format("{0:F2}{1}", drvSize, Space);
+                else if (pi == 3)
+                    returnStr = string.Format("{0:F3}{1}", drvSize, Space);
+                else
+                    returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
+            else
+                returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
+
+            return returnStr;
+        }
+
         internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIndexed = false)
         {
             var retrievedDirectoryPath = FilesFolders.ReturnPreviousDirectoryIfIncompleteString(path);
@@ -86,19 +123,32 @@ internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIn
                 Path.DirectorySeparatorChar
             }, StringSplitOptions.None).Last();
 
-            if (retrievedDirectoryPath.EndsWith(":\\"))
-            {
-                var driveLetter = path.Substring(0, 1).ToUpper();
-                folderName = driveLetter + " drive";
-            }
-
             var title = "Open current directory";
 
             if (retrievedDirectoryPath != path)
                 title = "Open " + folderName;
 
-
             var subtitleFolderName = folderName;
+            var subtitle = $"Use > to search within {subtitleFolderName}, " +
+                           $"* to search for file extensions or >* to combine both searches.";
+
+
+
+
+
+            int? progressBar = null;
+            if (retrievedDirectoryPath.EndsWith(":\\"))
+            {
+                title = ""; // hide title when use progress bar,
+                var driveLetter = path.Substring(0, 1).ToUpper();
+                folderName = driveLetter + " drive";
+                var driveName = driveLetter + ":\\";
+                DriveInfo drv = new DriveInfo(driveLetter);
+                subtitle = toReadableSize(drv.AvailableFreeSpace, 2) + " free of " + toReadableSize(drv.TotalSize, 2);
+                double UsingSize = ((Convert.ToDouble(drv.TotalSize) - Convert.ToDouble(drv.AvailableFreeSpace)) / Convert.ToDouble(drv.TotalSize) * 100);
+                progressBar = Convert.ToInt32(UsingSize);
+            }
+
 
             // ie. max characters can be displayed without subtitle cutting off: "Program Files (x86)"
             if (folderName.Length > 19)
@@ -107,11 +157,11 @@ internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIn
             return new Result
             {
                 Title = title,
-                SubTitle = $"Use > to search within {subtitleFolderName}, " +
-                           $"* to search for file extensions or >* to combine both searches.",
+                SubTitle = subtitle,
                 AutoCompleteText = GetPathWithActionKeyword(retrievedDirectoryPath, ResultType.Folder),
                 IcoPath = retrievedDirectoryPath,
                 Score = 500,
+                ProgressBar = progressBar,
                 Action = c =>
                 {
                     Context.API.OpenDirectory(retrievedDirectoryPath);
@@ -208,4 +258,4 @@ public enum ResultType
         Folder,
         File
     }
-}
\ No newline at end of file
+}

From eb8aa77e753634e910b48692868b50fb578837f7 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Wed, 7 Sep 2022 00:28:49 +0900
Subject: [PATCH 2/4] - Add Progressbar color converter - Colorized(red) when
 usage space 90% over

---
 .../Converters/ProgressForegroundConverter.cs | 32 +++++++++++++++++++
 Flow.Launcher/ResultListBox.xaml              |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 Flow.Launcher/Converters/ProgressForegroundConverter.cs

diff --git a/Flow.Launcher/Converters/ProgressForegroundConverter.cs b/Flow.Launcher/Converters/ProgressForegroundConverter.cs
new file mode 100644
index 00000000000..6190f039921
--- /dev/null
+++ b/Flow.Launcher/Converters/ProgressForegroundConverter.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Flow.Launcher.Converters
+{
+    public class ProgressForegroundConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            double progress = (double)value;
+            string foreground = "#26a0da";
+
+            if (progress >= 90)
+            {
+                foreground = "#da2626";
+            }
+
+            return foreground;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 4c1b068f82f..f0e090a05af 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -46,6 +46,7 @@
                         <Grid.Resources>
                             <converter:HighlightTextConverter x:Key="HighlightTextConverter" />
                             <converter:OrdinalConverter x:Key="OrdinalConverter" />
+                            <converter:ProgressForegroundConverter x:Key="ProgressForegroundConverter" />
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
@@ -113,6 +114,7 @@
                             </Grid.RowDefinitions>
                             <ProgressBar
                                 x:Name="progressbarResult"
+                                Foreground="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Value, Converter={StaticResource ProgressForegroundConverter}}"
                                 Style="{DynamicResource ProgressBarResult}"
                                 Value="{Binding Result.ProgressBar}" />
                             <TextBlock

From b62ab1d0aa4e3af1f48f993bd51328c8ebd0678e Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Fri, 9 Sep 2022 09:08:05 +1000
Subject: [PATCH 3/4] formatting

---
 Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index 33771a599fe..aba4e5ea70b 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -132,10 +132,6 @@ internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIn
             var subtitle = $"Use > to search within {subtitleFolderName}, " +
                            $"* to search for file extensions or >* to combine both searches.";
 
-
-
-
-
             int? progressBar = null;
             if (retrievedDirectoryPath.EndsWith(":\\"))
             {

From e23eb94caf562d6ce8a9ef82f08a48ea47fcea00 Mon Sep 17 00:00:00 2001
From: Jeremy <jeremy24wu@gmail.com>
Date: Mon, 12 Sep 2022 08:05:03 +1000
Subject: [PATCH 4/4] allow progress bar customisation via plugin

---
 Flow.Launcher.Plugin/Result.cs                |   9 ++
 .../Converters/ProgressForegroundConverter.cs |  32 ------
 Flow.Launcher/ResultListBox.xaml              |   3 +-
 .../Search/ResultManager.cs                   | 100 ++++++++++++------
 .../Search/SearchManager.cs                   |   9 +-
 5 files changed, 88 insertions(+), 65 deletions(-)
 delete mode 100644 Flow.Launcher/Converters/ProgressForegroundConverter.cs

diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
index f3f3d2816ca..13639546709 100644
--- a/Flow.Launcher.Plugin/Result.cs
+++ b/Flow.Launcher.Plugin/Result.cs
@@ -198,6 +198,15 @@ public ValueTask<bool> ExecuteAsync(ActionContext context)
             return AsyncAction?.Invoke(context) ?? ValueTask.FromResult(Action?.Invoke(context) ?? false);
         }
 
+        /// <summary>
+        /// Progress bar display. Providing an int value between 0-100 will trigger the progress bar to be displayed on the result
+        /// </summary>
         public int? ProgressBar { get; set; }
+
+        /// <summary>
+        /// Optionally set the color of the progress bar
+        /// </summary>
+        /// <default>#26a0da (blue)</default>
+        public string ProgressBarColor { get; set; } = "#26a0da";
     }
 }
diff --git a/Flow.Launcher/Converters/ProgressForegroundConverter.cs b/Flow.Launcher/Converters/ProgressForegroundConverter.cs
deleted file mode 100644
index 6190f039921..00000000000
--- a/Flow.Launcher/Converters/ProgressForegroundConverter.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Flow.Launcher.Converters
-{
-    public class ProgressForegroundConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            double progress = (double)value;
-            string foreground = "#26a0da";
-
-            if (progress >= 90)
-            {
-                foreground = "#da2626";
-            }
-
-            return foreground;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
index 735742b5e9d..2c78f9babbf 100644
--- a/Flow.Launcher/ResultListBox.xaml
+++ b/Flow.Launcher/ResultListBox.xaml
@@ -46,7 +46,6 @@
                         <Grid.Resources>
                             <converter:HighlightTextConverter x:Key="HighlightTextConverter" />
                             <converter:OrdinalConverter x:Key="OrdinalConverter" />
-                            <converter:ProgressForegroundConverter x:Key="ProgressForegroundConverter" />
                             <converter:OpenResultHotkeyVisibilityConverter x:Key="OpenResultHotkeyVisibilityConverter" />
                         </Grid.Resources>
                         <Grid.ColumnDefinitions>
@@ -114,7 +113,7 @@
                             </Grid.RowDefinitions>
                             <ProgressBar
                                 x:Name="progressbarResult"
-                                Foreground="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Value, Converter={StaticResource ProgressForegroundConverter}}"
+                                Foreground="{Binding Result.ProgressBarColor}"
                                 Style="{DynamicResource ProgressBarResult}"
                                 Value="{Binding Result.ProgressBar}" />
                             <TextBlock
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
index aba4e5ea70b..2b8b010c01f 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -77,12 +77,53 @@ internal static Result CreateFolderResult(string title, string subtitle, string
             };
         }
 
+        internal static Result CreateDriveSpaceDisplayResult(string path, bool windowsIndexed = false)
+        {
+            var progressBarColor = "#26a0da";
+            int? progressValue = null;
+            var title = string.Empty; // hide title when use progress bar,
+            var driveLetter = path.Substring(0, 1).ToUpper();
+            var driveName = driveLetter + ":\\";
+            DriveInfo drv = new DriveInfo(driveLetter);
+            var subtitle = toReadableSize(drv.AvailableFreeSpace, 2) + " free of " + toReadableSize(drv.TotalSize, 2);
+            double UsingSize = (Convert.ToDouble(drv.TotalSize) - Convert.ToDouble(drv.AvailableFreeSpace)) / Convert.ToDouble(drv.TotalSize) * 100;
+
+            progressValue = Convert.ToInt32(UsingSize);
+
+            if (progressValue >= 90)
+                progressBarColor = "#da2626";
+
+            return new Result
+            {
+                Title = title,
+                SubTitle = subtitle,
+                AutoCompleteText = GetPathWithActionKeyword(path, ResultType.Folder),
+                IcoPath = path,
+                Score = 500,
+                ProgressBar = progressValue,
+                ProgressBarColor = progressBarColor,
+                Action = c =>
+                {
+                    Context.API.OpenDirectory(path);
+                    return true;
+                },
+                TitleToolTip = path,
+                SubTitleToolTip = path,
+                ContextData = new SearchResult
+                {
+                    Type = ResultType.Folder,
+                    FullPath = path,
+                    ShowIndexState = true,
+                    WindowsIndexed = windowsIndexed
+                }
+            };
+        }
+
         private static string toReadableSize(long pDrvSize, int pi)
         {
             int mok = 0;
             double drvSize = pDrvSize;
             string Space = "Byte";
-            string returnStr = "";
 
             while (drvSize > 1024.0)
             {
@@ -91,7 +132,7 @@ private static string toReadableSize(long pDrvSize, int pi)
             }
 
             if (mok == 1)
-                Space =  "KB";
+                Space = "KB";
             else if (mok == 2)
                 Space = " MB";
             else if (mok == 3)
@@ -99,17 +140,25 @@ private static string toReadableSize(long pDrvSize, int pi)
             else if (mok == 4)
                 Space = " TB";
 
+            var returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
             if (mok != 0)
-                if (pi == 1)
-                    returnStr = string.Format("{0:F1}{1}", drvSize, Space);
-                else if (pi == 2)
-                    returnStr = string.Format("{0:F2}{1}", drvSize, Space);
-                else if (pi == 3)
-                    returnStr = string.Format("{0:F3}{1}", drvSize, Space);
-                else
-                    returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
-            else
-                returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
+            {
+                switch (pi)
+                {
+                    case 1:
+                        returnStr = string.Format("{0:F1}{1}", drvSize, Space);
+                        break;
+                    case 2:
+                        returnStr = string.Format("{0:F2}{1}", drvSize, Space);
+                        break;
+                    case 3:
+                        returnStr = string.Format("{0:F3}{1}", drvSize, Space);
+                        break;
+                    default:
+                        returnStr = string.Format("{0}{1}", Convert.ToInt32(drvSize), Space);
+                        break;
+                }
+            }
 
             return returnStr;
         }
@@ -123,28 +172,19 @@ internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIn
                 Path.DirectorySeparatorChar
             }, StringSplitOptions.None).Last();
 
-            var title = "Open current directory";
-
-            if (retrievedDirectoryPath != path)
-                title = "Open " + folderName;
-
-            var subtitleFolderName = folderName;
-            var subtitle = $"Use > to search within {subtitleFolderName}, " +
-                           $"* to search for file extensions or >* to combine both searches.";
-
-            int? progressBar = null;
             if (retrievedDirectoryPath.EndsWith(":\\"))
             {
-                title = ""; // hide title when use progress bar,
                 var driveLetter = path.Substring(0, 1).ToUpper();
                 folderName = driveLetter + " drive";
-                var driveName = driveLetter + ":\\";
-                DriveInfo drv = new DriveInfo(driveLetter);
-                subtitle = toReadableSize(drv.AvailableFreeSpace, 2) + " free of " + toReadableSize(drv.TotalSize, 2);
-                double UsingSize = ((Convert.ToDouble(drv.TotalSize) - Convert.ToDouble(drv.AvailableFreeSpace)) / Convert.ToDouble(drv.TotalSize) * 100);
-                progressBar = Convert.ToInt32(UsingSize);
             }
 
+            var title = "Open current directory";
+
+            if (retrievedDirectoryPath != path)
+                title = "Open " + folderName;
+
+
+            var subtitleFolderName = folderName;
 
             // ie. max characters can be displayed without subtitle cutting off: "Program Files (x86)"
             if (folderName.Length > 19)
@@ -153,11 +193,11 @@ internal static Result CreateOpenCurrentFolderResult(string path, bool windowsIn
             return new Result
             {
                 Title = title,
-                SubTitle = subtitle,
+                SubTitle = $"Use > to search within {subtitleFolderName}, " +
+                           $"* to search for file extensions or >* to combine both searches.",
                 AutoCompleteText = GetPathWithActionKeyword(retrievedDirectoryPath, ResultType.Folder),
                 IcoPath = retrievedDirectoryPath,
                 Score = 500,
-                ProgressBar = progressBar,
                 Action = c =>
                 {
                     Context.API.OpenDirectory(retrievedDirectoryPath);
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
index 2b56cdf6ea5..4bddbda5770 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -123,7 +123,14 @@ public async Task<List<Result>> PathSearchAsync(Query query, CancellationToken t
 
             var useIndexSearch = UseWindowsIndexForDirectorySearch(locationPath);
 
-            results.Add(ResultManager.CreateOpenCurrentFolderResult(locationPath, useIndexSearch));
+            if (locationPath.EndsWith(":\\"))
+            {
+                results.Add(ResultManager.CreateDriveSpaceDisplayResult(locationPath, useIndexSearch));
+            }
+            else
+            {
+                results.Add(ResultManager.CreateOpenCurrentFolderResult(locationPath, useIndexSearch));
+            }
 
             token.ThrowIfCancellationRequested();