fix: Ora new message length error

uni-helper · Jun 30, 2023 · 42084d6 · 42084d6
1 parent f212c0b
commit 42084d6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -51,20 +51,23 @@ async function init() {
   else if (!existsSync(root))
     mkdirSync(root)
 
-  if (result.templateType!.type !== 'custom') {
-    const loading = ora(`${bold('正在下载模板...')}`).start()
-    const { cloneRepo, getRepoUrl } = await import('./utils/')
-    const repoUrl = getRepoUrl(result.templateType!.url)
-    try {
-      await cloneRepo(repoUrl, root)
-    }
-    catch {
-      loading.fail(`${bold('模板下载失败')}`)
-      process.exit(1)
-    }
-
-    loading.succeed(`${bold('模板下载完成')}`)
-  }
+  if (result.templateType!.type !== 'custom')
+    await dowloadTemplate(result.templateType!.url, root)
 }
 
 init()
+
+async function dowloadTemplate(url: BaseTemplateList['value']['url'], root: string) {
+  const loading = ora(`${bold('正在下载模板...')}`).start()
+  const { cloneRepo, getRepoUrl } = await import('./utils/')
+  const repoUrlList = getRepoUrl(url)
+  try {
+    await cloneRepo(repoUrlList, root)
+  }
+  catch {
+    loading.fail(`${bold('模板下载失败')}`)
+    process.exit(1)
+  }
+
+  loading.succeed(`${bold('模板下载完成')}`)
+}
diff --git a/src/utils/banners.ts b/src/utils/banners.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 export function printBanner() {
-  const text = 'Uni-creator - 帮你快速创建 uni-app 项目'
+  const text = 'Uni-creator - 快速创建 uni-app 项目'
   let output = ''
 
   const startColor = { r: 0x3B, g: 0xD1, b: 0x91 }

diff --git a/src/utils/loading.ts b/src/utils/loading.ts
@@ -11,6 +11,10 @@ class Ora {
     this.interval = null
   }
 
+  setFinishMessage(newMessage: string): string {
+    return newMessage + ' '.repeat(this.message.length - newMessage.length)
+  }
+
   start(): Ora {
     let i = 0
     this.interval = setInterval(() => {
@@ -24,14 +28,14 @@ class Ora {
     if (!this.interval)
       return
     clearInterval(this.interval)
-    process.stdout.write('\r' + `${red('✖')} ${message}\n`)
+    process.stdout.write('\r' + `${red('✖')} ${this.setFinishMessage(message)}\n`)
   }
 
   succeed(message: string): void {
     if (!this.interval)
       return
     clearInterval(this.interval)
-    process.stdout.write('\r' + `${green('✔')} ${message}\n`)
+    process.stdout.write('\r' + `${green('✔')} ${this.setFinishMessage(message)}\n`)
   }
 }