Update

Author: lzcapp

KindleMate2/FrmMain.cs

@@ -717,7 +717,7 @@ private string ImportKMDatabase(string selectedFilePath) {
                         continue;
                     }
 
-                    if (_staticData.IsExistClippingsOfContent(row["content"].ToString())) {
+                    if (_staticData.IsExistClippingsOfContent(row["content"].ToString()) > 0) {
                         continue;
                     }
 
@@ -887,7 +887,7 @@ private bool HandleClipplings(string line1, string line2, string line3, string l
             var split_b = line2.Split('|');
 
             var clippingtypelocation = string.Empty;
-            line2 = line2[2..];
+            line2 = line2.Replace("- ", "", StringComparison.OrdinalIgnoreCase);
             var indexOf = line2.LastIndexOf('|');
             if (indexOf >= 0) {
                 clippingtypelocation = line2[..(indexOf - 1)];
@@ -2166,34 +2166,24 @@ private string CleanDatabase() {
                         continue;
                     }
 
-                    switch (contentTrimmed.Equals(content)) {
-                        case false when !booknameTrimmed.Equals(bookname): {
-                                if (_staticData.UpdateClippings(key, contentTrimmed, booknameTrimmed)) {
-                                    countTrimmed++;
-                                }
-                                break;
-                            }
-                        case false: {
-                                if (_staticData.UpdateClippings(key, contentTrimmed, string.Empty)) {
-                                    countTrimmed++;
-                                }
-                                break;
-                            }
-                        default: {
-                                if (!booknameTrimmed.Equals(bookname)) {
-                                    if (_staticData.UpdateClippings(key, string.Empty, booknameTrimmed)) {
-                                        countTrimmed++;
-                                    }
-                                }
-                                break;
-                            }
+                    if (!contentTrimmed.Equals(content) && !booknameTrimmed.Equals(bookname)) {
+                        if (_staticData.UpdateClippings(key, contentTrimmed, booknameTrimmed)) {
+                            countTrimmed++;
+                        }
+                    } else if (!contentTrimmed.Equals(content)) {
+                        if (_staticData.UpdateClippings(key, contentTrimmed, bookname)) {
+                            countTrimmed++;
+                        }
+                    } else if (!booknameTrimmed.Equals(bookname)) {
+                        if (_staticData.UpdateClippings(key, string.Empty, booknameTrimmed)) {
+                            countTrimmed++;
+                        }
                     }
 
-                    if (!_staticData.IsExistClippings(key, content)) {
-                        continue;
-                    }
-                    if (_staticData.DeleteClippingsByKey(key)) {
-                        countDuplicated++;
+                    if (_staticData.IsExistClippingsOfContent(content) > 1) {
+                        if (_staticData.DeleteClippingsByKey(key)) {
+                            countDuplicated++;
+                        }
                     }
                 }
 

KindleMate2/FrmMain.resx

@@ -138,7 +138,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAA2B8AAAJNU0Z0AUkBTAIBAQMB
-        AAHIAQ4ByAEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
+        AAHYAQ4B2AEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
         GRYAAlYBVQGuAZkBZgEiAf8BmQFmASIB/wHmAaYBUAH/Ae4BrAFVAf8B7gGsAVUB/wHuAawBVQH/Ae4B
         rAFVAf8B7gGsAVUB/wHuAawBVQH/Ae4BrAFVAf8B7gGsAVUB/wHuAawBVQH/Ae4BrAFVAf8B7gGsAVUB
         /wHDAYgBOwH/AwMBBGAAAzYBWQFCAUEBQgFyAUIBQQFCAXIDQgFyA0IBcwNCAXIDQgFyA0IBcgNCAXID
@@ -284,7 +284,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs
         LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu
         SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAxiIAAAJNU0Z0AUkBTAIBAQMB
-        AAHAAQ4BwAEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
+        AAHQAQ4B0AEOARQBAAEUAQAD/wEAASEBAAj/AUIBTQE2BwABNgMAASgDAAFQAwABFAMAAQEBAAEgBgAB
         GRIAAycBOgJjAV8B2gHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB
         /wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMBiAE7Af8BwwGIATsB/wHDAYgBOwH/AcMB
         iAE7Af8BwwGIATsB/wHDAYgBOwH/AmMBXwHaAycBOgMnAToCYwFfAdoBwwGIATsB/wHDAYgBOwH/AcMB

KindleMate2/StaticData.cs

@@ -259,11 +259,11 @@ internal bool IsExistClippings(string key, string content) {
             return result > 0;
         }
 
-        internal bool IsExistClippingsOfContent(string? content) {
+        internal int IsExistClippingsOfContent(string? content) {
             switch (content) {
                 case null:
                 case "":
-                    return true;
+                    return 0;
             }
 
             const string queryCount = "SELECT COUNT(*) FROM clippings WHERE content = @content";
@@ -272,7 +272,7 @@ internal bool IsExistClippingsOfContent(string? content) {
 
             var result = Convert.ToInt32(commandCount.ExecuteScalar());
 
-            return result > 0;
+            return result;
         }
 
         internal bool IsExistClippingsContainingContent(string? content) {