Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Refactored importer's content file handler

Browse source 
refs https://github.com/TryGhost/Toolbox/issues/523

- Renamed variables that were too media-specific
This commit is contained in:
Naz 2023-03-02 16:34:21 +08:00
parent cd49992cd9
commit 116e69afcd
No known key found for this signature in database
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ghost/importer-handler-content-files/lib/ImporterContentFileHandler.js
View file

@ -43,23 +43,23 @@ class ImporterContentFileHandler {
async loadFile(files, baseDir) { async loadFile(files, baseDir) {
const baseDirRegex = baseDir ? new RegExp('^' + baseDir + '/') : new RegExp(''); const baseDirRegex = baseDir ? new RegExp('^' + baseDir + '/') : new RegExp('');
const mediaFolderRegexes = _.map(this.storage.staticFileURLPrefix.split('/'), function (dir) { const contentFilesFolderRegexes = _.map(this.storage.staticFileURLPrefix.split('/'), function (dir) {
return new RegExp('^' + dir + '/'); return new RegExp('^' + dir + '/');
}); });
// normalize the directory structure // normalize the directory structure
const mediaContentPath = this.#contentPath; const filesContentPath = this.#contentPath;
files = _.map(files, function (file) { files = _.map(files, function (file) {
const noBaseDir = file.name.replace(baseDirRegex, ''); const noBaseDir = file.name.replace(baseDirRegex, '');
let noGhostDirs = noBaseDir; let noGhostDirs = noBaseDir;
_.each(mediaFolderRegexes, function (regex) { _.each(contentFilesFolderRegexes, function (regex) {
noGhostDirs = noGhostDirs.replace(regex, ''); noGhostDirs = noGhostDirs.replace(regex, '');
}); });
file.originalPath = noBaseDir; file.originalPath = noBaseDir;
file.name = noGhostDirs; file.name = noGhostDirs;
file.targetDir = path.join(mediaContentPath, path.dirname(noGhostDirs)); file.targetDir = path.join(filesContentPath, path.dirname(noGhostDirs));
return file; return file;
}); });
@ -70,7 +70,7 @@ class ImporterContentFileHandler {
'/', '/',
self.urlUtils.getSubdir(), self.urlUtils.getSubdir(),
self.storage.staticFileURLPrefix, self.storage.staticFileURLPrefix,
path.relative(mediaContentPath, targetFilename) path.relative(filesContentPath, targetFilename)
); );
return contentFile; return contentFile;