refactor: post pull all (#282)

Author: cnblogs-dudu

build.mjs

@@ -33,22 +33,27 @@ async function buildExtension() {
             copyPlugin({
                 src: 'src/assets',
                 dest: `${OUT_DIR}/assets`,
+                errorOnExist: false,
             }),
             copyPlugin({
                 src: 'node_modules/@mapbox/node-pre-gyp',
                 dest: `${OUT_DIR}/node_modules/@mapbox/node-pre-gyp`,
+                errorOnExist: false,
             }),
             copyPlugin({
                 src: 'node_modules/sequelize',
                 dest: `${OUT_DIR}/node_modules/sequelize`,
+                errorOnExist: false,
             }),
             copyPlugin({
                 src: 'node_modules/@fluentui/font-icons-mdl2/fonts/',
                 dest: `${OUT_DIR}/assets/fonts`,
+                errorOnExist: false,
             }),
             copyPlugin({
                 src: 'src/wasm/rs_bg.wasm',
                 dest: `${OUT_DIR}/rs_bg.wasm`,
+                errorOnExist: false,
             }),
         ],
     }
@@ -72,6 +77,7 @@ async function buildUI(...apps) {
                 copyPlugin({
                     src: `${srcPath}${app}/index.html`,
                     dest: `${outPath}${app}/index.html`,
+                    errorOnExist: false,
                 }),
             ],
         }

src/cmd/post-list/open-post-in-vscode.ts

@@ -1,21 +1,10 @@
 import { Uri } from 'vscode'
-import { Post } from '@/model/post'
 import { Alert } from '@/infra/alert'
 import { PostFileMapManager } from '@/service/post/post-file-map'
 import { openPostFile } from './open-post-file'
-import sanitizeFileName from 'sanitize-filename'
-import { WorkspaceCfg } from '@/ctx/cfg/workspace'
 import { fsUtil } from '@/infra/fs/fsUtil'
 import { postPull } from './post-pull'
 
-export function buildLocalPostFileUri(post: Post, appendToFileName = ''): Uri {
-    const workspaceUri = WorkspaceCfg.getWorkspaceUri()
-    const ext = `${post.isMarkdown ? 'md' : 'html'}`
-    let postTitle = sanitizeFileName(post.title)
-    if (/\.\d+$/.test(postTitle)) postTitle += '_'
-    return Uri.joinPath(workspaceUri, `${postTitle}${appendToFileName}.${post.id}.${ext}`)
-}
-
 export async function openPostInVscode(postId: number): Promise<Uri | undefined> {
     const mappedPostFilePath = await getMappedPostFilePath(postId)
 

src/cmd/post-list/post-pull-all.ts

@@ -3,10 +3,8 @@ import { Alert } from '@/infra/alert'
 import { PostFileMapManager } from '@/service/post/post-file-map'
 import { basename } from 'path'
 import { ProgressLocation, Uri, window, workspace } from 'vscode'
-import { buildLocalPostFileUri } from '@/cmd/post-list/open-post-in-vscode'
 import { UserService } from '@/service/user.service'
 import { fsUtil } from '@/infra/fs/fsUtil'
-import { WorkspaceCfg } from '@/ctx/cfg/workspace'
 
 enum ConflictStrategy {
     ask,
@@ -65,22 +63,22 @@ export async function postPullAll() {
 
             p.report({ message: `${post.title}` })
 
-            const path = PostFileMapManager.getFilePath(post.id)
+            const fileUri = PostFileMapManager.ensurePostFileUri(post)
+            if (fileUri == null) {
+                console.warn('fileUri is null')
+                return
+            }
 
-            // 本地没有博文或关联到的文件不存在
-            if (
-                path === undefined ||
-                !(await fsUtil.exists(path)) ||
-                path.indexOf(WorkspaceCfg.getWorkspaceUri().fsPath) < 0
-            ) {
-                const uri = buildLocalPostFileUri(post)
+            if (!(await fsUtil.exists(fileUri.fsPath))) {
                 const buf = Buffer.from(post.postBody)
-                await workspace.fs.writeFile(uri, buf)
-                await PostFileMapManager.updateOrCreate(post.id, uri.path)
+                await workspace.fs.writeFile(fileUri, buf)
+                await PostFileMapManager.updateOrCreate(post.id, fileUri.path)
+                console.info(`Writing post ${post.id} to file '${fileUri.fsPath}'`)
                 continue
             }
 
-            const fileName = basename(path)
+            const fsPath = fileUri.fsPath
+            const fileName = basename(fsPath)
 
             // 存在冲突
             if (strategy === ConflictStrategy.ask) {
@@ -90,17 +88,17 @@ export async function postPullAll() {
                 )
 
                 if (answer === '覆盖') {
-                    await overwriteFile(path, post.postBody)
+                    await overwriteFile(fsPath, post.postBody)
                 } else if (answer === '退出') {
                     break
                 } else if (answer === '跳过所有冲突') {
                     strategy = ConflictStrategy.skip
                 } else if (answer === '覆盖全部') {
                     strategy = ConflictStrategy.overwrite
-                    await overwriteFile(path, post.postBody)
+                    await overwriteFile(fsPath, post.postBody)
                 } // answer eq undefined or '跳过', do nothing.
             } else if (strategy === ConflictStrategy.overwrite) {
-                await overwriteFile(path, post.postBody)
+                await overwriteFile(fsPath, post.postBody)
             } // strategy eq ConflictStrategy.skip, do nothing.
         }
 

src/cmd/post-list/post-pull.ts

@@ -1,7 +1,6 @@
 import { Uri, window, workspace } from 'vscode'
 import { Post } from '@/model/post'
 import { PostFileMapManager } from '@/service/post/post-file-map'
-import { buildLocalPostFileUri } from '@/cmd/post-list/open-post-in-vscode'
 import { PostService } from '@/service/post/post'
 import { Alert } from '@/infra/alert'
 import path from 'path'
@@ -48,11 +47,11 @@ export async function postPull(input: InputType, showConfirm = true, mute = fals
     let uriPath = PostFileMapManager.getFilePath(post.id)
     let fileUri: Uri
     if (uriPath == null) {
-        fileUri = buildLocalPostFileUri(post)
+        fileUri = PostFileMapManager.buildLocalPostFileUri(post)
     } else {
         // replace fsPath with uriPath
         if (!uriPath.startsWith('/')) uriPath = Uri.file(uriPath).path
-        if (!PostFileMapManager.isInWorkspace(uriPath)) fileUri = buildLocalPostFileUri(post)
+        if (!PostFileMapManager.isInWorkspace(uriPath)) fileUri = PostFileMapManager.buildLocalPostFileUri(post)
         else fileUri = Uri.parse(uriPath)
     }
 

src/service/post/create.ts

@@ -20,7 +20,8 @@ export async function createPost() {
             return
         },
     })
-    if (title === undefined) return
+
+    if (title == null) return
 
     const filePath = path.join(workspacePath, `${title}.md`)
 

src/service/post/post-file-map.ts

@@ -4,6 +4,8 @@ import { LocalState } from '@/ctx/local-state'
 import { Uri } from 'vscode'
 import { WorkspaceCfg } from '@/ctx/cfg/workspace'
 import { r } from '@/infra/convert/string-literal'
+import { Post } from '@/model/post'
+import sanitizeFileName from 'sanitize-filename'
 
 const validatePostFileMap = (map: PostFileMap) => map[0] >= 0 && map[1] !== ''
 export type PostFileMap = [postId: number, filePath: string]
@@ -18,6 +20,20 @@ function isUriPath(path: string) {
 }
 
 export namespace PostFileMapManager {
+    export function ensurePostFileUri(post: Post) {
+        let fileUri = PostFileMapManager.getFileUri(post.id)
+        if (fileUri == null || !isInWorkspace(fileUri.path)) fileUri = buildLocalPostFileUri(post)
+        return fileUri
+    }
+
+    export function buildLocalPostFileUri(post: Post, appendToFileName = ''): Uri {
+        const workspaceUri = WorkspaceCfg.getWorkspaceUri()
+        const ext = `${post.isMarkdown ? 'md' : 'html'}`
+        let postTitle = sanitizeFileName(post.title)
+        if (/\.\d+$/.test(postTitle)) postTitle += '_'
+        return Uri.joinPath(workspaceUri, `${postTitle}${appendToFileName}.${post.id}.${ext}`)
+    }
+
     export async function updateOrCreateMany(
         arg:
             | {
@@ -68,12 +84,16 @@ export namespace PostFileMapManager {
         return map
     }
 
-    export function getFilePath(postId: number) {
+    export function getFilePath(postId: number): string | undefined {
+        return getFileUri(postId)?.fsPath
+    }
+
+    export function getFileUri(postId: number): Uri | undefined {
         const map = findByPostId(postId)
-        if (map === undefined) return
+        if (map == null) return
         const path = map[1]
         if (path === '') return
-        return isUriPath(path) ? Uri.parse(path).fsPath : path
+        return isUriPath(path) ? Uri.parse(path) : Uri.file(path)
     }
 
     export function getPostId(filePath: string): number | undefined {