🐛 Fix: migrate bug when url isn't with extname suffix && windows style path

ISSUES CLOSED: #5, #57, #64, #65

Author: Molunerfinn

.gitignore

@@ -5,3 +5,4 @@ yarn-error.log
 temp.js
 package-lock.json
 test/test_new.md
+.serena/

AGENTS.md

@@ -0,0 +1,39 @@
+# Repository Guidelines
+
+## Project Structure & Module Organization
+- `src/index.ts` is the plugin entry that wires PicGo CLI/GUI commands, config schema, and migration flow.
+- `src/lib/Migrater.ts` orchestrates URL discovery and upload; `src/lib/FileHandler.ts` reads/writes markdown and rewrites URLs; `src/utils.ts` hosts small helpers.
+- `src/i18n` holds locale strings; keep keys stable when adding translations.
+- `src/types` contains type declarations used by the compiler.
+- `dist/` is the compiled output from TypeScript—do not edit by hand.
+- `test/` includes sample markdown/assets, and `test.js` is a Node integration script that exercises `dist/index.js`.
+
+## Build, Test, and Development Commands
+```bash
+pnpm install           # install deps (uses pnpm-lock.yaml)
+pnpm build             # compile TypeScript to dist/
+pnpm dev               # watch & rebuild during development
+pnpm lint              # eslint on src + type-check (tsc --noEmit)
+pnpm test              # runs test.js against dist; run build first
+```
+Run commands from the repo root. Avoid editing `dist/` manually; regenerate via `pnpm build` when needed.
+
+## Coding Style & Naming Conventions
+- TypeScript, CommonJS target es2017; 2-space indentation and single quotes to match existing files.
+- Classes in PascalCase (e.g., `FileHandler`), functions/variables in camelCase, constants in SCREAMING_SNAKE_CASE.
+- Keep plugin config keys under `picgo-plugin-pic-migrater.*`; prefer explicit types and early returns.
+- ESLint extends `eslint-config-love`; `pnpm lint` is the source of truth—fix or annotate intentionally justified cases.
+
+## Testing Guidelines
+- `pnpm test` migrates `test/test.md` via compiled `dist/`; ensure `pnpm build` has run and sample files remain intact.
+- When adding tests, prefer integration-style checks in `test/` that assert rewritten markdown output and file creation.
+- If adding new migration cases, include minimal fixtures and document expected suffixes (`newFileSuffix`) to avoid accidental overwrites.
+
+## Commit & Pull Request Guidelines
+- Use commitizen for messages: `pnpm cz`. Commitlint follows the PicGo convention (emoji scopes such as `:bug: Fix: ...`, `:tada: Release: ...`); keep messages imperative and scoped.
+- Keep commits small and focused; only update `dist/` for releases or when explicitly required.
+- PRs should describe the change, link related issues, and note how to reproduce or verify. Provide CLI output or screenshots/gifs when affecting user-facing flows (CLI help, GUI notifications).
+
+## Security & Configuration Tips
+- The plugin reads/writes markdown files; double-check glob patterns before running migrations to avoid unwanted edits.
+- Avoid logging sensitive paths or credentials in PicGo configs; sanitize sample configs in docs and tests.

package.json

@@ -64,5 +64,8 @@
     "compare-versions": "^5.0.0",
     "globby": "^9.0.0",
     "image-size": "^1.0.2"
+  },
+  "engines": {
+    "node": ">=14.13.1"
   }
 }

src/index.ts

@@ -11,8 +11,7 @@ const replaceAll = (content: string, originText: string, replaceText: string): s
   if (originText === replaceText) {
     return content
   }
-  content = content.replace(new RegExp(originText, 'g'), replaceText)
-  return content
+  return content.split(originText).join(replaceText)
 }
 const checkVersion = (ctx: PicGo, guiApi: any): void => {
   if (guiApi) {

src/lib/Migrater.ts

@@ -3,7 +3,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { IImgInfo, PicGo } from 'picgo'
-import { getImageSize, isUrl, isUrlEncode } from '../utils'
+import { getImageSize, isUrl, isUrlEncode, normalizePath } from '../utils'
 
 class Migrater {
   ctx: PicGo
@@ -88,12 +88,17 @@ class Migrater {
       }
     }
 
-    result.urls = output.filter(item => item.imgUrl && item.imgUrl !== item.origin).map(item => {
+    result.urls = output.map((item, index) => {
+      const original = toUploadImgs[index]?.origin ?? item.origin
+      if (!item.imgUrl || !original || item.imgUrl === original) {
+        return null
+      }
       return {
-        original: item.origin,
-        new: item.imgUrl as string
+        original,
+        new: item.imgUrl
       }
-    })
+    }).filter((item) => item !== null)
+
     result.success = result.urls.length
 
     this.ctx.setConfig({
@@ -104,22 +109,22 @@ class Migrater {
   }
 
   getLocalPath (imgPath: string): string | false {
-    let localPath = imgPath
+    let localPath = normalizePath(imgPath)
     if (!path.isAbsolute(localPath)) {
-      localPath = path.join(this.baseDir, localPath)
+      localPath = normalizePath(path.join(this.baseDir, localPath))
     }
     if (fs.existsSync(localPath)) {
-      console.log('1', localPath)
+      console.log('exist absolute local path', localPath)
       return localPath
     } else {
       // if path is url encode, try decode
       if (isUrlEncode(imgPath)) {
-        localPath = decodeURI(imgPath)
+        localPath = normalizePath(decodeURI(imgPath))
         if (!path.isAbsolute(localPath)) {
-          localPath = path.join(this.baseDir, localPath)
+          localPath = normalizePath(path.join(this.baseDir, localPath))
         }
         if (fs.existsSync(localPath)) {
-          console.log('2', localPath)
+          console.log('exist related local path', localPath)
           return localPath
         }
       }
@@ -156,17 +161,19 @@ class Migrater {
   }
 
   async handlePicFromURL (url: string): Promise<IImgInfo | undefined> {
+    const rawFileName = path.basename(url.split('?')[0].split('#')[0]) || 'image'
     try {
       const buffer = await this.getPicFromURL(url)
-      const fileName = path.basename(url).split('?')[0].split('#')[0]
       const imgSize = getImageSize(buffer)
-      console.log(imgSize)
+      const imgType = (imgSize.type ?? 'png').replace(/^\./, '')
+      const extname = `.${imgType}`
+      const fileName = path.extname(rawFileName) ? rawFileName : `${rawFileName}${extname}`
       return {
         buffer,
         fileName,
         width: imgSize.width,
         height: imgSize.height,
-        extname: `.${imgSize.type ?? 'png'}`,
+        extname,
         origin: url
       }
     } catch (e) {

src/utils.ts

@@ -1,5 +1,6 @@
 import sizeOf from 'image-size'
 import { IImgSize } from 'picgo'
+import path from 'node:path'
 
 interface IImgSizeInfo extends IImgSize {
   type?: string
@@ -42,3 +43,5 @@ export const handleUrlEncode = (url: string): string => {
   }
   return url
 }
+
+export const normalizePath = (p: string): string => path.normalize(p.replace(/\\+/g, '/'))

test.js

@@ -1,5 +1,6 @@
 const { PicGo } = require('picgo')
 const PluginMigrater = require('./dist/index')
+const assert = require('assert')
 
 const picgo = new PicGo()
 
@@ -11,9 +12,11 @@ picgo.setConfig({
   }
 })
 
-const plugin = PluginMigrater(picgo);
+const plugin = picgo.use(PluginMigrater);
 
 (async () => {
   const res = await plugin.migrateFiles(['./test/test.md']) // { total: number, success: number }
   console.log(res)
+  assert.strictEqual(res.success, 6)
+  assert.strictEqual(res.total, 7)
 })();

test/test.md

@@ -1,13 +1,20 @@
 ## Test case
 
+Hello. How are you?
+
 ### url
 
 ![](https://raw.githubusercontent.com/Molunerfinn/test/master/img/logo__2022-08-08%2B17_34_11.jpeg)
 
 <img alt="test" src="https://raw.githubusercontent.com/Molunerfinn/test/master/test/picgo-logo.png">
 
+<img alt="test" src="https://mmbiz.qpic.cn/mmbiz_png/n8UWicng6vIA4usX2sOyd5NibTrl07M89U5MMpQsicyoiatWVlib95H1w1Sricw08C6oQ2PicufjA073In29F9zEY5vdg/640?wx_fmt=png">
+
+<img alt="test" src="https://mmbiz.qpic.cn/mmbiz_png/error_image">
+
 ### local file
 
 ![](./picgo-logo.png)
+![](.\picgo-logo.png)
 
 <img alt="test" src="./picgo%20logo.png">