liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: If %p or %P queue template term includes start of file path, prepend the leading /, \ or \\ from the file path

Browse Source
This commit is contained in:
Scott Gilbertson 2024-01-15 15:27:09 -05:00
parent 343b5ecc68
commit a39e6779e4
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rtgui/batchqueue.cc
View File

@ -75,6 +75,23 @@ namespace // local helper functions
} }
return pathIndex; return pathIndex;
} }
// Extract the initial characters from a canonical absolute path, and append
// those to a path string. Initial characters are '/' for Unix/Linux paths and
// '\\' for UNC paths. A single backslash is also accepted, for driveless
// Windows paths.
void appendAbsolutePathPrefix(Glib::ustring& path, const Glib::ustring& absolutePath)
{
if (absolutePath[0] == '/') {
path += '/'; // Start of a Unix/Linux path
} else if (absolutePath[0] == '\\') {
if (absolutePath.size() > 1 && absolutePath[1] == '\\') {
path += "\\\\"; // Start of a UNC path
} else {
path += '\\'; // Start of a Windows path that does not include a drive letter
}
}
}
} }
BatchQueue::BatchQueue (FileCatalog* aFileCatalog) : processing(nullptr), fileCatalog(aFileCatalog), sequence(0), listener(nullptr) BatchQueue::BatchQueue (FileCatalog* aFileCatalog) : processing(nullptr), fileCatalog(aFileCatalog), sequence(0), listener(nullptr)
@ -916,6 +933,9 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
ix++; ix++;
unsigned int n = decodePathIndex(ix, options.savePathTemplate, da.size()); unsigned int n = decodePathIndex(ix, options.savePathTemplate, da.size());
if (n < da.size()) { if (n < da.size()) {
if (n == 0) {
appendAbsolutePathPrefix(path, origFileName);
}
for (unsigned int i=n; i < da.size(); i++) { for (unsigned int i=n; i < da.size(); i++) {
path += da[i] + PATH_SEPARATOR; path += da[i] + PATH_SEPARATOR;
} }
@ -930,6 +950,9 @@ Glib::ustring BatchQueue::calcAutoFileNameBase (const Glib::ustring& origFileNam
ix++; ix++;
unsigned int n = decodePathIndex(ix, options.savePathTemplate, da.size()); unsigned int n = decodePathIndex(ix, options.savePathTemplate, da.size());
for (unsigned int i=0; i <= n && i < da.size(); i++) { for (unsigned int i=0; i <= n && i < da.size(); i++) {
if (i == 0) {
appendAbsolutePathPrefix(path, origFileName);
}
path += da[i] + PATH_SEPARATOR; path += da[i] + PATH_SEPARATOR;
} }
// If the next template character is a separator, skip it, because path already has one // If the next template character is a separator, skip it, because path already has one