danamir/mykb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated docs.patch git handling

Browse Source
This commit is contained in:
JJ Kasper
2018-11-24 16:37:26 -06:00
parent 6ce3734124
commit f634ec7bba
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/routes/docs.js
View File

@@ -106,8 +106,7 @@ module.exports = function docs(app) {
if (!doc) return notFound(res) if (!doc) return notFound(res)
if (!isOkDoc({ name: name || doc.name, dir, md }, kb, res)) return if (!isOkDoc({ name: name || doc.name, dir, md }, kb, res)) return
let newDir = typeof dir === 'string' ? dir : doc.dir let newDir = typeof dir === 'string' ? dir : doc.dir
const oldDir = path.join(docsDir, doc.dir) const oldPath = path.join(docsDir, doc.dir, doc.name)
const oldPath = path.join(oldDir, doc.name)
const docPath = path.join(docsDir, newDir, name || doc.name) const docPath = path.join(docsDir, newDir, name || doc.name)
const oldRelPath = oldPath.split(docsDir + '/')[1] const oldRelPath = oldPath.split(docsDir + '/')[1]
const curRelPath = docPath.split(docsDir + '/')[1] const curRelPath = docPath.split(docsDir + '/')[1]
@@ -125,13 +124,14 @@ module.exports = function docs(app) {
} }
await tryRmdir(docsDir, oldRelPath) await tryRmdir(docsDir, oldRelPath)
if (useGit && isNewPath) { if (useGit) {
await git.rm(oldPath) let commitMsg = `updated doc ${curRelPath}`
if (isNewPath) {
git.rm(oldPath)
commitMsg = `renamed doc ${oldRelPath} to ${curRelPath}`
}
await git.add(docPath) await git.add(docPath)
await git.commit(`renamed doc ${oldRelPath} to ${curRelPath}`) await git.commit(commitMsg)
} else if (useGit) {
await git.add(docPath)
await git.commit(`updated doc ${curRelPath}`)
} }
} catch (err) { } catch (err) {
return serverError(res, err) return serverError(res, err)