new: save image manually

rainyl · rainyl · commit 1bb96ec5932e · 2023-05-10T10:43:56.000+08:00
diff --git a/Flow.Launcher.Plugin.ClipboardR.sln b/Flow.Launcher.Plugin.ClipboardR.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClipboardR.Core.Test", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "build\Build.csproj", "{8AE1016A-11A6-4A6C-B5F4-97149923841C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClipboardR.Panels.Test", "src\ClipboardR.Panels.Test\ClipboardR.Panels.Test.csproj", "{B5DC21C9-618A-48D1-969F-E8D5BF7FBFD6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +41,10 @@ Global
 		{8AE1016A-11A6-4A6C-B5F4-97149923841C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8AE1016A-11A6-4A6C-B5F4-97149923841C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8AE1016A-11A6-4A6C-B5F4-97149923841C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B5DC21C9-618A-48D1-969F-E8D5BF7FBFD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B5DC21C9-618A-48D1-969F-E8D5BF7FBFD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B5DC21C9-618A-48D1-969F-E8D5BF7FBFD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B5DC21C9-618A-48D1-969F-E8D5BF7FBFD6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/README.md b/README.md
@@ -14,6 +14,13 @@ Original Repo: [Wox.Plugin.ClipboardManager](https://github.com/Wox-launcher/Wox
 
 Ported to Flow.Launcher: [Flow.Launcher.Plugin.ClipboardHistory](https://github.com/liberize/Flow.Launcher.Plugin.ClipboardHistory)
 
+## Features
+
+- Preview panel, support images
+- Copy & delete record
+- Cache images supported
+- Manually save images
+
 ## Installation
 
 ### Using release
@@ -40,8 +47,9 @@ If you want to save images in your clipboard, open the `CacheImages` option in s
 
 ## Todo List
 
-- [ ] Save images maually
-- [ ] Cached images format defination
+- [x] Save images manually
+- [ ] Cached images format definition
+- [ ] Image OCR
 
 ## License
 
diff --git a/build/Build.csproj b/build/Build.csproj
@@ -3,6 +3,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0-windows</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Cake.Compression" Version="0.3.0" />
diff --git a/build/Program.cs b/build/Program.cs
@@ -34,7 +34,7 @@ public class BuildContext : FrostingContext
     public Lazy<SolutionParserResult> DefaultSln { get; set; }
     public const string DeployFramework = "net7.0-windows";
     public string PublishDir = ".dist";
-    public string PublishVersion = "0.2.0";
+    public string PublishVersion = "0.2.1";
 
     public BuildContext(ICakeContext context)
         : base(context)
diff --git a/src/ClipboardR.Core/Utils.cs b/src/ClipboardR.Core/Utils.cs
@@ -0,0 +1,25 @@
+﻿using System.Drawing;
+
+namespace ClipboardR.Core;
+
+public static class Utils
+{
+    private static Random _random = new();
+
+    public static string RandomString(int length)
+    {
+        const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
+        return new string(Enumerable.Repeat(chars, length)
+            .Select(s => s[_random.Next(s.Length)]).ToArray());
+    }
+    
+    public static string? SaveImageCache(ClipboardData clipboardData, DirectoryInfo clipCacheDir)
+    {
+        if (clipboardData.Data is not Image img) return null;
+        var name = RandomString(10);
+        var path = Path.Join(clipCacheDir.FullName, $"{name}.png");
+
+        img.Save(path);
+        return path;
+    }
+}
diff --git a/src/ClipboardR.Panels/Images/save.png b/src/ClipboardR.Panels/Images/save.png
diff --git a/src/ClipboardR.Panels/PreviewPanel.xaml b/src/ClipboardR.Panels/PreviewPanel.xaml
@@ -6,10 +6,11 @@
              xmlns:local="clr-namespace:ClipboardR.Panels"
              mc:Ignorable="d">
     <UserControl.Resources>
-        <Image x:Key="Copy" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/copy.png" Height="30" Width="30" />
-        <Image x:Key="Pin" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/pin.png" Height="30" Width="30" />
-        <Image x:Key="Pined" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/pined.png" Height="30" Width="30" />
-        <Image x:Key="Delete" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/delete.png" Height="30" Width="30" />
+        <Image x:Key="CopyIcon" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/copy.png" Height="30" Width="30" />
+        <Image x:Key="PinIcon" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/pin.png" Height="30" Width="30" />
+        <Image x:Key="PinedIcon" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/pined.png" Height="30" Width="30" />
+        <Image x:Key="DeleteIcon" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/delete.png" Height="30" Width="30" />
+        <Image x:Key="SaveIcon" Source="pack://application:,,,/ClipboardR.Panels;Component/Images/save.png"></Image>
     </UserControl.Resources>
     <Grid
           MinWidth="300" MinHeight="100"
@@ -26,7 +27,17 @@
                x:Name="PreImage" Margin="3,3,3,3"
                HorizontalAlignment="Center" VerticalAlignment="Center"
                Visibility="Hidden" 
-               MaxWidth="320" MaxHeight="400" />
+               MaxWidth="320" MaxHeight="400" >
+            <Image.ContextMenu>
+                <ContextMenu>
+                    <MenuItem Header="Save" Click="ImSaveAs_Click">
+                        <MenuItem.Icon>
+                            <DynamicResource ResourceKey="SaveIcon"></DynamicResource>
+                        </MenuItem.Icon>
+                    </MenuItem>
+                </ContextMenu>
+            </Image.ContextMenu>
+        </Image>
         <TextBox Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Grid.RowSpan="1" IsUndoEnabled="False"
                  x:Name="TxtBoxPre" HorizontalAlignment="Center"
                  Panel.ZIndex="1" FontSize="14" TextAlignment="Left" Padding="5,5,5,5" 
@@ -49,21 +60,21 @@
                     HorizontalAlignment="Center" VerticalAlignment="Bottom"
                     Width="33" Height="33" Padding="0, 0, 0, 0"
                     Margin="5,5,5,5" Click="BtnCopy_Click" >
-                <DynamicResource ResourceKey="Copy"/>
+                <DynamicResource ResourceKey="CopyIcon"/>
             </Button>
             <Button Grid.Row="0" Grid.Column="1"
                     x:Name="BtnPin" ToolTip="Pin on top"
                     HorizontalAlignment="Center" VerticalAlignment="Bottom"
                     Width="33" Height="33" Padding="0, 0, 0, 0"
                     Margin="5,5,5,5" Click="BtnPin_Click" >
-                <DynamicResource ResourceKey="Pined"/>
+                <DynamicResource ResourceKey="PinIcon"/>
             </Button>
             <Button Grid.Row="0" Grid.Column="2"
                 x:Name="BtnDelete" ToolTip="Delete this record"
                 HorizontalAlignment="Center" VerticalAlignment="Bottom" 
                 Width="33" Height="33" Padding="0, 0, 0, 0"
                 Margin="5,5,5,5" Click="BtnDelete_Click" >
-                <DynamicResource ResourceKey="Delete"/>
+                <DynamicResource ResourceKey="DeleteIcon"/>
             </Button>
         </Grid>
         
diff --git a/src/ClipboardR.Panels/PreviewPanel.xaml.cs b/src/ClipboardR.Panels/PreviewPanel.xaml.cs
@@ -16,16 +16,20 @@ public partial class PreviewPanel : UserControl
 {
     private ClipboardData _clipboardData;
     private PluginInitContext _context;
+    private DirectoryInfo CacheDir { get; set; }
     private Action<ClipboardData> DeleteOneRecord { get; set; }
     private Action<ClipboardData> CopyRecord { get; set; }
     private Action<ClipboardData> PinRecord { get; set; }
     private int OldScore { get; set; }
 
-    public PreviewPanel(ClipboardData clipboardData, PluginInitContext context, Action<ClipboardData> delAction,
+    public PreviewPanel(ClipboardData clipboardData, PluginInitContext context,
+        DirectoryInfo cacheDir,
+        Action<ClipboardData> delAction,
         Action<ClipboardData> copyAction, Action<ClipboardData> pinAction)
     {
         _clipboardData = clipboardData;
         _context = context;
+        CacheDir = cacheDir;
         DeleteOneRecord = delAction;
         CopyRecord = copyAction;
         PinRecord = pinAction;
@@ -86,7 +90,7 @@ private void BtnDelete_Click(object sender, System.Windows.RoutedEventArgs e)
 
     private void SetBtnIcon()
     {
-        BtnPin.Content = FindResource(_clipboardData.Pined ? "Pined" : "Pin");
+        BtnPin.Content = FindResource(_clipboardData.Pined ? "PinedIcon" : "PinIcon");
     }
     
     private void TxtBoxPre_GotFocus(object sender, System.Windows.RoutedEventArgs e)
@@ -105,4 +109,9 @@ private void BtnPin_Click(object sender, RoutedEventArgs e)
         _clipboardData.Score = _clipboardData.Pined ? int.MaxValue : _clipboardData.InitScore;
         PinRecord?.Invoke(_clipboardData);
     }
+
+    private void ImSaveAs_Click(object sender, RoutedEventArgs e)
+    {
+        Utils.SaveImageCache(_clipboardData, CacheDir);
+    }
 }
diff --git a/src/ClipboardR/Main.cs b/src/ClipboardR/Main.cs
@@ -9,7 +9,6 @@
 using System.Windows.Media.Imaging;
 using WindowsInput;
 using WK.Libraries.SharpClipboardNS;
-using Image = System.Drawing.Image;
 using ClipboardR.Core;
 using ClipboardR.Panels;
 
@@ -23,7 +22,6 @@ public class ClipboardR : IPlugin, IDisposable, ISettingProvider, ISavable
     private string _defaultIconPath = null!;
     private const int MaxDataCount = 1000;
     private const string PinUnicode = "📌";
-    private static Random _random = new();
     private Settings _settings = null!;
     private string _settingsPath = null!;
     private int CurrentScore { get; set; } = 0;
@@ -86,6 +84,7 @@ private Result ClipDataToResult(ClipboardData o)
             PreviewPanel = new Lazy<UserControl>(() => new PreviewPanel(
                 o,
                 _context!,
+                ClipCacheDir,
                 delAction: RemoveFromDatalist,
                 copyAction: CopyToClipboard,
                 pinAction: PinOneRecord
@@ -126,7 +125,7 @@ private void _OnClipboardChange(object? sender, SharpClipboard.ClipboardChangedE
                 break;
             case SharpClipboard.ContentTypes.Image:
                 clipboardData.Text = $"Image:{clipboardData.Time:yy-MM-dd-HH:mm:ss}";
-                if (_settings.CacheImages) SaveImageCache(clipboardData);
+                if (_settings.CacheImages) Utils.SaveImageCache(clipboardData, ClipCacheDir);
                 clipboardData.Icon = _clipboard.ClipboardImage.ToBitmapImage();
 
                 break;
@@ -153,25 +152,8 @@ private void _OnClipboardChange(object? sender, SharpClipboard.ClipboardChangedE
         CurrentScore++;
     }
 
-    private string? SaveImageCache(ClipboardData clipboardData)
-    {
-        if (clipboardData.Data is not Image img) return null;
-        var name = RandomString(10);
-        var path = Path.Join(ClipCacheDir.FullName, $"{name}.png");
-
-        img.Save(path);
-        return path;
-    }
-
     public Control CreateSettingPanel() => new SettingsPanel(_settings, _context!);
 
-    private string RandomString(int length)
-    {
-        const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-";
-        return new string(Enumerable.Repeat(chars, length)
-            .Select(s => s[_random.Next(s.Length)]).ToArray());
-    }
-
     public void Dispose()
     {
     }
diff --git a/src/ClipboardR/plugin.json b/src/ClipboardR/plugin.json
@@ -4,7 +4,7 @@
     "Name": "ClipboardR",
     "Description": "A clipboard plugin for Flow.Launcher, support pictures!",
     "Author": "Rainyl",
-    "Version": "0.2.0",
+    "Version": "0.2.1",
     "Language": "csharp",
     "Website": "https://github.com/rainyl/Flow.Launcher.Plugin.ClipboardR",
     "IcoPath": "Images/clipboard.png",
