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

fix: git storage - 'import everything' feature restored (#4559) (#4572)

Browse Source
This commit is contained in:
mordini 2021-10-09 13:59:47 -04:00 committed by GitHub
parent cd98c9759a
commit d93bd1ad5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ module.exports = {
if (!item.binary && contentType) { if (!item.binary && contentType) {
// -> Page // -> Page
if (fileExists && item.relPath !== item.oldPath) { if (fileExists && !item.importAll && item.relPath !== item.oldPath) {
// Page was renamed by git, so rename in DB // Page was renamed by git, so rename in DB
WIKI.logger.info(`(STORAGE/GIT) Page marked as renamed: from ${item.oldPath} to ${item.relPath}`) WIKI.logger.info(`(STORAGE/GIT) Page marked as renamed: from ${item.oldPath} to ${item.relPath}`)
@ -195,7 +195,7 @@ module.exports = {
destinationLocale: contentPath.locale, destinationLocale: contentPath.locale,
skipStorage: true skipStorage: true
}) })
} else if (!fileExists && item.deletions > 0 && item.insertions === 0) { } else if (!fileExists && !item.importAll && item.deletions > 0 && item.insertions === 0) {
// Page was deleted by git, can safely mark as deleted in DB // Page was deleted by git, can safely mark as deleted in DB
WIKI.logger.info(`(STORAGE/GIT) Page marked as deleted: ${item.relPath}`) WIKI.logger.info(`(STORAGE/GIT) Page marked as deleted: ${item.relPath}`)
@ -224,7 +224,7 @@ module.exports = {
} else { } else {
// -> Asset // -> Asset
if (fileExists && ((item.before === item.after) || (item.deletions === 0 && item.insertions === 0))) { if (fileExists && !item.importAll && ((item.before === item.after) || (item.deletions === 0 && item.insertions === 0))) {
// Asset was renamed by git, so rename in DB // Asset was renamed by git, so rename in DB
WIKI.logger.info(`(STORAGE/GIT) Asset marked as renamed: from ${item.oldPath} to ${item.relPath}`) WIKI.logger.info(`(STORAGE/GIT) Asset marked as renamed: from ${item.oldPath} to ${item.relPath}`)
@ -240,7 +240,7 @@ module.exports = {
WIKI.logger.info(`(STORAGE/GIT) Asset was not found in the DB, nothing to rename: ${item.relPath}`) WIKI.logger.info(`(STORAGE/GIT) Asset was not found in the DB, nothing to rename: ${item.relPath}`)
} }
continue continue
} else if (!fileExists && ((item.before > 0 && item.after === 0) || (item.deletions > 0 && item.insertions === 0))) { } else if (!fileExists && !item.importAll && ((item.before > 0 && item.after === 0) || (item.deletions > 0 && item.insertions === 0))) {
// Asset was deleted by git, can safely mark as deleted in DB // Asset was deleted by git, can safely mark as deleted in DB
WIKI.logger.info(`(STORAGE/GIT) Asset marked as deleted: ${item.relPath}`) WIKI.logger.info(`(STORAGE/GIT) Asset marked as deleted: ${item.relPath}`)
@ -427,7 +427,8 @@ module.exports = {
relPath, relPath,
file, file,
deletions: 0, deletions: 0,
insertions: 0 insertions: 0,
importAll: true
}], rootUser) }], rootUser)
} }
cb() cb()