Merge pull request #230 from cnblogs/fix-post-map

fix: file path in post map

Author: cnblogs-dudu

src/cmd/pdf/export-pdf.ts

@@ -144,7 +144,7 @@ function handlePostInput(post: Post | PostTreeItem) {
 
 async function handleUriInput(uri: Uri) {
     const { fsPath } = uri
-    const postId = PostFileMapManager.getPostId(fsPath)
+    const postId = PostFileMapManager.getPostId(uri.path)
     if (postId === undefined) return []
     const { post: inputPost } = await PostService.getPostEditDto(postId)
 

src/cmd/post-list/copy-link.ts

@@ -35,7 +35,7 @@ export async function copyPostLink(input: Post | PostTreeItem | Uri) {
         post = input.post
     } else {
         // input instanceof Uri
-        const postId = PostFileMapManager.findByFilePath(input.fsPath)?.[0]
+        const postId = PostFileMapManager.findByFilePath(input.path)?.[0]
         if (postId === undefined || postId <= 0) {
             void Alert.fileNotLinkedToPost(input)
             return

src/cmd/post-list/modify-post-setting.ts

@@ -22,7 +22,7 @@ export async function modifyPostSetting(input: Post | PostTreeItem | Uri) {
         postId = input.id
     } else {
         //type of input is Uri
-        postId = PostFileMapManager.getPostId(input.fsPath) ?? -1
+        postId = PostFileMapManager.getPostId(input.path) ?? -1
         if (postId < 0) return Alert.fileNotLinkedToPost(input)
     }
 

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

@@ -52,7 +52,7 @@ export async function openPostInVscode(postId: number, forceUpdateLocalPostFile
 
     // 博文内容写入本地文件, 若文件不存在, 会自动创建对应的文件
     await workspace.fs.writeFile(fileUri, Buffer.from(post.postBody))
-    await PostFileMapManager.updateOrCreate(postId, fileUri.fsPath)
+    await PostFileMapManager.updateOrCreate(postId, fileUri.path)
     await openPostFile(post)
     return fileUri
 }

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

@@ -6,6 +6,7 @@ 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,
@@ -67,7 +68,11 @@ export async function postPullAll() {
             const path = PostFileMapManager.getFilePath(post.id)
 
             // 本地没有博文或关联到的文件不存在
-            if (path === undefined || !(await fsUtil.exists(path))) {
+            if (
+                path === undefined ||
+                !(await fsUtil.exists(path)) ||
+                path.indexOf(WorkspaceCfg.getWorkspaceUri().path) < 0
+            ) {
                 const uri = buildLocalPostFileUri(post, false)
                 const buf = Buffer.from(post.postBody)
                 await workspace.fs.writeFile(uri, buf)

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

@@ -30,6 +30,7 @@ export async function postPull(input: Post | PostTreeItem | Uri | undefined | nu
             await handlePostInput(input, ctxList, uri.path)
         } else {
             isFreshPull = !(await fsUtil.exists(path))
+            if (!path.startsWith('/')) await PostFileMapManager.updateOrCreate(post.id, Uri.file(path).path)
             await handlePostInput(input, ctxList, path)
         }
     } else {
@@ -82,7 +83,7 @@ function parseUriInput(input: InputType): Uri | undefined {
 }
 
 function handleUriInput(fileUri: Uri, contexts: CmdCtx[]) {
-    const postId = PostFileMapManager.getPostId(fileUri.fsPath)
+    const postId = PostFileMapManager.getPostId(fileUri.path)
     if (postId === undefined) return Alert.fileNotLinkedToPost(fileUri)
 
     contexts.push({ postId, fileUri })

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

@@ -29,7 +29,7 @@ async function renameLinkedFile(post: Post): Promise<void> {
         const ext = path.extname(fileName)
         const newFilePath = filePath.replace(new RegExp(`${escapeRegExp(fileName)}$`), `${post.title}${ext}`)
         await workspace.fs.rename(fileUri, Uri.file(newFilePath))
-        await PostFileMapManager.updateOrCreate(post.id, newFilePath)
+        await PostFileMapManager.updateOrCreate(post.id, fileUri.path)
         postDataProvider.fireTreeDataChangedEvent(post)
     }
 }

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

@@ -205,7 +205,7 @@ export async function uploadPostFile(fileUri?: Uri, confirm = true) {
     if (parsedFileUri === undefined) return
 
     const { fsPath: filePath } = parsedFileUri
-    const postId = PostFileMapManager.getPostId(filePath)
+    const postId = PostFileMapManager.getPostId(parsedFileUri.path)
 
     if (postId !== undefined && postId >= 0) {
         const dto = await PostService.getPostEditDto(postId)
@@ -232,7 +232,7 @@ export async function uploadPostFile(fileUri?: Uri, confirm = true) {
         )
         if (selectedPost === undefined) return
 
-        await PostFileMapManager.updateOrCreate(selectedPost.id, filePath)
+        await PostFileMapManager.updateOrCreate(selectedPost.id, parsedFileUri.path)
         const postEditDto = await PostService.getPostEditDto(selectedPost.id)
         if (postEditDto === undefined) return
         if (fileContent === '') await workspace.fs.writeFile(parsedFileUri, Buffer.from(postEditDto.post.postBody))

src/cmd/show-local-file-to-post-info.ts

@@ -18,7 +18,7 @@ export async function showLocalFileToPostInfo(input: Uri | number): Promise<void
     let filePath: string | undefined
     let postId: number | undefined
     if (input instanceof Uri && input.scheme === 'file') {
-        postId = PostFileMapManager.getPostId(input.fsPath)
+        postId = PostFileMapManager.getPostId(input.path)
         filePath = input.fsPath
         if (postId === undefined) {
             const options = ['现在去关联']
@@ -36,7 +36,7 @@ export async function showLocalFileToPostInfo(input: Uri | number): Promise<void
                     '搜索要关联的博文'
                 )
                 if (selectedPost !== undefined) {
-                    await PostFileMapManager.updateOrCreate(selectedPost.id, filePath)
+                    await PostFileMapManager.updateOrCreate(selectedPost.id, input.path)
                     void Alert.info(`本地文件已与博文(${selectedPost.title}, Id: ${selectedPost.id})建立关联`)
                 }
             }

src/cmd/view-post-online.ts

@@ -10,7 +10,7 @@ export async function viewPostOnline(input?: Post | PostTreeItem | Uri) {
     if (input === undefined) input = window.activeTextEditor?.document.uri
 
     if (input instanceof Uri) {
-        const postId = PostFileMapManager.getPostId(input.fsPath)
+        const postId = PostFileMapManager.getPostId(input.path)
         if (postId !== undefined) post = (await PostService.getPostEditDto(postId))?.post
     }