From 6c9e046b4b5ca25aacc0f3c2217accc9996a3da6 Mon Sep 17 00:00:00 2001 From: Naz Date: Wed, 1 Mar 2023 16:10:54 +0800 Subject: [PATCH] Reduced urlUtils dependency in ImageHandler refs https://github.com/TryGhost/Toolbox/issues/523 - url-utils module is actively being stripped down from usages across codebase. The "urlUtils.STATIC_IMAGE_URL_PREFIX" and "store.staticFileURLPrefix" are the same values - the main difference is with the value coming from store we can make this module more generic for any store type (images, media, files, etc) --- ghost/core/core/server/data/importer/handlers/image.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghost/core/core/server/data/importer/handlers/image.js b/ghost/core/core/server/data/importer/handlers/image.js index f715abf47d..af9cf52a4a 100644 --- a/ghost/core/core/server/data/importer/handlers/image.js +++ b/ghost/core/core/server/data/importer/handlers/image.js @@ -15,7 +15,7 @@ ImageHandler = { const store = storage.getStorage('images'); const baseDirRegex = baseDir ? new RegExp('^' + baseDir + '/') : new RegExp(''); - const imageFolderRegexes = _.map(urlUtils.STATIC_IMAGE_URL_PREFIX.split('/'), function (dir) { + const imageFolderRegexes = _.map(store.staticFileURLPrefix.split('/'), function (dir) { return new RegExp('^' + dir + '/'); }); @@ -36,7 +36,7 @@ ImageHandler = { return Promise.all(files.map(function (image) { return store.getUniqueFileName(image, image.targetDir).then(function (targetFilename) { - image.newPath = urlUtils.urlJoin('/', urlUtils.getSubdir(), urlUtils.STATIC_IMAGE_URL_PREFIX, + image.newPath = urlUtils.urlJoin('/', urlUtils.getSubdir(), store.staticFileURLPrefix, path.relative(config.getContentPath('images'), targetFilename)); return image;