This commit is contained in:
Bret Comnes 2020-02-10 14:29:55 -07:00
parent fc9f4dc3ad
commit 343d3ef96a
No known key found for this signature in database
GPG Key ID: 3705F4634DC3A1AC
3 changed files with 19 additions and 24 deletions

View File

@ -153,23 +153,18 @@ class NeocitiesAPIClient {
statsCb: () => {},
...opts
}
const getRemoteFiles = this.list()
const [localFiles, remoteFiles] = Promise.all([
afw.allFiles(path.join(folder), { shaper: f => f }),
getRemoteFiles
const [localFiles, remoteFiles] = await Promise.all([
afw.allFiles(folder, { shaper: f => f }),
this.list()
])
const { filesToUpload, filesToDelete, filesSkipped } = await neocitiesLocalDiff(remoteFiles, localFiles)
const { filesToUpload, filesToDelete, filesSkipped } = await neocitiesLocalDiff(remoteFiles.files, localFiles)
opts.statsCb({ filesToUpload, filesToDelete, filesSkipped })
const work = []
const uploadJob = this.upload(filesToUpload)
work.push(uploadJob)
if (opts.cleanup) {
const deleteJob = this.delete(filesToDelete)
work.push(deleteJob)
}
const work = [this.upload(filesToUpload)]
if (opts.cleanup) { work.push(this.delete(filesToDelete)) }
await work
await Promise.all(work)
return { filesToUpload, filesToDelete, filesSkipped }
}

View File

@ -1,26 +1,26 @@
{
"_from": "async-neocities-tmp@0.0.5",
"_id": "async-neocities-tmp@0.0.5",
"_from": "async-neocities-tmp@0.0.8",
"_id": "async-neocities-tmp@0.0.8",
"_inBundle": false,
"_integrity": "sha512-jEu2qT3rpMa7P+aRHdhnF7lNBHJJpV+Bf3FoypIqSNn0gCi1FG+0ujsZ8eMbR/k0hu709Ar4r6WaVGDvp3npYQ==",
"_integrity": "sha512-7WRDMN4/h+OkOiTzX7NC9pmx8OJL2e/bwwAH6EUHAQLhled7a9NrIXw1hV+sZMVWH3NhmpPxWr6nfGEqmtE2GA==",
"_location": "/async-neocities-tmp",
"_phantomChildren": {},
"_requested": {
"type": "version",
"registry": true,
"raw": "async-neocities-tmp@0.0.5",
"raw": "async-neocities-tmp@0.0.8",
"name": "async-neocities-tmp",
"escapedName": "async-neocities-tmp",
"rawSpec": "0.0.5",
"rawSpec": "0.0.8",
"saveSpec": null,
"fetchSpec": "0.0.5"
"fetchSpec": "0.0.8"
},
"_requiredBy": [
"/"
],
"_resolved": "https://registry.npmjs.org/async-neocities-tmp/-/async-neocities-tmp-0.0.5.tgz",
"_shasum": "dca9ee7fbb2847aebc29d3cb6e4981845abaca39",
"_spec": "async-neocities-tmp@0.0.5",
"_resolved": "https://registry.npmjs.org/async-neocities-tmp/-/async-neocities-tmp-0.0.8.tgz",
"_shasum": "9b7a2a7bd8df8fc1c868f5a69013b4125b247b5d",
"_spec": "async-neocities-tmp@0.0.8",
"_where": "/Users/bret/repos/deploy-to-neocities",
"author": {
"name": "Bret Comnes",
@ -68,5 +68,5 @@
"dist"
]
},
"version": "0.0.5"
"version": "0.0.8"
}

View File

@ -32,7 +32,7 @@
"dependencies": {
"@actions/core": "1.2.2",
"@actions/github": "2.1.0",
"async-neocities-tmp": "0.0.5"
"async-neocities-tmp": "0.0.8"
},
"standard": {
"ignore": [