diff --git a/src/FSWrapper.cpp b/src/FSWrapper.cpp index db80561..2982deb 100644 --- a/src/FSWrapper.cpp +++ b/src/FSWrapper.cpp @@ -670,15 +670,7 @@ bool FSWrapper::IsFileModeAllowed(const char *mode) { } bool FSWrapper::IsPathToReplace(const std::string_view &path) { - if (!path.starts_with(pPathToReplace)) { - return false; - } - - if (std::ranges::any_of(pIgnorePaths.cbegin(), pIgnorePaths.cend(), [&path](auto &ignorePath) { return path.starts_with(ignorePath); })) { - return false; - } - - return true; + return path.starts_with(pPathToReplace); } std::string FSWrapper::GetNewPath(const std::string_view &path) { diff --git a/src/FSWrapper.h b/src/FSWrapper.h index 9da9ed0..b9a2eb6 100644 --- a/src/FSWrapper.h +++ b/src/FSWrapper.h @@ -10,20 +10,16 @@ class FSWrapper : public IFSWrapper { public: - FSWrapper(const std::string &name, const std::string &pathToReplace, const std::string &replacePathWith, bool fallbackOnError, bool isWriteable, std::vector ignorePaths = {}) { + FSWrapper(const std::string &name, const std::string &pathToReplace, const std::string &replacePathWith, bool fallbackOnError, bool isWriteable) { this->pName = name; this->pPathToReplace = pathToReplace; this->pReplacePathWith = replacePathWith; this->pFallbackOnError = fallbackOnError; this->pIsWriteable = isWriteable; this->pCheckIfDeleted = fallbackOnError; - this->pIgnorePaths = std::move(ignorePaths); std::replace(pPathToReplace.begin(), pPathToReplace.end(), '\\', '/'); std::replace(pReplacePathWith.begin(), pReplacePathWith.end(), '\\', '/'); - for (auto &ignorePath : pIgnorePaths) { - std::replace(ignorePath.begin(), ignorePath.end(), '\\', '/'); - } } ~FSWrapper() override { { @@ -133,7 +129,6 @@ protected: private: std::string pPathToReplace; std::string pReplacePathWith; - std::vector pIgnorePaths; bool pIsWriteable = false; std::mutex openFilesMutex; std::mutex openDirsMutex; diff --git a/src/export.cpp b/src/export.cpp index 78c28a4..5e60770 100644 --- a/src/export.cpp +++ b/src/export.cpp @@ -115,10 +115,6 @@ ContentRedirectionApiErrorType CRAddFSLayer(CRLayerHandle *handle, const char *l } else if (layerType == FS_LAYER_TYPE_SAVE_REPLACE) { DEBUG_FUNCTION_LINE_INFO("Redirecting \"/vol/save\" to \"%s\", mode: \"replace\"", replacementDir); ptr = make_unique_nothrow(layerName, "/vol/save", replacementDir, false, true); - } else if (layerType == FS_LAYER_TYPE_SAVE_REPLACE_IGNORE_VOL_SAVE_COMMON) { - DEBUG_FUNCTION_LINE_INFO("Redirecting \"/vol/save\" to \"%s\", mode: \"replace\", ignore: (\"/vol/save/common\")", replacementDir); - std::vector ignorePaths({"/vol/save/common"}); - ptr = make_unique_nothrow(layerName, "/vol/save", replacementDir, false, true, ignorePaths); } else { DEBUG_FUNCTION_LINE_ERR("CONTENT_REDIRECTION_API_ERROR_UNKNOWN_LAYER_DIR_TYPE: %s %s %d", layerName, replacementDir, layerType); return CONTENT_REDIRECTION_API_ERROR_UNKNOWN_FS_LAYER_TYPE;