Skip to content

Commit 42084d6

Browse files
committed
fix: Ora new message length error
1 parent f212c0b commit 42084d6

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

src/index.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -51,20 +51,23 @@ async function init() {
5151
else if (!existsSync(root))
5252
mkdirSync(root)
5353

54-
if (result.templateType!.type !== 'custom') {
55-
const loading = ora(`${bold('正在下载模板...')}`).start()
56-
const { cloneRepo, getRepoUrl } = await import('./utils/')
57-
const repoUrl = getRepoUrl(result.templateType!.url)
58-
try {
59-
await cloneRepo(repoUrl, root)
60-
}
61-
catch {
62-
loading.fail(`${bold('模板下载失败')}`)
63-
process.exit(1)
64-
}
65-
66-
loading.succeed(`${bold('模板下载完成')}`)
67-
}
54+
if (result.templateType!.type !== 'custom')
55+
await dowloadTemplate(result.templateType!.url, root)
6856
}
6957

7058
init()
59+
60+
async function dowloadTemplate(url: BaseTemplateList['value']['url'], root: string) {
61+
const loading = ora(`${bold('正在下载模板...')}`).start()
62+
const { cloneRepo, getRepoUrl } = await import('./utils/')
63+
const repoUrlList = getRepoUrl(url)
64+
try {
65+
await cloneRepo(repoUrlList, root)
66+
}
67+
catch {
68+
loading.fail(`${bold('模板下载失败')}`)
69+
process.exit(1)
70+
}
71+
72+
loading.succeed(`${bold('模板下载完成')}`)
73+
}

src/utils/banners.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable no-console */
22
export function printBanner() {
3-
const text = 'Uni-creator - 帮你快速创建 uni-app 项目'
3+
const text = 'Uni-creator - 快速创建 uni-app 项目'
44
let output = ''
55

66
const startColor = { r: 0x3B, g: 0xD1, b: 0x91 }

src/utils/loading.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ class Ora {
1111
this.interval = null
1212
}
1313

14+
setFinishMessage(newMessage: string): string {
15+
return newMessage + ' '.repeat(this.message.length - newMessage.length)
16+
}
17+
1418
start(): Ora {
1519
let i = 0
1620
this.interval = setInterval(() => {
@@ -24,14 +28,14 @@ class Ora {
2428
if (!this.interval)
2529
return
2630
clearInterval(this.interval)
27-
process.stdout.write('\r' + `${red('✖')} ${message}\n`)
31+
process.stdout.write('\r' + `${red('✖')} ${this.setFinishMessage(message)}\n`)
2832
}
2933

3034
succeed(message: string): void {
3135
if (!this.interval)
3236
return
3337
clearInterval(this.interval)
34-
process.stdout.write('\r' + `${green('✔')} ${message}\n`)
38+
process.stdout.write('\r' + `${green('✔')} ${this.setFinishMessage(message)}\n`)
3539
}
3640
}
3741

0 commit comments

Comments
 (0)