Skip to content

Commit 1556f9a

Browse files
ThaumyThaumy
committed
style: optimize imports
1 parent fb4d7ca commit 1556f9a

File tree

112 files changed

+479
-467
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+479
-467
lines changed

Diff for: ‎.prettierrc.js

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ module.exports = {
22
...require('@cnblogs/prettier-config'),
33
tabWidth: 4,
44
semi: false,
5+
organizeImportsSkipDestructiveCodeActions: true,
56
}

Diff for: ‎download-iconfont.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint-disable no-console */
2-
import fetch from 'node-fetch'
3-
import fs from 'fs'
42
import AdmZip from 'adm-zip'
3+
import fs from 'fs'
4+
import fetch from 'node-fetch'
55
const url =
66
'https://www.iconfont.cn/api/project/download.zip?spm=a313x.7781069.1998910419.d7543c303&pid=2996691&ctoken=ndNRCUzYy381Rxk59b1LjTrg'
77
const cookie =

Diff for: ‎package-lock.json

+29-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -1361,6 +1361,7 @@
13611361
"postcss-loader": "^6.2.1",
13621362
"postcss-preset-env": "^7.4.3",
13631363
"prettier": "^2.8.8",
1364+
"prettier-plugin-organize-imports": "^3.2.3",
13641365
"style-loader": "^3.3.1",
13651366
"tailwindcss": "^3.0.23",
13661367
"terser-webpack-plugin": "^5.3.7",

Diff for: ‎src/auth/account-manager.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { AccountInfo } from './account-info'
2-
import { globalCtx } from '@/services/global-ctx'
3-
import vscode, { authentication, AuthenticationGetSessionOptions, Disposable } from 'vscode'
4-
import { accountViewDataProvider } from '@/tree-view-providers/account-view-data-provider'
5-
import { postsDataProvider } from '@/tree-view-providers/posts-data-provider'
6-
import { postCategoriesDataProvider } from '@/tree-view-providers/post-categories-tree-data-provider'
7-
import { Oauth } from '@/services/oauth.api'
81
import { AuthProvider } from '@/auth/auth-provider'
92
import { AuthSession } from '@/auth/auth-session'
3+
import { Alert } from '@/services/alert.service'
4+
import { globalCtx } from '@/services/global-ctx'
5+
import { Oauth } from '@/services/oauth.api'
6+
import { accountViewDataProvider } from '@/tree-view-providers/account-view-data-provider'
107
import { BlogExportProvider } from '@/tree-view-providers/blog-export-provider'
11-
import { AlertService } from '@/services/alert.service'
8+
import { postCategoriesDataProvider } from '@/tree-view-providers/post-categories-tree-data-provider'
9+
import { postsDataProvider } from '@/tree-view-providers/posts-data-provider'
1210
import { execCmd } from '@/utils/cmd'
11+
import vscode, { authentication, AuthenticationGetSessionOptions, Disposable } from 'vscode'
12+
import { AccountInfo } from './account-info'
1313

1414
const isAuthorizedStorageKey = 'isAuthorized'
1515

@@ -81,7 +81,7 @@ class AccountManager extends vscode.Disposable {
8181
await AuthProvider.instance.removeSession(session.id)
8282
await Oauth.revokeToken(session.accessToken)
8383
} catch (e: any) {
84-
AlertService.err(`登出发生错误: ${e}`)
84+
void Alert.err(`登出发生错误: ${e}`)
8585
}
8686
}
8787

@@ -102,7 +102,7 @@ class AccountManager extends vscode.Disposable {
102102
const session = await authentication.getSession(AuthProvider.instance.providerId, [], opt).then(
103103
session => (session ? AuthSession.from(session) : null),
104104
e => {
105-
AlertService.err(`创建/获取 Session 失败: ${e}`)
105+
void Alert.err(`创建/获取 Session 失败: ${e}`)
106106
}
107107
)
108108

Diff for: ‎src/auth/auth-provider.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
1+
import { AccountInfo } from '@/auth/account-info'
12
import { AuthSession } from '@/auth/auth-session'
3+
import { TokenInfo } from '@/models/token-info'
24
import { genVerifyChallengePair } from '@/services/code-challenge.service'
5+
import { globalCtx } from '@/services/global-ctx'
6+
import { Oauth } from '@/services/oauth.api'
7+
import { extUriHandler } from '@/utils/uri-handler'
38
import { isArray, isUndefined } from 'lodash-es'
9+
import RandomString from 'randomstring'
10+
import { Optional } from 'utility-types'
411
import {
512
authentication,
613
AuthenticationProvider,
@@ -14,13 +21,6 @@ import {
1421
Uri,
1522
window,
1623
} from 'vscode'
17-
import { globalCtx } from '@/services/global-ctx'
18-
import RandomString from 'randomstring'
19-
import { Oauth } from '@/services/oauth.api'
20-
import { extUriHandler } from '@/utils/uri-handler'
21-
import { AccountInfo } from '@/auth/account-info'
22-
import { TokenInfo } from '@/models/token-info'
23-
import { Optional } from 'utility-types'
2424

2525
export class AuthProvider implements AuthenticationProvider, Disposable {
2626
static readonly providerId = 'cnblogs'

Diff for: ‎src/commands/blog-export/create.ts

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { CmdHandler } from '@/commands/cmd-handler'
2-
import { AlertService } from '@/services/alert.service'
2+
import { Alert } from '@/services/alert.service'
33
import { BlogExportApi } from '@/services/blog-export.api'
44
import { BlogExportProvider } from '@/tree-view-providers/blog-export-provider'
55
import { MessageItem, window } from 'vscode'
@@ -12,7 +12,7 @@ export class CreateBlogExportCmdHandler extends CmdHandler {
1212

1313
if (
1414
(await BlogExportApi.create().catch((e: unknown) => {
15-
AlertService.httpErr(typeof e === 'object' && e ? e : {}, { message: '创建博客备份失败' })
15+
void Alert.httpErr(typeof e === 'object' && e ? e : {}, { message: '创建博客备份失败' })
1616
return false
1717
})) !== false
1818
)
@@ -21,11 +21,7 @@ export class CreateBlogExportCmdHandler extends CmdHandler {
2121

2222
private async confirm(): Promise<boolean> {
2323
const items: MessageItem[] = [{ title: '确定', isCloseAffordance: false }]
24-
const result = await AlertService.info(
25-
'确定要创建备份吗?',
26-
{ modal: true, detail: '一天可以创建一次备份' },
27-
...items
28-
)
24+
const result = await Alert.info('确定要创建备份吗?', { modal: true, detail: '一天可以创建一次备份' }, ...items)
2925
return result != null
3026
}
3127
}

Diff for: ‎src/commands/blog-export/delete.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { TreeViewCmdHandler } from '@/commands/cmd-handler'
22
import { DownloadedBlogExport } from '@/models/blog-export'
3-
import { AlertService } from '@/services/alert.service'
3+
import { Alert } from '@/services/alert.service'
44
import { BlogExportApi } from '@/services/blog-export.api'
55
import { DownloadedExportStore } from '@/services/downloaded-export.store'
66
import { BlogExportProvider } from '@/tree-view-providers/blog-export-provider'
@@ -86,7 +86,7 @@ export class DeleteCmdHandler extends TreeViewCmdHandler<DownloadedExportTreeIte
8686
const hasDeleted = await BlogExportApi.del(record.id)
8787
.then(() => true)
8888
.catch((e: unknown) => {
89-
AlertService.httpErr(typeof e === 'object' && e != null ? e : {})
89+
void Alert.httpErr(typeof e === 'object' && e != null ? e : {})
9090
return false
9191
})
9292
if (hasDeleted) if (downloaded) await this.removeDownloadedBlogExport(downloaded, { shouldDeleteLocal })

Diff for: ‎src/commands/blog-export/download.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import { TreeViewCmdHandler } from '@/commands/cmd-handler'
2-
import { AlertService } from '@/services/alert.service'
2+
import { Alert } from '@/services/alert.service'
33
import { BlogExportApi } from '@/services/blog-export.api'
44
import { DownloadedExportStore } from '@/services/downloaded-export.store'
55
import { globalCtx } from '@/services/global-ctx'
66
import { Settings } from '@/services/settings.service'
77
import { BlogExportProvider } from '@/tree-view-providers/blog-export-provider'
88
import { BlogExportRecordTreeItem } from '@/tree-view-providers/models/blog-export'
99
import { extViews } from '@/tree-view-providers/tree-view-registration'
10+
import { execCmd } from '@/utils/cmd'
1011
import fs from 'fs'
1112
import { Progress } from 'got'
1213
import path from 'path'
1314
import { promisify } from 'util'
1415
import { commands } from 'vscode'
15-
import { execCmd } from '@/utils/cmd'
1616

1717
export class DownloadExportCmdHandler extends TreeViewCmdHandler<BlogExportRecordTreeItem> {
1818
static readonly commandName = 'vscode-cnb.blog-export.download'
@@ -47,7 +47,7 @@ export class DownloadExportCmdHandler extends TreeViewCmdHandler<BlogExportRecor
4747
await this.setIsDownloading(true)
4848

4949
const onError = (msg?: string | null) => {
50-
if (msg) AlertService.warn(msg)
50+
if (msg) void Alert.warn(msg)
5151
if (!isFileExist) fs.rmSync(zipFilePath)
5252
blogExportProvider?.refreshItem(treeItem)
5353
this.setIsDownloading(false).then(undefined, console.warn)

Diff for: ‎src/commands/blog-export/edit.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { TreeViewCmdHandler } from '@/commands/cmd-handler'
22
import { openPostFile } from '@/commands/posts-list/open-post-file'
3-
import { AlertService } from '@/services/alert.service'
3+
import { Alert } from '@/services/alert.service'
44
import { Settings } from '@/services/settings.service'
55
import { ExportPostTreeItem } from '@/tree-view-providers/models/blog-export/post'
66
import fs from 'fs'
@@ -21,7 +21,7 @@ export class EditExportPostCmdHandler extends TreeViewCmdHandler<ExportPostTreeI
2121

2222
async handle(): Promise<void> {
2323
const target = this.parseInput()
24-
if (!target) return void AlertService.warn('不支持的参数输入')
24+
if (!target) return void Alert.warn('不支持的参数输入')
2525

2626
const {
2727
post: { title, isMarkdown, id: postId },

Diff for: ‎src/commands/blog-export/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import { RefreshExportRecordsCmdHandler } from './refresh'
2-
import { globalCtx } from '@/services/global-ctx'
3-
import { OpenLocalExportCmdHandler } from '@/commands/blog-export/open-local'
4-
import { EditExportPostCmdHandler } from '@/commands/blog-export/edit'
51
import { CreateBlogExportCmdHandler } from '@/commands/blog-export/create'
2+
import { DeleteCmdHandler } from '@/commands/blog-export/delete'
63
import { DownloadExportCmdHandler } from '@/commands/blog-export/download'
4+
import { EditExportPostCmdHandler } from '@/commands/blog-export/edit'
5+
import { OpenLocalExportCmdHandler } from '@/commands/blog-export/open-local'
76
import { ViewPostCmdHandler } from '@/commands/blog-export/view-post'
8-
import { DeleteCmdHandler } from '@/commands/blog-export/delete'
7+
import { globalCtx } from '@/services/global-ctx'
98
import { regCmd } from '@/utils/cmd'
9+
import { RefreshExportRecordsCmdHandler } from './refresh'
1010

1111
export function regBlogExportCmds() {
1212
const { extName } = globalCtx

Diff for: ‎src/commands/blog-export/open-local.ts

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { CmdHandler } from '@/commands/cmd-handler'
2-
import { window } from 'vscode'
3-
import path from 'path'
4-
import fs from 'fs'
5-
import { promisify } from 'util'
6-
import { AlertService } from '@/services/alert.service'
2+
import { Alert } from '@/services/alert.service'
73
import { DownloadedExportStore } from '@/services/downloaded-export.store'
84
import { BlogExportProvider } from '@/tree-view-providers/blog-export-provider'
5+
import fs from 'fs'
6+
import path from 'path'
7+
import { promisify } from 'util'
8+
import { window } from 'vscode'
99

1010
const defaultOptions = { confirmUnzip: true }
1111

@@ -28,16 +28,15 @@ export class OpenLocalExportCmdHandler extends CmdHandler {
2828
})) ?? []
2929
if (fileUri == null) return
3030
const filePath = fileUri.fsPath
31-
if (filePath.endsWith('.zip') && !filePath.endsWith('.db.zip'))
32-
return void AlertService.warn('不支持的博客备份文件')
31+
if (filePath.endsWith('.zip') && !filePath.endsWith('.db.zip')) return void Alert.warn('不支持的博客备份文件')
3332

3433
const fileName = path.basename(filePath.replace(/\.db(\.zip)?$/, ''))
3534
const dirname = path.dirname(filePath)
3635
let dbFilePath = filePath
3736
isConfirmedToUnzip = filePath.endsWith('.db.zip')
3837
// if (!confirmUnzip && fileUri.fsPath.endsWith('db.zip')) {
3938
// const options: (MessageItem & { confirmed: boolean })[] = [{ title: '确定', confirmed: true }];
40-
// const selected = await AlertService.info(
39+
// const selected = await Alert.info(
4140
// '浏览博客备份需要解决, 确定要解压吗?',
4241
// { modal: true },
4342
// ...options
@@ -56,7 +55,7 @@ export class OpenLocalExportCmdHandler extends CmdHandler {
5655
const dbFileName = path.basename(dbFilePath)
5756

5857
const isExist = await promisify(fs.exists)(dbFilePath)
59-
if (!isExist) return void AlertService.warn('文件不存在')
58+
if (!isExist) return void Alert.warn('文件不存在')
6059

6160
const treeProvider = BlogExportProvider.optionalInstance
6261
const dbFileSize = (await promisify(fs.stat)(dbFilePath)).size

Diff for: ‎src/commands/blog-export/refresh.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CmdHandler } from '@/commands/cmd-handler'
2-
import { execCmd } from '@/utils/cmd'
32
import { globalCtx } from '@/services/global-ctx'
43
import { BlogExportProvider } from '@/tree-view-providers/blog-export-provider'
4+
import { execCmd } from '@/utils/cmd'
55
import { commands } from 'vscode'
66

77
export class RefreshExportRecordsCmdHandler extends CmdHandler {

Diff for: ‎src/commands/cmd-register.ts

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,42 @@
1+
import { regBlogExportCmds } from '@/commands/blog-export'
2+
import { PublishIngCmdHandler } from '@/commands/ing/publish-ing'
3+
import { CopyPostLinkCmdHandler } from '@/commands/posts-list/copy-link'
4+
import { globalCtx } from '@/services/global-ctx'
5+
import { regCmd } from '@/utils/cmd'
6+
import { regIngListCmds } from 'src/commands/ing/ings-list-cmd-register'
7+
import { extractImages } from './extract-images'
8+
import { login, logout } from './login'
19
import { openMyAccountSettings } from './open-my-account-settings'
10+
import { openMyBlog } from './open-my-blog'
211
import { openMyWebBlogConsole } from './open-my-blog-console'
312
import { openMyHomePage } from './open-my-home-page'
4-
import { login, logout } from './login'
5-
import { openMyBlog } from './open-my-blog'
6-
import { globalCtx } from '@/services/global-ctx'
13+
import { openPostInBlogAdmin } from './open-post-in-blog-admin'
14+
import { openWorkspace } from './open-workspace'
15+
import { handleDeletePostCategories } from './post-category/delete-selected-categories'
16+
import { newPostCategory } from './post-category/new-post-category'
17+
import { refreshPostCategoriesList } from './post-category/refresh-post-categories-list'
18+
import { handleUpdatePostCategory } from './post-category/update-post-category'
19+
import { createLocalDraft } from './posts-list/create-local-draft'
20+
import { deleteSelectedPosts } from './posts-list/delete-post'
21+
import { deletePostToLocalFileMap } from './posts-list/delete-post-to-local-file-map'
22+
import { modifyPostSettings } from './posts-list/modify-post-settings'
23+
import { openPostInVscode } from './posts-list/open-post-in-vscode'
724
import {
825
gotoNextPostsList,
926
gotoPreviousPostsList,
1027
refreshPostsList,
1128
seekPostsList,
1229
} from './posts-list/refresh-posts-list'
30+
import { renamePost } from './posts-list/rename-post'
31+
import { clearPostsSearchResults, refreshPostsSearchResults, searchPosts } from './posts-list/search'
1332
import { uploadPostFileToCnblogs, uploadPostToCnblogs } from './posts-list/upload-post'
14-
import { createLocalDraft } from './posts-list/create-local-draft'
15-
import { deleteSelectedPosts } from './posts-list/delete-post'
16-
import { modifyPostSettings } from './posts-list/modify-post-settings'
17-
import { uploadImage } from './upload-image/upload-image'
33+
import { pullPostRemoteUpdates } from './pull-post-remote-updates'
1834
import { revealLocalPostFileInOs } from './reveal-local-post-file-in-os'
19-
import { showLocalFileToPostInfo } from './show-local-file-to-post-info'
20-
import { newPostCategory } from './post-category/new-post-category'
21-
import { refreshPostCategoriesList } from './post-category/refresh-post-categories-list'
22-
import { handleUpdatePostCategory } from './post-category/update-post-category'
23-
import { openPostInVscode } from './posts-list/open-post-in-vscode'
24-
import { deletePostToLocalFileMap } from './posts-list/delete-post-to-local-file-map'
25-
import { renamePost } from './posts-list/rename-post'
26-
import { openPostInBlogAdmin } from './open-post-in-blog-admin'
27-
import { openWorkspace } from './open-workspace'
28-
import { setWorkspace } from './set-workspace'
2935
import { revealWorkspaceInOs } from './reveal-workspace-in-os'
36+
import { setWorkspace } from './set-workspace'
37+
import { showLocalFileToPostInfo } from './show-local-file-to-post-info'
38+
import { uploadImage } from './upload-image/upload-image'
3039
import { viewPostOnline } from './view-post-online'
31-
import { pullPostRemoteUpdates } from './pull-post-remote-updates'
32-
import { extractImages } from './extract-images'
33-
import { clearPostsSearchResults, refreshPostsSearchResults, searchPosts } from './posts-list/search'
34-
import { handleDeletePostCategories } from './post-category/delete-selected-categories'
35-
import { PublishIngCmdHandler } from '@/commands/ing/publish-ing'
36-
import { regIngListCmds } from 'src/commands/ing/ings-list-cmd-register'
37-
import { CopyPostLinkCmdHandler } from '@/commands/posts-list/copy-link'
38-
import { regBlogExportCmds } from '@/commands/blog-export'
39-
import { regCmd } from '@/utils/cmd'
4040

4141
export function setupExtCmd() {
4242
const ctx = globalCtx.extCtx

0 commit comments

Comments
 (0)