Merge branch 'develop'

Author: JackGruber

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## not released
 
+## v1.2.2 (2025-04-27)
+
+- Fix: Placeholder for the error message `notebookNotExist` was output instead of the translation string
+- Add: Option to import from SUbfolders
+
 ## v1.2.1 (2024-11-26)
 
 - Fix: Don't add empty tag when tag ends with `,` or contains several `,` directly behind each other #37

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin-plugin-hotfolder",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "scripts": {
     "dist": "webpack --env joplin-plugin-config=buildMain && webpack --env joplin-plugin-config=buildExtraScripts && webpack --env joplin-plugin-config=createArchive",
     "prepare": "npm run test && npm run dist && husky install",

package.json

@@ -240,7 +240,7 @@ class Hotfolder {
           this.log.error("Notebook: " + importNotebook + " dose not exist");
           await this.showMsg(
             i18n.__(
-              "error.notebookNotExist",
+              "msg.error.notebookNotExist",
               importNotebook.trim(),
               hotfolderNr == 0 ? "" : hotfolderNr + 1
             )
@@ -254,7 +254,7 @@ class Hotfolder {
         const watcher = chokidar.watch(hotfolderPath, {
           persistent: true,
           alwaysStat: true,
-          depth: 0,
+          depth: hotfolderSettings.depth,
           usePolling: hotfolderSettings.usePolling,
           interval: hotfolderSettings.pollingIntervall,
           binaryInterval: hotfolderSettings.pollingIntervall * 2,

src/hotfolder.ts

@@ -43,6 +43,10 @@
     "pollingIntervall": {
       "label": "Abfrage intervall",
       "description": "Intervall in millisekunden zur Abfrage des Hotfolders"
+    },
+    "depth": {
+      "label": "Depth",
+      "description": "Wie viel Unterordner sollen für den datei Import geprüft werden"
     }
   },
   "msg": {

src/locales/de_DE.json

@@ -43,6 +43,10 @@
     "pollingIntervall": {
       "label": "Polling intervall",
       "description": "Interval in milliseconds for querying the hotfolder"
+    },
+    "depth": {
+      "label": "Depth",
+      "description": "How many subdirectories will be checked for file import"
     }
   },
   "msg": {

src/locales/en_US.json

@@ -2,7 +2,7 @@
   "manifest_version": 1,
   "id": "io.github.jackgruber.hotfolder",
   "app_min_version": "1.8.1",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "name": "Hotfolder",
   "description": "Monitors a locale folder and import the files as a new note.",
   "author": "JackGruber",

src/manifest.json

@@ -127,6 +127,18 @@ export namespace settings {
         description: i18n.__("settings.pollingIntervall.description"),
       };
 
+      settingsObject["depth" + (hotfolderNr == 0 ? "" : hotfolderNr)] = {
+        value: 0,
+        minimum: 0,
+        maximum: 10,
+        type: SettingItemType.Int,
+        section: "hotfolderSection" + (hotfolderNr == 0 ? "" : hotfolderNr),
+        public: true,
+        advanced: true,
+        label: i18n.__("settings.depth.label"),
+        description: i18n.__("settings.depth.description"),
+      };
+
       if (hotfolderNr === 0) {
         await joplin.settings.registerSettings({
           hotfolderAnz: {
@@ -217,6 +229,8 @@ export namespace settings {
       "pollingIntervall" + hotfolderNrStr
     );
 
+    const depth = await joplin.settings.value("depth" + hotfolderNrStr);
+
     return {
       notebookId: notebookId,
       importTags: importTags,
@@ -227,6 +241,7 @@ export namespace settings {
       usePolling: usePolling,
       pollingIntervall: pollingIntervall,
       intervallFileFinished: intervallFileFinished,
+      depth: depth,
     };
   }
 }

src/settings.ts

@@ -14,6 +14,7 @@ interface hotfolderSettings {
   intervallFileFinished: number;
   usePolling: boolean;
   pollingIntervall: number;
+  depth: number;
 }
 
 export { processFile, hotfolderSettings };