jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Resolve relative paths on scene collection import 

This change makes it so any strings in a scene collection that start
with "./" are checked as being a relative path. As long as the resulting
absolute path is contained within the same directory as the collection
being imported, it will be replaced with an absolute path.

This allows scene collections to be effectively "packaged" with assets,
so long as the assets are contained somewhere within the folder the
collection is being imported from.
master
VodBox 2021-09-25 22:04:43 +12:00 committed by Jim
parent 5c26bf06f0
commit 8a132ad69f
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/importers/importers.hpp
View File

@ -23,6 +23,7 @@
#include <util/util.hpp>
#include <string>
#include <vector>
#include <QDir>
enum obs_importer_responses {
IMPORTER_SUCCESS,
@ -106,6 +107,7 @@ int ImportSC(const std::string &path, std::string &name, json11::Json &res);
OBSImporterFiles ImportersFindFiles();
void TranslateOSStudio(json11::Json &data);
void TranslatePaths(json11::Json &data, const std::string &rootDir);
static inline std::string GetFilenameFromPath(const std::string &path)
{

69
UI/importers/studio.cpp
View File

@ -146,9 +146,75 @@ void TranslateOSStudio(Json &res)
}
out["sources"] = sources;
res = out;
}
static string CheckPath(const string &path, const string &rootDir)
{
char root[512];
*root = 0;
size_t rootLen = os_get_abs_path(rootDir.c_str(), root, sizeof(root));
char absPath[512];
*absPath = 0;
size_t len = os_get_abs_path((rootDir + path).c_str(), absPath,
sizeof(absPath));
if (len == 0)
return path;
if (strstr(absPath, root) != absPath)
return path;
if (*(absPath + rootLen) != QDir::separator().toLatin1())
return path;
return absPath;
}
void TranslatePaths(Json &res, const string &rootDir)
{
if (res.is_object()) {
Json::object out = res.object_items();
for (auto it = out.begin(); it != out.end(); it++) {
Json val = it->second;
if (val.is_string()) {
if (val.string_value().rfind("./", 0) != 0)
continue;
out[it->first] =
CheckPath(val.string_value(), rootDir);
} else if (val.is_array() || val.is_object()) {
TranslatePaths(val, rootDir);
out[it->first] = val;
}
}
res = out;
} else if (res.is_array()) {
Json::array out = res.array_items();
for (size_t i = 0; i != out.size(); i++) {
Json val = out[i];
if (val.is_string()) {
if (val.string_value().rfind("./", 0) != 0)
continue;
out[i] = CheckPath(val.string_value(), rootDir);
} else if (val.is_array() || val.is_object()) {
TranslatePaths(val, rootDir);
out[i] = val;
}
}
res = out;
}
}
bool StudioImporter::Check(const string &path)
{
BPtr<char> file_data = os_quick_read_utf8_file(path.c_str());
@ -200,7 +266,10 @@ int StudioImporter::ImportScenes(const string &path, string &name, Json &res)
if (err != "")
return IMPORTER_ERROR_DURING_CONVERSION;
QDir dir(path.c_str());
TranslateOSStudio(d);
TranslatePaths(d, QDir::cleanPath(dir.filePath("..")).toStdString());
Json::object obj = d.object_items();