Refactor attachment location handling and update version to 1.1.1

Author: addozhang

README.md

@@ -27,6 +27,11 @@ Perfect for publishing to static sites like [GitHub Pages](https://pages.github.
 - **Preservation** - Keep your original notes unchanged in your vault
 - **Customizable Paths** - Configure target paths for your uploaded images
 - **Optional In-Place Replacement** - Option to update original files directly if preferred
+- **Flexible Attachment Locations** – Choose where attachments are saved:
+  - Vault folder: Adds the attachment to the root of your vault.
+  - In the folder specified below: Adds the attachment to a specified folder.
+  - Same folder as current file: Adds the attachment to the same folder as the note you added it to.
+  - In subfolder under current folder: Adds attachments to a specified folder next to the note you added the attachment to. If it doesn't exist, Obsidian creates it when you add an attachment.
 
 ## 🔍 Usage
 

manifest.json

@@ -6,5 +6,5 @@
   "authorUrl": "https://atbug.com",
   "isDesktopOnly": true,
   "minAppVersion": "0.11.0",
-  "version": "1.1.0"
+  "version": "1.1.1"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-image-upload-toolkit",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "",
   "author": "addozhang",
   "main": "main.js",

src/publish.ts

@@ -22,7 +22,6 @@ export interface PublishSettings {
     imageAltText: boolean;
     replaceOriginalDoc: boolean;
     ignoreProperties: boolean;
-    attachmentLocation: string;
     imageStore: string;
     showProgressModal: boolean; // New setting to control progress modal display
     //Imgur Anonymous setting
@@ -40,7 +39,6 @@ const DEFAULT_SETTINGS: PublishSettings = {
     imageAltText: true,
     replaceOriginalDoc: false,
     ignoreProperties: true,
-    attachmentLocation: ".",
     imageStore: ImageStore.IMGUR.id,
     showProgressModal: true, // Default to showing the modal
     imgurAnonymousSetting: {clientId: IMGUR_PLUGIN_CLIENT_ID},

src/ui/publishSettingTab.ts

@@ -1,4 +1,4 @@
-import {App, Notice, PluginSettingTab, Setting} from "obsidian";
+import {App, PluginSettingTab, Setting} from "obsidian";
 import ObsidianPublish from "../publish";
 import ImageStore from "../imageStore";
 import {AliYunRegionList} from "../uploader/oss/common";
@@ -21,24 +21,6 @@ export default class PublishSettingTab extends PluginSettingTab {
         const imageStoreTypeDiv = containerEl.createDiv();
         this.imageStoreDiv = containerEl.createDiv();
 
-        // Attachment location
-        new Setting(imageStoreTypeDiv)
-            .setName("Attachment location")
-            .setDesc("The location storing images which will upload images from.")
-            .addText(text =>
-                text
-                    .setPlaceholder("Enter folder name")
-                    .setValue(this.plugin.settings.attachmentLocation)
-                    .onChange(async (value) => {
-                        if ((await this.app.vault.getAbstractFileByPath(value)) == null) {
-                            new Notice(`Attachment location "${value}" not exist!`)
-                            return
-                        }
-                        this.plugin.settings.attachmentLocation = value;
-
-                    })
-            );
-
         new Setting(imageStoreTypeDiv)
             .setName("Use image name as Alt Text")
             .setDesc("Whether to use image name as Alt Text with '-' and '_' replaced with space.")

src/uploader/imageTagProcessor.ts

@@ -1,4 +1,4 @@
-import {App, Editor, FileSystemAdapter, MarkdownView, normalizePath, Notice, setIcon} from "obsidian";
+import {App, Editor, FileSystemAdapter, MarkdownView, normalizePath, Notice} from "obsidian";
 import path from "path";
 import ImageUploader from "./imageUploader";
 import {PublishSettings} from "../publish";
@@ -24,12 +24,12 @@ interface ResolvedImagePath {
 export const ACTION_PUBLISH: string = "PUBLISH";
 
 export default class ImageTagProcessor {
-    private app: App;
+    private readonly app: App;
     private readonly imageUploader: ImageUploader;
     private settings: PublishSettings;
     private adapter: FileSystemAdapter;
     private progressModal: UploadProgressModal | null = null;
-    private useModal: boolean = true; // Set to true to use modal, false to use status bar
+    private readonly useModal: boolean = true; // Set to true to use modal, false to use status bar
 
     constructor(app: App, settings: PublishSettings, imageUploader: ImageUploader, useModal: boolean = true) {
         this.app = app;
@@ -186,8 +186,10 @@ export default class ImageTagProcessor {
             imageName;
 
         if(imageName.indexOf('/') < 0) {
-            pathName = path.join(this.app.vault.config.attachmentFolderPath, pathName);
-            if (this.app.vault.config.attachmentFolderPath.startsWith('.')) {
+            // @ts-ignore: config is not defined in vault api, but available
+            const attachmentFolderPath = this.app.vault.config.attachmentFolderPath;
+            pathName = path.join(attachmentFolderPath, pathName);
+            if (attachmentFolderPath.startsWith('.')) {
                 pathName = './' + pathName;
             }
         }