Update

lzcapp · Nov 24, 2024 · d26f6ec · d26f6ec
1 parent ac6bae6
commit d26f6ec
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/KindleMate2/FrmMain.cs b/KindleMate2/FrmMain.cs
@@ -11,6 +11,7 @@
 using KindleMate2.Entities;
 using KindleMate2.Properties;
 using Markdig;
+using Markdig.Helpers;
 
 namespace KindleMate2 {
     public partial class FrmMain : Form {
@@ -840,6 +841,7 @@ .. File.ReadAllLines(clippingsPath)
             var delimiterIndex = new List<int>();
 
             for (var i = 0; i < lines.Count; i++) {
+                lines[i] = RemoveControlChar(lines[i]);
                 if (lines[i].StartsWith("===") && lines[i - 2].Trim().Equals("") && lines[i].EndsWith("===")) {
                     delimiterIndex.Add(i);
                 }
@@ -897,7 +899,7 @@ .. File.ReadAllLines(clippingsPath)
                         clippingtypelocation = split_b[0][1..].Trim();
                     }
                     var pagenumber = -1;
-                    var pagenPattern = @"#\d+(-\d+)?";
+                    var pagenPattern = @"\d+(-\d+)?";
                     var isPagenIsMatch = Regex.IsMatch(clippingtypelocation, pagenPattern);
                     var romanPattern = @"^(M{0,3})(CM|CD|D?C{0,3})(XC|XL|L?X{0,3})(IX|IV|V?I{0,3})$";
                     var isRomanMatched = Regex.IsMatch(clippingtypelocation, romanPattern);
@@ -1535,7 +1537,6 @@ private void MenuImportKindle_Click(object sender, EventArgs e) {
         private void SetProgressBar(bool isShow) {
             progressBar.Enabled = isShow;
             progressBar.Visible = isShow;
-            Enabled = !isShow;
         }
 
         private void MenuImportKindleMate_Click(object sender, EventArgs e) {
@@ -2716,5 +2717,13 @@ private void TreeViewWords_KeyDown(object sender, KeyEventArgs e) {
                 MenuBooksDelete_Click(sender, e);
             }
         }
+
+        private static string RemoveControlChar(string input) {
+            var output = new StringBuilder();
+            foreach (var c in input.Where(c => !c.IsControl() && !c.IsNewLineOrLineFeed() && c != 65279)) {
+                output.Append(c);
+            }
+            return output.ToString();
+        }
     }
 }
diff --git a/KindleMate2/KindleMate2.csproj b/KindleMate2/KindleMate2.csproj
@@ -22,7 +22,7 @@
 		<LangVersion>latest</LangVersion>
 		<PackageLicenseUrl>https://github.com/lzcapp/KindleMate2/blob/main/LICENSE</PackageLicenseUrl>
 		<TargetFrameworks></TargetFrameworks>
-		<Version>2024.10.9</Version>
+		<Version>2024.11.21</Version>
 		<Deterministic>false</Deterministic>
 		<AssemblyVersion></AssemblyVersion>
 		<FileVersion></FileVersion>