From 7b31cc336e39043f391c678552d3213232c08a66 Mon Sep 17 00:00:00 2001
From: MuiseDestiny <muisedestiny@gmail.com>
Date: Tue, 23 Apr 2024 09:36:25 +0800
Subject: [PATCH] fix: #89

---
 addon/chrome/content/preferences.xhtml | 159 +++++++------------------
 package.json                           |   4 +-
 src/modules/menu.ts                    |   2 +-
 update-beta.json                       |   2 +-
 update.json                            |   2 +-
 5 files changed, 46 insertions(+), 123 deletions(-)

diff --git a/addon/chrome/content/preferences.xhtml b/addon/chrome/content/preferences.xhtml
index 734c126..2ce6158 100644
--- a/addon/chrome/content/preferences.xhtml
+++ b/addon/chrome/content/preferences.xhtml
@@ -1,10 +1,7 @@
 <linkset>
   <html:link rel="localization" href="__addonRef__-preferences.ftl" />
 </linkset>
-<vbox
-  id="zotero-prefpane-__addonRef__"
-  onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', {window})"
->
+<vbox id="zotero-prefpane-__addonRef__" onload="Zotero.__addonInstance__.hooks.onPrefsEvent('load', {window})">
   <groupbox>
     <label>
       <html:h2 data-l10n-id="source-title"></html:h2>
@@ -14,14 +11,8 @@
       <separator class="thin" />
       <hbox align="center">
         <label data-l10n-id="directory"></label>
-        <html:input
-          id="source-dir"
-          type="text"
-          readonly="true"
-          flex="1"
-          preference="extensions.zotero.__addonRef__.sourceDir"
-          style="background: none; border: none"
-        >
+        <html:input id="source-dir" type="text" readonly="true" flex="1"
+          preference="extensions.zotero.__addonRef__.sourceDir" style="background: none; border: none">
         </html:input>
         <button id="choose-source-dir" data-l10n-id="choose-dir"></button>
       </hbox>
@@ -29,21 +20,9 @@
         <label data-l10n-id="read-pdf-title"></label>
         <radiogroup preference="extensions.zotero.__addonRef__.readPDFtitle">
           <hbox>
-            <radio
-              id="readPDFtitle-never"
-              data-l10n-id="readPDFtitle-never"
-              value="never"
-            />
-            <radio
-              id="readPDFtitle-nonCJK"
-              data-l10n-id="readPDFtitle-nonCJK"
-              value="nonCJK"
-            />
-            <radio
-              id="readPDFtitle-always"
-              data-l10n-id="readPDFtitle-always"
-              value="always"
-            />
+            <radio id="readPDFtitle-never" data-l10n-id="readPDFtitle-never" value="never" />
+            <radio id="readPDFtitle-nonCJK" data-l10n-id="readPDFtitle-nonCJK" value="nonCJK" />
+            <radio id="readPDFtitle-always" data-l10n-id="readPDFtitle-always" value="always" />
           </hbox>
         </radiogroup>
       </hbox>
@@ -58,11 +37,7 @@
       <separator class="thin" />
       <hbox align="center">
         <label data-l10n-id="attach-type-start"></label>
-        <menulist
-          native="true"
-          id="attach-type"
-          preference="extensions.zotero.__addonRef__.attachType"
-        >
+        <menulist native="true" id="attach-type" preference="extensions.zotero.__addonRef__.attachType">
           <menupopup>
             <menuitem data-l10n-id="importing" value="importing" />
             <menuitem data-l10n-id="linking" value="linking" />
@@ -81,14 +56,8 @@
       <separator class="thin" />
       <hbox align="center">
         <label data-l10n-id="directory"></label>
-        <html:input
-          id="dest-dir"
-          type="text"
-          readonly="true"
-          flex="1"
-          preference="extensions.zotero.__addonRef__.destDir"
-          style="background: none; border: none"
-        >
+        <html:input id="dest-dir" type="text" readonly="true" flex="1"
+          preference="extensions.zotero.__addonRef__.destDir" style="background: none; border: none">
         </html:input>
         <button id="choose-dest-dir" data-l10n-id="choose-dir"></button>
       </hbox>
@@ -97,40 +66,27 @@
 
       <hbox align="center">
         <label data-l10n-id="subfolder"></label>
-        <html:input
-          id="subfolder-format"
-          type="text"
-          flex="1"
-          preference="extensions.zotero.__addonRef__.subfolderFormat"
-        >
+        <html:input id="subfolder-format" type="text" flex="1"
+          preference="extensions.zotero.__addonRef__.subfolderFormat">
         </html:input>
       </hbox>
-      <checkbox
-        native="false"
-        data-l10n-id="slash-as-subfolder-delimiter"
-        preference="extensions.zotero.__addonRef__.slashAsSubfolderDelimiter"
-      />
+      <checkbox native="false" data-l10n-id="slash-as-subfolder-delimiter"
+        preference="extensions.zotero.__addonRef__.slashAsSubfolderDelimiter" />
 
       <separator class="thin" />
 
       <hbox align="center">
         <label data-l10n-id="filename"></label>
-        <button
-          id="file-renaming-button"
-          data-l10n-id="preferences-file-renaming-customize-button"
+        <button id="file-renaming-button" data-l10n-id="preferences-file-renaming-customize-button"
           data-search-strings="preferences-file-renaming-format-title, preferences-file-renaming-format-template"
-          oncommand="Zotero_Preferences.navigateToPane('zotero-subpane-file-renaming')"
-        ></button>
+          oncommand="Zotero_Preferences.navigateToPane('zotero-subpane-file-renaming')"></button>
       </hbox>
 
       <separator class="thin" />
 
       <label data-l10n-id="preferences-file-renaming-format-instructions-more">
-        <label
-          is="zotero-text-link"
-          href="https://www.zotero.org/support/file_renaming"
-          data-l10n-name="file-renaming-format-help-link"
-        ></label>
+        <label is="zotero-text-link" href="https://www.zotero.org/support/file_renaming"
+          data-l10n-name="file-renaming-format-help-link"></label>
       </label>
     </vbox>
   </groupbox>
@@ -141,46 +97,29 @@
     <vbox align="start">
       <hbox style="display: inline-block">
         <label data-l10n-id="attach-new-file-shortcut"></label>
-        <html:input
-          type="text"
-          class="shortcut"
-          style="width: 8em"
-          preference="extensions.zotero.__addonRef__.attachNewFile.shortcut"
-        >
+        <html:input type="text" class="shortcut" style="width: 8em"
+          preference="extensions.zotero.__addonRef__.attachNewFile.shortcut">
         </html:input>
       </hbox>
       <hbox style="display: inline-block">
         <label data-l10n-id="match-attachment-shortcut"></label>
-        <html:input
-          type="text"
-          class="shortcut"
-          style="width: 8em"
-          preference="extensions.zotero.__addonRef__.matchAttachment.shortcut"
-        >
+        <html:input type="text" class="shortcut" style="width: 8em"
+          preference="extensions.zotero.__addonRef__.matchAttachment.shortcut">
         </html:input>
       </hbox>
-      <checkbox
-        native="true"
-        data-l10n-id="auto-rename"
-        preference="extensions.zotero.autoRenameFiles"
-      />
-      <checkbox
-        native="true"
-        data-l10n-id="auto-move"
-        preference="extensions.zotero.__addonRef__.autoMove"
-      />
-      <checkbox
-        native="true"
-        data-l10n-id="auto-remove-empty-folder"
-        preference="extensions.zotero.__addonRef__.autoRemoveEmptyFolder"
-      />
+      <hbox style="display: inline-block">
+        <label data-l10n-id="rename-shortcut"></label>
+        <html:input type="text" class="shortcut" style="width: 8em"
+          preference="extensions.zotero.__addonRef__.attachNewFile.shortcut">
+        </html:input>
+      </hbox>
+      <checkbox native="true" data-l10n-id="auto-rename" preference="extensions.zotero.autoRenameFiles" />
+      <checkbox native="true" data-l10n-id="auto-move" preference="extensions.zotero.__addonRef__.autoMove" />
+      <checkbox native="true" data-l10n-id="auto-remove-empty-folder"
+        preference="extensions.zotero.__addonRef__.autoRemoveEmptyFolder" />
       <hbox align="center">
         <label data-l10n-id="file-types"></label>
-        <html:input
-          type="text"
-          flex="1"
-          preference="extensions.zotero.__addonRef__.fileTypes"
-        >
+        <html:input type="text" flex="1" preference="extensions.zotero.__addonRef__.fileTypes">
         </html:input>
       </hbox>
     </vbox>
@@ -192,38 +131,22 @@
     <vbox align="start">
       <label data-l10n-id="about-intro"></label>
       <separator class="thin" />
-      <label
-        style="margin-inline: 6px 5px; text-decoration: none"
-        is="zotero-text-link"
-        href="https://github.com/MuiseDestiny/zotero-attanger"
-        class="zotero-text-link"
-      >
+      <label style="margin-inline: 6px 5px; text-decoration: none" is="zotero-text-link"
+        href="https://github.com/MuiseDestiny/zotero-attanger" class="zotero-text-link">
         ⭐ Star it
       </label>
-      <label
-        style="margin-inline: 6px 5px; text-decoration: none"
-        is="zotero-text-link"
-        href="https://github.com/MuiseDestiny"
-        class="zotero-text-link"
-      >
+      <label style="margin-inline: 6px 5px; text-decoration: none" is="zotero-text-link"
+        href="https://github.com/MuiseDestiny" class="zotero-text-link">
         🔍 See author's Github
       </label>
-      <label
-        style="margin-inline: 6px 5px; text-decoration: none"
-        is="zotero-text-link"
-        href="https://space.bilibili.com/13557814"
-        class="zotero-text-link"
-      >
+      <label style="margin-inline: 6px 5px; text-decoration: none" is="zotero-text-link"
+        href="https://space.bilibili.com/13557814" class="zotero-text-link">
         📺 See author's Bilibili
       </label>
-      <label
-        style="margin-inline: 6px 5px; text-decoration: none"
-        is="zotero-text-link"
-        href="https://gitee.com/MuiseDestiny/plugins"
-        class="zotero-text-link"
-      >
+      <label style="margin-inline: 6px 5px; text-decoration: none" is="zotero-text-link"
+        href="https://gitee.com/MuiseDestiny/plugins" class="zotero-text-link">
         🎊 See Pro plugins
       </label>
     </vbox>
   </groupbox>
-</vbox>
+</vbox>
\ No newline at end of file
diff --git a/package.json b/package.json
index b02b21c..32f0384 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zotero-attanger",
-  "version": "1.1.9",
+  "version": "1.2.0",
   "description": "Attanger for Zotero",
   "config": {
     "addonName": "Zotero Attanger",
@@ -134,4 +134,4 @@
       "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/modules/menu.ts b/src/modules/menu.ts
index 3fb7310..4e120c2 100644
--- a/src/modules/menu.ts
+++ b/src/modules/menu.ts
@@ -566,7 +566,7 @@ export async function moveFile(attItem: Zotero.Item) {
     // @ts-ignore 未添加属性
     Zotero.File.getValidFileName = _getValidFileName;
     ztoolkit.log("subfolder", subfolder);
-    destDir = PathUtils.normalize(PathUtils.joinRelative(destDir, subfolder));
+    destDir = PathUtils.joinRelative(destDir, subfolder);
   }
   const sourcePath = (await attItem.getFilePathAsync()) as string;
   if (!sourcePath) return;
diff --git a/update-beta.json b/update-beta.json
index 4b1a4c0..434d93f 100644
--- a/update-beta.json
+++ b/update-beta.json
@@ -3,7 +3,7 @@
     "zoteroattanger@polygon.org": {
       "updates": [
         {
-          "version": "1.1.9",
+          "version": "1.2.0",
           "update_link": "https://github.com/muisedestiny/zotero-attanger/releases/latest/download/zotero-attanger.xpi",
           "applications": {
             "zotero": {
diff --git a/update.json b/update.json
index 4b1a4c0..434d93f 100644
--- a/update.json
+++ b/update.json
@@ -3,7 +3,7 @@
     "zoteroattanger@polygon.org": {
       "updates": [
         {
-          "version": "1.1.9",
+          "version": "1.2.0",
           "update_link": "https://github.com/muisedestiny/zotero-attanger/releases/latest/download/zotero-attanger.xpi",
           "applications": {
             "zotero": {