improve copy,pin,delete icon, add UtilsTest.cs

Author: rainyl

build/Program.cs

@@ -116,6 +116,7 @@ public override void Run(BuildContext context)
             @"Clipboar.+\.dll|"
             + @".+\.png|"
             + @"Dapper\.dll|Svg\.dll|Material\.Icons\.dll|"
+            + @"Material.Icons.WPF\.dll|"
             + @"ExCSS\.dll|"
             + @"plugin\.json|H\.InputSimulator\.dll|"
             + @"SQLitePCLRaw.+\.dll|Microsoft.+(S|s)qlite\.dll";

src/ClipboardR.Core.Test/UtilsTest.cs

@@ -0,0 +1,34 @@
+using System.Text;
+using System.Text.Unicode;
+using Xunit.Abstractions;
+
+namespace ClipboardR.Core.Test;
+
+public class UtilsTest
+{
+    private readonly ITestOutputHelper _testOutputHelper;
+
+    public UtilsTest(ITestOutputHelper testOutputHelper)
+    {
+        _testOutputHelper = testOutputHelper;
+    }
+
+    [Theory]
+    [InlineData("QQ.exe", 1)]
+    [InlineData("", 0)]
+    [InlineData("在池台的正中，像当初的怀中，隔太多春秋会不能相拥", 24)]
+    [InlineData(
+        "Out of the tens of thousands of people, we are fortunate enough to "
+            + "meet each other, and in an instant, there is a profound clarity and understanding.",
+        27
+    )]
+    [InlineData("你好，~", 4)]
+    [InlineData("你好，Hello啊.\nabc‘ def(), qwe'", 9)]
+    public void TestWordsCount(string s, int n)
+    {
+        var nw = Utils.CountWordsEn(s) + Utils.CountWordsCn(s);
+        _testOutputHelper.WriteLine($"En：{Utils.CountWordsEn(s)}, Cn: {Utils.CountWordsCn(s)}");
+        _testOutputHelper.WriteLine($"{n}:{nw}");
+        Assert.True(n == nw);
+    }
+}

src/ClipboardR.Core/DbHelper.cs

@@ -13,34 +13,34 @@ public class DbHelper
     private string SqlCheckTableRecord = "SELECT name from sqlite_master WHERE name='record'";
 
     private string SqlCreateDb = """
-        CREATE TABLE assets (
-            id	INTEGER NOT NULL UNIQUE,
-            data_b64	TEXT,
-            md5 TEXT UNIQUE ,
-            PRIMARY KEY("id" AUTOINCREMENT)
-        );
+                                 CREATE TABLE assets (
+                                     id	INTEGER NOT NULL UNIQUE,
+                                     data_b64	TEXT,
+                                     md5 TEXT UNIQUE ,
+                                     PRIMARY KEY("id" AUTOINCREMENT)
+                                 );
 
-        CREATE TABLE "record" (
-            "id"	INTEGER NOT NULL UNIQUE,
-            "hash_id"	TEXT UNIQUE,
-            "data_md5"	TEXT,
-            "text"	TEXT,
-            "display_title"	TEXT,
-            "senderapp"	TEXT,
-            "icon_path"	TEXT,
-            "icon_md5"	TEXT,
-            "preview_image_path"	TEXT,
-            "content_type"	INTEGER,
-            "score"	INTEGER,
-            "init_score"	INTEGER,
-            "time"	TEXT,
-            "create_time"	TEXT,
-            "pined"	INTEGER,
-            PRIMARY KEY("id" AUTOINCREMENT),
-            FOREIGN KEY("icon_md5") REFERENCES "assets"("md5"),
-            FOREIGN KEY("data_md5") REFERENCES "assets"("md5") ON DELETE CASCADE
-        );
-        """;
+                                 CREATE TABLE "record" (
+                                     "id"	INTEGER NOT NULL UNIQUE,
+                                     "hash_id"	TEXT UNIQUE,
+                                     "data_md5"	TEXT,
+                                     "text"	TEXT,
+                                     "display_title"	TEXT,
+                                     "senderapp"	TEXT,
+                                     "icon_path"	TEXT,
+                                     "icon_md5"	TEXT,
+                                     "preview_image_path"	TEXT,
+                                     "content_type"	INTEGER,
+                                     "score"	INTEGER,
+                                     "init_score"	INTEGER,
+                                     "time"	TEXT,
+                                     "create_time"	TEXT,
+                                     "pined"	INTEGER,
+                                     PRIMARY KEY("id" AUTOINCREMENT),
+                                     FOREIGN KEY("icon_md5") REFERENCES "assets"("md5"),
+                                     FOREIGN KEY("data_md5") REFERENCES "assets"("md5") ON DELETE CASCADE
+                                 );
+                                 """;
 
     public DbHelper(SqliteConnection connection)
     {
@@ -131,6 +131,7 @@ await Connection.ExecuteAsync(
             sql = "PRAGMA foreign_keys = ON; DELETE FROM assets WHERE md5=@DataMd5;";
             await Connection.ExecuteAsync(sql, new { DataMd5 = dataMd5 });
         }
+
         CloseIfNotKeep();
     }
 
@@ -141,28 +142,43 @@ public async void DeleteAllRecords()
         CreateDb();
     }
 
-    public async void PinOneRecord(ClipboardData clipboardData)
+    public async void PinOneRecord(ClipboardData data)
     {
-        var sql = "UPDATE record SET pined=@Pin WHERE hash_id=@HashId";
+        var sql = "INSERT OR IGNORE INTO assets(data_b64, md5) VALUES (@DataB64, @Md5);";
+        var iconB64 = data.Icon.ToBase64();
+        var iconMd5 = iconB64.GetMd5();
+        var rows = await Connection.ExecuteAsync(
+            sql,
+            new List<Assets>
+            {
+                new() { DataB64 = iconB64, Md5 = iconMd5 },
+            }
+        );
+        sql = "UPDATE record SET pined=@Pin, icon_md5=@IconMd5 WHERE hash_id=@HashId";
         await Connection.ExecuteAsync(
             sql,
-            new { Pin = clipboardData.Pined, HashId = clipboardData.HashId }
+            new
+            {
+                Pin = data.Pined,
+                HashId = data.HashId,
+                IconMd5 = iconMd5
+            }
         );
         CloseIfNotKeep();
     }
 
     public async Task<LinkedList<ClipboardData>> GetAllRecord()
     {
         var sql = """
-            SELECT r.id as Id, a.data_b64 as DataMd5, r.text as Text, r.display_title as DisplayTitle, 
-                   r.senderapp as SenderApp, r.icon_path as IconPath, b.data_b64 as IconMd5, 
-                   r.preview_image_path as PreviewImagePath, r.content_type as ContentType,
-                   r.score as Score, r.init_score as InitScore, r.time as Time,
-                   r.create_time as CreateTime, r.pined as Pined, r.hash_id as HashId
-                 FROM record r
-                 LEFT JOIN assets a ON r.data_md5=a.md5
-                 LEFT JOIN assets b ON r.icon_md5=b.md5;
-            """;
+                  SELECT r.id as Id, a.data_b64 as DataMd5, r.text as Text, r.display_title as DisplayTitle,
+                         r.senderapp as SenderApp, r.icon_path as IconPath, b.data_b64 as IconMd5,
+                         r.preview_image_path as PreviewImagePath, r.content_type as ContentType,
+                         r.score as Score, r.init_score as InitScore, r.time as Time,
+                         r.create_time as CreateTime, r.pined as Pined, r.hash_id as HashId
+                       FROM record r
+                       LEFT JOIN assets a ON r.data_md5=a.md5
+                       LEFT JOIN assets b ON r.icon_md5=b.md5;
+                  """;
         var results = await Connection.QueryAsync<Record>(sql);
         LinkedList<ClipboardData> allRecord = new(results.Select(Record.ToClipboardData));
         CloseIfNotKeep();
@@ -172,10 +188,10 @@ FROM record r
     public async void DeleteRecordByKeepTime(int contentType, int keepTime)
     {
         var sql = """
-            DELETE FROM record
-                WHERE strftime('%s', 'now') - strftime('%s', create_time) > @KeepTime*3600
-                AND content_type=@ContentType;
-            """;
+                  DELETE FROM record
+                      WHERE strftime('%s', 'now') - strftime('%s', create_time) > @KeepTime*3600
+                      AND content_type=@ContentType;
+                  """;
         var r = await Connection.ExecuteAsync(
             sql,
             new { KeepTime = keepTime, ContentType = contentType }
@@ -227,17 +243,21 @@ public class Record
     public int Score { get; set; }
     public int InitScore { get; set; }
     public DateTime _time;
+
     public string Time
     {
         get => _time.ToString("O");
         set => _time = DateTime.Parse(value);
     }
+
     public DateTime _create_time;
+
     public string CreateTime
     {
         get => _create_time.ToString("O");
         set => _create_time = DateTime.Parse(value);
     }
+
     public bool Pined { get; set; }
 
     public static Record FromClipboardData(ClipboardData data)

src/ClipboardR.Core/Utils.cs

@@ -1,4 +1,7 @@
-namespace ClipboardR.Core;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace ClipboardR.Core;
 
 public static class Utils
 {
@@ -12,6 +15,26 @@ public static string RandomString(int length)
         );
     }
 
+    public static int CountWords(string s)
+    {
+        return CountWordsCn(s) + CountWordsEn(s);
+    }
+
+    public static int CountWordsCn(string s)
+    {
+        var nCn = (Encoding.UTF8.GetByteCount(s) - s.Length) / 2;
+        // var nCn = s.ToCharArray().Count(c => c >= 0x4E00 && c <= 0x9FFF);
+        return nCn;
+    }
+
+    public static int CountWordsEn(string s)
+    {
+        // // TODO: count more reasonable
+        s = string.Join("", s.Where(c => c < 0x4E00));
+        var collection = Regex.Matches(s, @"[\S]+");
+        return collection.Count;
+    }
+
     public static string GetGuid()
     {
         return Guid.NewGuid().ToString("D");

src/ClipboardR.Panels.Test/ClipboardR.Panels.Test.csproj

@@ -11,4 +11,8 @@
       <ProjectReference Include="..\ClipboardR.Panels\ClipboardR.Panels.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="Material.Icons.WPF" Version="2.0.0" />
+    </ItemGroup>
+
 </Project>

src/ClipboardR.Panels.Test/MainWindow.xaml

@@ -8,9 +8,15 @@
         mc:Ignorable="d"
         Title="MainWindow" Height="450" Width="800">
     <Grid>
-        <panels:SettingsPanel
-            x:Name="SettingsPanel"
-            />
-
+        <TabControl
+            SelectedIndex="1">
+            <TabItem Header="Settings">
+                <panels:SettingsPanel
+                    x:Name="SettingsPanel" />
+            </TabItem>
+            <TabItem Header="Preview">
+                <panels:PreviewPanel />
+            </TabItem>
+        </TabControl>
     </Grid>
-</Window>
+</Window>