From c0ac56022ca12d730c07feeae691748819797a07 Mon Sep 17 00:00:00 2001
From: l0o0 <linxzh1989@gmail.com>
Date: Wed, 2 Sep 2020 15:33:26 +0800
Subject: [PATCH] Add function to remove dot in Chinese lastname and firstname.
 Fix error in 0.0.5

---
 chrome/content/overlay.xul         |  1 +
 chrome/content/preferences.xul     |  2 ++
 chrome/content/scripts/jasminum.js | 23 ++++++++++++++++++++++-
 chrome/locale/en-US/overlay.dtd    |  4 +++-
 chrome/locale/zh-CN/overlay.dtd    |  4 +++-
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index 1665346..5b048f5 100644
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -20,6 +20,7 @@
 			<menupopup id="jasminum">
 				<menuitem  label="&jasminum.namehandler.split.label;" oncommand="Zotero.Jasminum.splitNameM();"/>
 				<menuitem  label="&jasminum.namehandler.merge.label;" oncommand="Zotero.Jasminum.mergeNameM();"/>
+                <menuitem  label="&jasminum.namehandler.removeDot.label;" oncommand="Zotero.Jasminum.removeDotM();"/>
 			</menupopup>
 		</menu>
 		<menuitem id="zotero-itemmenu-jasminum" 
diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul
index 9924fc9..a5aa1a3 100644
--- a/chrome/content/preferences.xul
+++ b/chrome/content/preferences.xul
@@ -14,6 +14,7 @@
                 <preference id="pref-jasminum.zhnamesplit" name="extensions.zotero.jasminum.zhnamesplit" type="bool"/>
                 <preference id="pref-jasminum.rename" name="extensions.zotero.jasminum.rename" type="bool"/>
                 <preference id="pref-jasminum.autobookmark" name="extensions.zotero.jasminum.autobookmark" type="bool"/>
+                <preference id="pref-jasminum.zhnamedot" name="extensions.zotero.jasminum.zhnamedot" type="bool"/>
             </preferences>
             <tabbox>
                 <tabs>
@@ -30,6 +31,7 @@
                                 <checkbox id="jasminum.zhnamesplit" label="&jasminum.zhnamesplit.label;" preference="pref-jasminum.zhnamesplit"/>
                                 <checkbox id="jasminum.rename" label="&jasminum.rename.label;" preference="pref-jasminum.rename"/>
                                 <checkbox id="jasminum.autobookmark" label="&jasminum.autobookmark.label;" preference="pref-jasminum.autobookmark"/>
+                                <!-- <checkbox id="jasminum.zhnamedot" label="&jasminum.zhnamedot.label;" preference="pref-jasminum.zhnamedot"/> -->
                                 <separator/>
                                 <vbox flex="1">
                                     <description>&jasminum.namepatent.desc;</description>
diff --git a/chrome/content/scripts/jasminum.js b/chrome/content/scripts/jasminum.js
index 389f639..1436b76 100644
--- a/chrome/content/scripts/jasminum.js
+++ b/chrome/content/scripts/jasminum.js
@@ -867,7 +867,7 @@ Zotero.Jasminum = {
         }
         var bookmark = await Zotero.Jasminum.getBookmark(item);
         if (!bookmark) {
-            alert("No Bookmark found!\n书签信息未找到")；
+            alert("No Bookmark found!\n书签信息未找到");
         }
         await Zotero.Jasminum.addBookmark(item, bookmark);
         // Use zotfile to add TOC
@@ -965,6 +965,27 @@ Zotero.Jasminum = {
             }
         }
     },
+
+    removeDotM: function () {
+        var items = ZoteroPane.getSelectedItems();
+        Zotero.Jasminum.removeDot(items);
+    },
+
+    removeDot: async function (items) {
+        for (let item of items) {
+            var attachmentIDs = item.getAttachments();
+            for (let id of attachmentIDs) {
+                var atta = Zotero.Items.get(id);
+                var newName = atta.attachmentFilename.replace(
+                    /([\u4e00-\u9fa5]), ([\u4e00-\u9fa5])/g,
+                    "$1$2"
+                );
+                await atta.renameAttachmentFile(newName);
+                atta.setField("title", newName);
+                atta.saveTx();
+            }
+        }
+    },
 };
 
 window.addEventListener(
diff --git a/chrome/locale/en-US/overlay.dtd b/chrome/locale/en-US/overlay.dtd
index c2969bb..b74d19b 100644
--- a/chrome/locale/en-US/overlay.dtd
+++ b/chrome/locale/en-US/overlay.dtd
@@ -18,4 +18,6 @@
 <!ENTITY jasminum.namepatent.desc "Filename format:{&#37;g}=Chinese fullname，{&#37;t}=title, {&#37;y}=year, seperate by '_'，ignore file extension">
 <!ENTITY jasminum.zhnamesplit.label "Split firstname and lastname when get metadata(Including CNKI web translators)">
 <!ENTITY jasminum.rename.label "Use Zotfile to rename attachment(Need Zotfile installed)">
-<!ENTITY jasminum.autobookmark.label "Add bookmark to thesis PDF when adding thesis item from CNKI">
\ No newline at end of file
+<!ENTITY jasminum.autobookmark.label "Add bookmark to thesis PDF when adding thesis item from CNKI">
+<!ENTITY jasminum.zhnamedot.label "Remove ', ' between Chinese characters when Zotfile rename attachment file.">
+<!ENTITY jasminum.namehandler.removeDot.label "Remove dot in filename">
\ No newline at end of file
diff --git a/chrome/locale/zh-CN/overlay.dtd b/chrome/locale/zh-CN/overlay.dtd
index beec89e..82e7019 100644
--- a/chrome/locale/zh-CN/overlay.dtd
+++ b/chrome/locale/zh-CN/overlay.dtd
@@ -18,4 +18,6 @@
 <!ENTITY jasminum.namepatent.desc "根据文件名抓取知网元数据，文件名格式设置:{&#37;g}=全名，{&#37;t}=标题名，{&#37;y}=年份，以下划线_分隔，不用考虑文件后缀名">
 <!ENTITY jasminum.zhnamesplit.label "抓取题录信息时拆分中文姓，名(包括知网页面抓取)">
 <!ENTITY jasminum.rename.label "拉取知网元数据后调用Zotfile重命名附件(需安装Zotfile)">
-<!ENTITY jasminum.autobookmark.label "从知网添加学位论文时自动添加书签">
\ No newline at end of file
+<!ENTITY jasminum.autobookmark.label "从知网添加学位论文时自动添加书签(暂不支持从知网网页抓取论文)">
+<!ENTITY jasminum.zhnamedot.label "当拉取知网元数据时去除 Zotfile 重命名文件名中的逗号(, )">
+<!ENTITY jasminum.namehandler.removeDot.label "去除文件中逗号">
\ No newline at end of file