shawn/op-pedal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle both old and new T3k thumbnail urs.

Browse Source
This commit is contained in:
Robin E.R. Davies
2026-06-01 15:21:33 -04:00
parent 2f10bfcba2
commit 618e403331
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WebServerConfig.cpp
+10 -4
View File
@@ -97,7 +97,9 @@ static bool IsSafeThumbnailPath(const fs::path path)
if (!HtmlHelper::IsSafeFileName(path)) { if (!HtmlHelper::IsSafeFileName(path)) {
return false; return false;
} }
if (!(path.string().starts_with("/var/pipedal/tone3000_thumbnails/"))) if ((!path.string().starts_with("/var/pipedal/tone3000_thumbnails/")) &&
(!path.string().starts_with("/var/pipedal/audio_uploads/tone3000_thumbnails/"))
)
{ {
return false; return false;
} }
@@ -181,7 +183,7 @@ static fs::path GetTone3000ThumbnailFile(const fs::path& thumbnailDirectory, con
namespace pipedal::implementation { namespace pipedal::implementation {
int64_t ImportBankFile(PiPedalModel &model, const std::filesystem::path& filePath,uint64_t uploadAfter = -1) int64_t ImportBankFile(PiPedalModel& model, const std::filesystem::path& filePath, uint64_t uploadAfter = -1)
{ {
BankFile bankFile; BankFile bankFile;
@@ -201,7 +203,7 @@ namespace pipedal::implementation {
} }
else else
{ {
std::ifstream f {filePath}; std::ifstream f{ filePath };
if (!f.is_open()) { if (!f.is_open()) {
throw std::runtime_error(SS("Unable to open file " << filePath)); throw std::runtime_error(SS("Unable to open file " << filePath));
} }
@@ -621,7 +623,11 @@ public:
fs::path path = GetTone3000ThumbnailFile(this->model->Tone3000ThumbnailDirectory(), id); fs::path path = GetTone3000ThumbnailFile(this->model->Tone3000ThumbnailDirectory(), id);
if (!fs::exists(path)) if (!fs::exists(path))
{ {
throw PiPedalException("File not found."); path = GetTone3000ThumbnailFile(this->model->OldTone3000ThumbnailDirectory(),id);
if (!fs::exists(path))
{
throw PiPedalException("File not found.");
}
} }
auto mimeType = GetMimeType(path); auto mimeType = GetMimeType(path);
if (mimeType.empty()) if (mimeType.empty())