bug: Fix some logging bugs and add output

This commit is contained in:
Bret Comnes
2020-02-12 21:00:58 -07:00
parent 80459935e1
commit d9fb7899eb
2 changed files with 8 additions and 6 deletions

View File

@@ -9,6 +9,7 @@ async function doDeploy () {
const token = core.getInput('api-token') const token = core.getInput('api-token')
const distDir = path.join(process.cwd(), core.getInput('dist-dir')) const distDir = path.join(process.cwd(), core.getInput('dist-dir'))
const cleanup = core.getInput('cleanup') const cleanup = core.getInput('cleanup')
console.log(typeof cleanup)
const client = new Neocities(token) const client = new Neocities(token)
@@ -30,8 +31,9 @@ function statsHandler (opts = {}) {
case 'inspecting': { case 'inspecting': {
switch (stats.status) { switch (stats.status) {
case 'start': { case 'start': {
core.startGroup('Inspecting') core.startGroup('Inspecting files')
console.log(`Inspecting local (${opts.distDir}) and remote files...`) console.log('Inspecting local and remote files...')
console.log(`Dist directory: ${opts.distDir})`)
break break
} }
case 'progress': { case 'progress': {
@@ -63,7 +65,7 @@ function statsHandler (opts = {}) {
const { tasks: { diffing } } = stats const { tasks: { diffing } } = stats
console.log(`Done diffing local and remote files in ${prettyTime([0, stats.timer.elapsed])}`) console.log(`Done diffing local and remote files in ${prettyTime([0, stats.timer.elapsed])}`)
console.log(`${diffing.uploadCount} files to upload`) console.log(`${diffing.uploadCount} files to upload`)
console.log(`${diffing.deleteCount} ` + opts.cleanup ? 'files to delete' : 'orphaned files') console.log(`${diffing.deleteCount} ` + (opts.cleanup ? 'files to delete' : 'orphaned files'))
console.log(`${diffing.skipCoount} files to skip`) console.log(`${diffing.skipCoount} files to skip`)
core.endGroup() core.endGroup()
break break
@@ -75,7 +77,7 @@ function statsHandler (opts = {}) {
switch (stats.status) { switch (stats.status) {
case 'start': { case 'start': {
core.startGroup('Applying diff') core.startGroup('Applying diff')
console.log('Uploading changes' + opts.cleanup ? ' and deleting orphaned files...' : '...') console.log('Uploading changes' + (opts.cleanup ? ' and deleting orphaned files...' : '...'))
break break
} }
case 'progress': { case 'progress': {
@@ -83,7 +85,7 @@ function statsHandler (opts = {}) {
} }
case 'stop': { case 'stop': {
const { tasks: { uploadFiles, deleteFiles, skippedFiles } } = stats const { tasks: { uploadFiles, deleteFiles, skippedFiles } } = stats
console.log('Done uploading changes' + opts.cleanup ? ' and deleting orphaned files' : '' + ` in ${prettyTime([0, stats.timer.elapsed])}`) console.log('Done uploading changes' + (opts.cleanup ? ' and deleting orphaned files' : '') + ` in ${prettyTime([0, stats.timer.elapsed])}`)
console.log(`Average upload speed: ${prettyBytes(uploadFiles.speed)}/s`) console.log(`Average upload speed: ${prettyBytes(uploadFiles.speed)}/s`)
if (opts.cleanup) console.log(`Average delete speed: ${prettyBytes(deleteFiles.speed)}/s`) if (opts.cleanup) console.log(`Average delete speed: ${prettyBytes(deleteFiles.speed)}/s`)
console.log(`Skipped ${skippedFiles.count} files (${prettyBytes(skippedFiles.size)})`) console.log(`Skipped ${skippedFiles.count} files (${prettyBytes(skippedFiles.size)})`)

View File

@@ -39,7 +39,7 @@
"dependencies": { "dependencies": {
"@actions/core": "1.2.2", "@actions/core": "1.2.2",
"@actions/github": "2.1.0", "@actions/github": "2.1.0",
"async-neocities": "1.0.0", "async-neocities": "1.0.1",
"pretty-bytes": "^5.3.0", "pretty-bytes": "^5.3.0",
"pretty-time": "^1.1.0" "pretty-time": "^1.1.0"
}, },