bajo-extra 1.0.1 → 1.0.2

package/bajo/intl/en-US.json

@@ -0,0 +1,17 @@
+{
+  "downloading%s": "Downloading %s...",
+  "noServerResponse": "No response from server",
+  "noRecordToProcess": "No record to process",
+  "gotRecordsProcessing": "Got %d records, processing...",
+  "rec%d%d": "Record %d/%d...",
+  "recProcessed%s%d%d": "[%s] %d/%d records processed",
+  "createdUpdatedSkipped%s%d%d%d": "[%s] Created: %d, Updated: %d, Skipped: %d",
+  "handlerMustBeProvided": "A function handler must be provided",
+  "bulkFetchStarting": "Bulk fetch starting",
+  "fetchingStarts": "Fetching starts...",
+  "batch%s%d": "[%s] Batch #%d",
+  "allDone": "All done!",
+  "dlDirNotExists%s": "Download dir '%s' doesn't exist",
+  "gettingStatus%s": "Getting %s status",
+  "downloading": "Downloading..."
+}

package/bajo/intl/id.json

@@ -0,0 +1,17 @@
+{
+  "downloading%s": "Pengunduhan %s...",
+  "noServerResponse": "Tidak ada respon dari server",
+  "noRecordToProcess": "Tidak ada data yang perlu diproses",
+  "gotRecordsProcessing": "Mendapatkan %d data, diproses...",
+  "rec%d%d": "Data %d/%d...",
+  "recProcessed%s%d%d": "[%s] %d/%d data diproses",
+  "createdUpdatedSkipped%s%d%d%d": "[%s] Dibuat: %d, Diubah: %d, Lompati: %d",
+  "handlerMustBeProvided": "Sebuah fungsi harus diberikan",
+  "bulkFetchStarting": "Bulk fetch dimulai",
+  "fetchingStarts": "Fetching dimulai...",
+  "batch%s%d": "[%s] Batch #%d",
+  "allDone": "Selesai semua!",
+  "dlDirNotExists%s": "Dir unduh '%s' belum ada",
+  "gettingStatus%s": "Mendapatkan status %s",
+  "downloading": "Pengunduhan..."
+}

package/bajo/method/download.js

@@ -11,7 +11,7 @@ async function download (url, opts = {}, extra = {}) {
     extra.dir = `${getPluginDataDir('bajoExtra')}/download`
     fs.ensureDirSync(extra.dir)
   }
-  if (!fs.existsSync(extra.dir)) throw this.error('Download dir \'%s\' doesn\'t exist', extra.dir)
+  if (!fs.existsSync(extra.dir)) throw this.error('dlDirNotExists%s', extra.dir)
   if (extra.randomFileName) {
     const ext = path.extname(url)
     extra.fileName = `${generateId()}${ext}`
@@ -22,7 +22,7 @@ async function download (url, opts = {}, extra = {}) {
   const { headers, body, ok, status } = await fetch(url, opts, merge({}, extra, { rawResponse: true }))
   if (!ok) {
     fs.removeSync(file)
-    throw this.error('Getting %s status', status)
+    throw this.error('gettingStatus%s', status)
   }
   const total = headers['content-length'] ?? 0
   const data = Readable.fromWeb(body)
@@ -31,7 +31,7 @@ async function download (url, opts = {}, extra = {}) {
     length += chunk.length
     if (isFunction(extra.progressFn)) extra.progressFn.call(this, length, total)
     else if (extra.spin) {
-      extra.spinText = extra.spinText ?? 'Downloading...'
+      extra.spinText = extra.spinText ?? 'downloading'
       if (total === 0) extra.spin.setText(`${extra.spinText} %s`, this.formatByte(length))
       else extra.spin.setText(`${extra.spinText} %s of %s (%s)`, this.formatByte(length), this.formatByte(total), this.formatPercentage(length / total))
     }

package/bajo/method/fetch-bulk.js

@@ -4,7 +4,7 @@ async function fetching ({ url, opts, bulk, spin }) {
   const { validationErrorMessage } = this.app.bajoDb
   const resp = await this.fetch(url, opts ?? {})
   if (isEmpty(resp)) {
-    spin.fatal('No result from server, aborted!')
+    spin.fatal('noServerResponse')
     return -1
   }
   if (bulk.abort) {
@@ -20,10 +20,10 @@ async function fetching ({ url, opts, bulk, spin }) {
   if (bulk.printCount === true) bulk.printCount = 100
   const data = isFunction(bulk.dataKey) ? await bulk.dataKey.call(this, resp) : resp[bulk.dataKey]
   if (data.length === 0) {
-    print.warn('No records to process, abort')
+    print.warn('noRecordToProcess')
     return 0
   }
-  spin.setText('Got %d records, processing...', data.length)
+  spin.setText('gotRecordsProcessing%d', data.length)
   for (let r of data) {
     await setImmediate()
     if (bulk.converter) r = await bulk.converter.call(this, r, bulk)
@@ -35,15 +35,15 @@ async function fetching ({ url, opts, bulk, spin }) {
       const result = await bulk.handler.call(this, r, bulk)
       if (result && has(stat, result)) stat[result]++
       if (bulk.printCount && bulk.printCount < count && (count % bulk.printCount === 0)) print.succeed('[%s] Processed %d/%d', spin.getElapsed(), count, data.length)
-      else if (!spin.opts.isLog) spin.setText('Record %d/%d...', count, data.length)
+      else if (!spin.opts.isLog) spin.setText('rec%d%d', count, data.length)
       count++
     } catch (err) {
       console.log(err)
       spin.setText(validationErrorMessage(err) + ', continue')
     }
   }
-  print.succeed('[%s] %d/%d records processed', spin.getElapsed(), count, data.length)
-  if (!bulk.noStat) print.succeed('[%s] Created: %d, Updated: %d, Skipped: %d', spin.getElapsed(), stat.created, stat.updated, stat.skipped)
+  print.succeed('recProcessed%s%d%d', spin.getElapsed(), count, data.length)
+  if (!bulk.noStat) print.succeed('createdUpdatedSkipped%s%d%d%d', spin.getElapsed(), stat.created, stat.updated, stat.skipped)
   return data.length
 }
 
@@ -51,24 +51,24 @@ async function fetchBulk (url, bulk = {}, opts = {}) {
   const { isFunction } = this.bajo.lib._
   opts.params = opts.params ?? {}
   bulk.maxStep = bulk.maxStep ?? 0
-  if (!isFunction(bulk.handler)) throw this.error('A function handler must be provided')
+  if (!isFunction(bulk.handler)) throw this.error('handlerMustBeProvided')
   if (isFunction(bulk.paramsIncFn)) {
-    this.print.info('Bulk fetch starting')
-    const spin = this.print.spinner({ showCounter: true }).start('Fetching starts...')
+    this.print.info('bulkFetchStarting')
+    const spin = this.print.spinner({ showCounter: true }).start('fetchingStarts')
     let step = 1
     for (;;) {
-      this.print.info('[%s] Batch #%d', spin.getElapsed(), step)
+      this.print.info('batch%s%d', spin.getElapsed(), step)
       const newOpts = await bulk.paramsIncFn.call(this, { url, bulk, opts })
       if (newOpts) opts = newOpts
       const length = await fetching.call(this, { url, bulk, opts, spin })
       if (length === 0 || (bulk.maxStep > 0 && step >= bulk.maxStep)) {
-        this.print.info('All done!')
+        this.print.info('allDone')
         break
       }
       step++
     }
   } else {
-    const spin = this.print.spinner({ showCounter: true }).start('Fetching starts...')
+    const spin = this.print.spinner({ showCounter: true }).start('fetchingStarts')
     await fetching.call(this, { url, bulk, opts, spin })
   }
 }

package/bajoCli/applet/download.js

@@ -1,15 +1,15 @@
 async function download (...args) {
   const [url] = args
-  const spinText = 'Downloading file...'
+  const spinText = this.print.write('downloading%s', this.print.write('file'))
   const spin = this.print.spinner({ showCounter: true }).start(spinText)
 
   let dest
   try {
     dest = await this.download(url, undefined, { spin, spinText })
   } catch (err) {
-    spin.fatal('Error: %s', err.message)
+    spin.fatal('error%s', err.message)
   }
-  spin.succeed('File saved as \'%s\'', dest)
+  spin.succeed('savedAs%s%s', this.print.write('file'), dest)
 }
 
 export default download

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bajo-extra",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Extra package for Bajo Framework",
   "main": "index.js",
   "scripts": {

package/bajoI18N/resource/id.json

@@ -1,5 +0,0 @@
-{
-  "Download dir '%s' doesn't exist": "Direktori unduh '%s' belum eksis",
-  "Downloading...": "Mengunduh...",
-  "Getting %s status": "Mendapatkan status %s"
-}