Merge pull request #11 from lqllife/master

修改图片地址正则，支持 ![[image.png|alt]] 格式链接

Author: haierkeys

.github/workflows/build-test.yml

@@ -0,0 +1,45 @@
+name: Test Build Plugin
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  workflow_dispatch:
+
+env:
+  PLUGIN_NAME: custom-image-auto-uploader-modified
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          run_install: false
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".node-version"
+          cache: "pnpm"
+
+      - name: Build
+        run: |
+          pnpm install
+          pnpm run build
+
+          mkdir ${{ env.PLUGIN_NAME }}
+          cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
+
+      - name: Upload Test Artifact ✅
+        uses: actions/upload-artifact@v4
+        with:
+          name: obsidian-plugin-test-build
+          path: |
+            main.js
+            manifest.json
+            styles.css

.github/workflows/release.yml

@@ -1,19 +1,23 @@
-name: Build plugin
+name: Release plugin
 
 on:
   push:
     tags:
       - "*"
+  workflow_dispatch:
 
 env:
-  PLUGIN_NAME: custom-image-auto-uploader
+  PLUGIN_NAME: custom-image-auto-uploader-modified
 
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: pnpm/action-setup@v4
         with:
           run_install: false
@@ -32,10 +36,10 @@ jobs:
           mkdir ${{ env.PLUGIN_NAME }}
           cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
           zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
-          ls
-          echo "::set-output name=tag_name::$(git tag --sort version:refname | tail -n 1)"
+
+          echo "tag_name=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT
+
       - name: Create Release
-        id: create_release
         uses: actions/create-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -44,43 +48,3 @@ jobs:
           release_name: ${{ github.ref }}
           draft: false
           prerelease: false
-      - name: Upload zip file
-        id: upload-zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.PLUGIN_NAME }}.zip
-          asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
-          asset_content_type: application/zip
-      - name: Upload main.js
-        id: upload-main
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./main.js
-          asset_name: main.js
-          asset_content_type: text/javascript
-      - name: Upload manifest.json
-        id: upload-manifest
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./manifest.json
-          asset_name: manifest.json
-          asset_content_type: application/json
-      - name: Upload styles.css
-        id: upload-css
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./styles.css
-          asset_name: styles.css
-          asset_content_type: application/json

src/main.ts

@@ -4,7 +4,7 @@ import { imageDown, imageUpload, statusCheck, replaceInText, hasExcludeDomain, a
 import { DownTask, UploadTask } from "./interface"
 import { $ } from "./lang"
 
-const mdImageRegex = /!\[([^\]]*)\][\(|\[](.*?)\s*("(?:.*[^"])")?\s*[\)|\]]|!\[\[([^\]]*)\]\]/g
+const mdImageRegex = /!\[([^\]]*)\][\(|\[](.*?)\s*("(?:.*[^"])")?\s*[\)|\]]|!\[\[([^\]|]*)\|?([^\]]*)\]\]/g
 
 export default class CustomImageAutoUploader extends Plugin {
   settingTab: SettingTab
@@ -150,7 +150,7 @@ export default class CustomImageAutoUploader extends Plugin {
         continue
       }
 
-      let imageAlt = match[3] ? match[3] : match[1] ? match[1] : ""
+      let imageAlt = match[3] ? match[3] : match[1] ? match[1] : match[5] ? match[5] : ""
       imageAlt = imageAlt.replaceAll('"', "")
       downloadTasks.push({
         matchText: match[0],
@@ -221,7 +221,7 @@ export default class CustomImageAutoUploader extends Plugin {
       let readfile = await getAttachmentUploadPath(file, this)
       if (!readfile) continue
 
-      const imageAlt = match[3] ? match[3] : match[1] ? match[1] : file
+      const imageAlt = match[3] ? match[3] : match[1] ? match[1] : match[5] ? match[5] : file
       uploadTasks.push({
         matchText: match[0],
         imageAlt,