Skip to content

Commit 5e79857

Browse files
laggagelaggage
committed
refactor: rename blog-post to post
1 parent 39049ac commit 5e79857

23 files changed

+106
-106
lines changed

‎src/commands/open-post-in-blog-admin.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { commands, Uri } from 'vscode';
2-
import { BlogPost } from '../models/blog-post';
2+
import { Post } from '../models/post';
33
import { PostFileMapManager } from '../services/post-file-map';
44

5-
export const openPostInBlogAdmin = (item: BlogPost | Uri) => {
5+
export const openPostInBlogAdmin = (item: Post | Uri) => {
66
if (!item) {
77
return;
88
}
99

10-
const postId = item instanceof BlogPost ? item.id : PostFileMapManager.getPostId(item.fsPath) ?? -1;
10+
const postId = item instanceof Post ? item.id : PostFileMapManager.getPostId(item.fsPath) ?? -1;
1111

1212
commands.executeCommand('vscode.open', Uri.parse(`https://i.cnblogs.com/posts/edit;postId=${postId}`));
1313
};

‎src/commands/posts-list/create-local-draft.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Uri, window, workspace } from 'vscode';
44
import { LocalDraftFile } from '../../models/local-draft-file';
55
import { AlertService } from '../../services/alert.service';
66
import { Settings } from '../../services/settings.service';
7-
import { localDraftsTreeItem, postsDataProvider } from '../../tree-view-providers/blog-posts-data-provider';
7+
import { localDraftsTreeItem, postsDataProvider } from '../../tree-view-providers/posts-data-provider';
88
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
99
import { openPostFile } from './open-post-file';
1010

‎src/commands/posts-list/delete-local-draft.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Uri, window, workspace } from 'vscode';
22
import { LocalDraftFile } from '../../models/local-draft-file';
3-
import { localDraftsTreeItem, postsDataProvider } from '../../tree-view-providers/blog-posts-data-provider';
3+
import { localDraftsTreeItem, postsDataProvider } from '../../tree-view-providers/posts-data-provider';
44
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
55

66
const options = ['确定', '取消'];

‎src/commands/posts-list/delete-post-to-local-file-map.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { MessageOptions, window } from 'vscode';
2-
import { BlogPost } from '../../models/blog-post';
2+
import { Post } from '../../models/post';
33
import { PostFileMap, PostFileMapManager } from '../../services/post-file-map';
44
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
55

6-
const confirm = async (posts: BlogPost[]): Promise<boolean> => {
6+
const confirm = async (posts: Post[]): Promise<boolean> => {
77
const options = ['确定'];
88
const input = await window.showInformationMessage(
99
'确定要取消这些博文与本地文件的关联吗?',
@@ -16,9 +16,9 @@ const confirm = async (posts: BlogPost[]): Promise<boolean> => {
1616
return input === options[0];
1717
};
1818

19-
export const deletePostToLocalFileMap = async (post: BlogPost) => {
19+
export const deletePostToLocalFileMap = async (post: Post) => {
2020
const view = extensionViews.postsList!;
21-
let selectedPosts = view.selection.filter(x => x instanceof BlogPost).map(x => x as BlogPost);
21+
let selectedPosts = view.selection.filter(x => x instanceof Post).map(x => x as Post);
2222
if (!selectedPosts.includes(post)) {
2323
await view.reveal(post);
2424
selectedPosts = post ? [post] : [];

‎src/commands/posts-list/delete-post.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { MessageOptions, ProgressLocation, Uri, window, workspace } from 'vscode';
2-
import { BlogPost } from '../../models/blog-post';
2+
import { Post } from '../../models/post';
33
import { AlertService } from '../../services/alert.service';
4-
import { blogPostService } from '../../services/blog-post.service';
4+
import { postService } from '../../services/post.service';
55
import { PostFileMap, PostFileMapManager } from '../../services/post-file-map';
6-
import { postsDataProvider } from '../../tree-view-providers/blog-posts-data-provider';
6+
import { postsDataProvider } from '../../tree-view-providers/posts-data-provider';
77
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
88
import { refreshPostsList } from './refresh-posts-list';
99

1010
let deleting = false;
1111

1212
const confirmDelete = async (
13-
selectedPosts: BlogPost[]
13+
selectedPosts: Post[]
1414
): Promise<{ confirmed: boolean; deleteLocalFileAtSameTime: boolean }> => {
1515
const result = { confirmed: false, deleteLocalFileAtSameTime: false };
1616
if (!selectedPosts || selectedPosts.length <= 0) {
@@ -38,10 +38,10 @@ const confirmDelete = async (
3838
return result;
3939
};
4040

41-
export const deleteSelectedPosts = async (post: BlogPost) => {
42-
const selectedPosts: BlogPost[] = [...(post ? [post] : [])];
41+
export const deleteSelectedPosts = async (post: Post) => {
42+
const selectedPosts: Post[] = [...(post ? [post] : [])];
4343
extensionViews.postsList?.selection.map(post => {
44-
if (post instanceof BlogPost && !selectedPosts.includes(post)) {
44+
if (post instanceof Post && !selectedPosts.includes(post)) {
4545
postsDataProvider.pagedPosts?.items.find(item => item === post);
4646
selectedPosts.push(post);
4747
}
@@ -68,7 +68,7 @@ export const deleteSelectedPosts = async (post: BlogPost) => {
6868
increment: 0,
6969
});
7070
try {
71-
await blogPostService.deletePosts(selectedPosts.map(p => p.id));
71+
await postService.deletePosts(selectedPosts.map(p => p.id));
7272
if (isToDeleteLocalFile) {
7373
selectedPosts
7474
.map(p => PostFileMapManager.getFilePath(p.id) ?? '')

‎src/commands/posts-list/modify-post-settings.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { Uri } from 'vscode';
2-
import { BlogPost } from '../../models/blog-post';
2+
import { Post } from '../../models/post';
33
import { AlertService } from '../../services/alert.service';
4-
import { blogPostService } from '../../services/blog-post.service';
4+
import { postService } from '../../services/post.service';
55
import { PostFileMapManager } from '../../services/post-file-map';
66
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
77
import { inputPostSettings } from '../../utils/input-post-settings';
88

9-
export const modifyPostSettings = async (input: BlogPost | Uri) => {
10-
let post: BlogPost | undefined;
9+
export const modifyPostSettings = async (input: Post | Uri) => {
10+
let post: Post | undefined;
1111
let postId = -1;
12-
if (input instanceof BlogPost) {
12+
if (input instanceof Post) {
1313
post = input;
1414
postId = input.id;
1515
} else if (input instanceof Uri) {
@@ -27,7 +27,7 @@ export const modifyPostSettings = async (input: BlogPost | Uri) => {
2727
if (post) {
2828
await extensionViews.postsList?.reveal(post);
2929
}
30-
const editDto = await blogPostService.fetchPostEditDto(postId);
30+
const editDto = await postService.fetchPostEditDto(postId);
3131
const postEditDto = editDto.post;
3232
const inputSettings = await inputPostSettings(postEditDto.title, postEditDto);
3333
if (!inputSettings) {
@@ -36,7 +36,7 @@ export const modifyPostSettings = async (input: BlogPost | Uri) => {
3636

3737
Object.assign(postEditDto, inputSettings);
3838
try {
39-
await blogPostService.updatePost(postEditDto);
39+
await postService.updatePost(postEditDto);
4040
AlertService.info('更新博文设置成功');
4141
} catch (err) {
4242
AlertService.error(err instanceof Error ? err.message : `更新博文设置失败\n${JSON.stringify(err)}`);

‎src/commands/posts-list/open-post-file.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { commands, Uri } from 'vscode';
2-
import { BlogPost } from '../../models/blog-post';
2+
import { Post } from '../../models/post';
33
import { LocalDraftFile } from '../../models/local-draft-file';
44
import { PostFileMapManager } from '../../services/post-file-map';
55

6-
export const openPostFile = async (post: LocalDraftFile | BlogPost | string) => {
6+
export const openPostFile = async (post: LocalDraftFile | Post | string) => {
77
let filePath = '';
88
if (post instanceof LocalDraftFile) {
99
filePath = post.filePath;
10-
} else if (post instanceof BlogPost) {
10+
} else if (post instanceof Post) {
1111
filePath = PostFileMapManager.getFilePath(post.id) ?? '';
1212
} else {
1313
filePath = post;

‎src/commands/posts-list/open-post-in-vscode.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import * as fs from 'fs';
22
import path = require('path');
33
import { FileSystemError, MessageOptions, Uri, window, workspace } from 'vscode';
4-
import { BlogPost } from '../../models/blog-post';
4+
import { Post } from '../../models/post';
55
import { AlertService } from '../../services/alert.service';
6-
import { blogPostService } from '../../services/blog-post.service';
6+
import { postService } from '../../services/post.service';
77
import { PostFileMapManager } from '../../services/post-file-map';
88
import { Settings } from '../../services/settings.service';
99
import { openPostFile } from './open-post-file';
1010

11-
const generateLocalPostFileUri = (post: BlogPost, includePostId = false): Uri => {
11+
const generateLocalPostFileUri = (post: Post, includePostId = false): Uri => {
1212
const workspaceUri = Settings.workspaceUri;
1313
const ext = `.${post.isMarkdown ? 'md' : 'html'}`;
1414
const postIdSegment = includePostId ? `.${post.id}` : '';
@@ -28,7 +28,7 @@ export const openPostInVscode = async (postId: number, forceUpdateLocalPostFile
2828
mappedPostFilePath = undefined;
2929
}
3030

31-
const postEditDto = await blogPostService.fetchPostEditDto(postId);
31+
const postEditDto = await postService.fetchPostEditDto(postId);
3232
const post = postEditDto.post;
3333

3434
const workspaceUri = Settings.workspaceUri;

‎src/commands/posts-list/refresh-posts-list.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { globalState } from '../../services/global-state';
2-
import { blogPostService } from '../../services/blog-post.service';
2+
import { postService } from '../../services/post.service';
33
import * as vscode from 'vscode';
4-
import { postsDataProvider } from '../../tree-view-providers/blog-posts-data-provider';
4+
import { postsDataProvider } from '../../tree-view-providers/posts-data-provider';
55
import { AlertService } from '../../services/alert.service';
66
import { PostsListState } from '../../models/posts-list-state';
77
import { PageModel } from '../../models/page-model';
8-
import { BlogPost } from '../../models/blog-post';
8+
import { Post } from '../../models/post';
99
import { window } from 'vscode';
1010
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
1111

@@ -15,12 +15,12 @@ export const refreshPostsList = async () => {
1515
return;
1616
}
1717
await setRefreshing(true);
18-
let pagedPosts: PageModel<BlogPost> | undefined;
18+
let pagedPosts: PageModel<Post> | undefined;
1919
try {
2020
await postsDataProvider.loadPosts();
2121
pagedPosts = postsDataProvider.pagedPosts;
2222
if (pagedPosts) {
23-
await blogPostService.updatePostsListState(pagedPosts);
23+
await postService.updatePostsListState(pagedPosts);
2424
updatePostsListViewTitle();
2525
}
2626
} catch (e) {
@@ -51,7 +51,7 @@ export const seekPostsList = async () => {
5151
if (isNaN(n) || !n) {
5252
return '请输入正确格式的页码';
5353
}
54-
const state = blogPostService.postsListState;
54+
const state = postService.postsListState;
5555
if (!state) {
5656
return '博文列表尚未加载';
5757
}
@@ -91,7 +91,7 @@ const gotoPage = async (pageIndex: (currentIndex: number) => number) => {
9191
alertRefreshing();
9292
return;
9393
}
94-
const state = blogPostService.postsListState;
94+
const state = postService.postsListState;
9595
if (!state) {
9696
console.warn('Cannot goto previous page posts list because post list state not defined');
9797
return;
@@ -104,14 +104,14 @@ const gotoPage = async (pageIndex: (currentIndex: number) => number) => {
104104
return;
105105
}
106106
state.pageIndex = idx;
107-
await blogPostService.updatePostsListState(state);
107+
await postService.updatePostsListState(state);
108108
await refreshPostsList();
109109
};
110110

111111
const isPageIndexInRange = (pageIndex: number, state: PostsListState) => pageIndex <= state.pageCount && pageIndex >= 1;
112112

113113
const updatePostsListViewTitle = () => {
114-
const state = blogPostService.postsListState;
114+
const state = postService.postsListState;
115115
if (!state) {
116116
return;
117117
}

‎src/commands/posts-list/rename-post.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { escapeRegExp } from 'lodash';
22
import path = require('path');
33
import { MessageOptions, ProgressLocation, Uri, window, workspace } from 'vscode';
4-
import { BlogPost } from '../../models/blog-post';
5-
import { blogPostService } from '../../services/blog-post.service';
4+
import { Post } from '../../models/post';
5+
import { postService } from '../../services/post.service';
66
import { PostFileMapManager } from '../../services/post-file-map';
7-
import { postsDataProvider } from '../../tree-view-providers/blog-posts-data-provider';
7+
import { postsDataProvider } from '../../tree-view-providers/posts-data-provider';
88
import { extensionViews } from '../../tree-view-providers/tree-view-registration';
99

10-
const renameLinkedFile = async (post: BlogPost): Promise<void> => {
10+
const renameLinkedFile = async (post: Post): Promise<void> => {
1111
const filePath = PostFileMapManager.getFilePath(post.id);
1212

1313
if (!filePath) {
@@ -33,7 +33,7 @@ const renameLinkedFile = async (post: BlogPost): Promise<void> => {
3333
}
3434
};
3535

36-
export const renamePost = async (post: BlogPost) => {
36+
export const renamePost = async (post: Post) => {
3737
if (!post) {
3838
return;
3939
}
@@ -59,14 +59,14 @@ export const renamePost = async (post: BlogPost) => {
5959
},
6060
async p => {
6161
p.report({ increment: 10 });
62-
const editDto = await blogPostService.fetchPostEditDto(post.id);
62+
const editDto = await postService.fetchPostEditDto(post.id);
6363
p.report({ increment: 60 });
6464

6565
const editingPost = editDto.post;
6666
editingPost.title = input;
6767
let success = false;
6868
try {
69-
await blogPostService.updatePost(editingPost);
69+
await postService.updatePost(editingPost);
7070
post.title = input;
7171
postsDataProvider.fireTreeDataChangedEvent(post);
7272
success = true;

0 commit comments

Comments
 (0)