liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(git): handle file renames between folders (#6020)

Browse Source 
* git storage: handle file renames between folders

---------

Co-authored-by: Nicolas Giard <github@ngpixel.com>
This commit is contained in:
Eric Knibbe 2023-01-29 23:09:33 -05:00 committed by GitHub
parent 8fa771c4ce
commit 2e8585478f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/models/pages.js
View File

@ -725,7 +725,7 @@ module.exports = class Page extends Model {
const destinationHash = pageHelper.generateHash({ path: opts.destinationPath, locale: opts.destinationLocale, privateNS: opts.isPrivate ? 'TODO' : '' })
// -> Move page
const destinationTitle = (page.title === page.path ? opts.destinationPath : page.title)
const destinationTitle = (page.title === _.last(page.path.split('/')) ? _.last(opts.destinationPath.split('/')) : page.title)
await WIKI.models.pages.query().patch({
path: opts.destinationPath,
localeCode: opts.destinationLocale,
@ -745,6 +745,7 @@ module.exports = class Page extends Model {
...page,
destinationPath: opts.destinationPath,
destinationLocaleCode: opts.destinationLocale,
title: destinationTitle,
destinationHash
})

24
server/modules/storage/git/storage.js
View File

@ -146,10 +146,24 @@ module.exports = {
const diff = await this.git.diffSummary(['-M', currentCommitLog.hash, latestCommitLog.hash])
if (_.get(diff, 'files', []).length > 0) {
let filesToProcess = []
const filePattern = /(.*?)(?:{(.*?))? => (?:(.*?)})?(.*)/
for (const f of diff.files) {
const fMoved = f.file.split(' => ')
const fName = fMoved.length === 2 ? fMoved[1] : fMoved[0]
const fPath = path.join(this.repoPath, fName)
const fMatch = f.file.match(filePattern)
const fNames = {
old: null,
new: null
}
if (!fMatch) {
fNames.old = f.file
fNames.new = f.file
} else if (!fMatch[2] && !fMatch[3]) {
fNames.old = fMatch[1]
fNames.new = fMatch[4]
} else {
fNames.old = (fMatch[1]+fMatch[2]+fMatch[4]).replace('//', '/'),
fNames.new = (fMatch[1]+fMatch[3]+fMatch[4]).replace('//', '/')
}
const fPath = path.join(this.repoPath, fNames.new)
let fStats = { size: 0 }
try {
fStats = await fs.stat(fPath)
@ -166,8 +180,8 @@ module.exports = {
path: fPath,
stats: fStats
},
oldPath: fMoved[0],
relPath: fName
oldPath: fNames.old,
relPath: fNames.new
})
}
await this.processFiles(filesToProcess, rootUser)