Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

OrganizeFormat: Parse the file path as a single block to avoid splitting brackets 

Fixes #1091
This commit is contained in:
Jonas Kvinge 2023-01-02 22:23:49 +01:00
parent bd945039f1
commit 7e3cb3de89
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/organize/organizeformat.cpp
View File

@ -111,34 +111,32 @@ bool OrganizeFormat::IsValid() const {
OrganizeFormat::GetFilenameForSongResult OrganizeFormat::GetFilenameForSong(const Song &song, QString extension) const { OrganizeFormat::GetFilenameForSongResult OrganizeFormat::GetFilenameForSong(const Song &song, QString extension) const {
QString format_path;
QString format_filename;
if (format_.contains('/')) {
format_path = format_.section('/', 0, -2);
format_filename = format_.section('/', -1);
}
else {
format_filename = format_;
}
QString path;
if (!format_path.isEmpty()) {
path = ParseBlock(format_path, song);
}
bool unique_filename = false; bool unique_filename = false;
QString filename = ParseBlock(format_filename, song, &unique_filename); QString filepath = ParseBlock(format_, song, &unique_filename);
if (filename.isEmpty()) {
return GetFilenameForSongResult(); if (filepath.isEmpty()) {
filepath = song.basefilename();
} }
QString filepath; {
if (path.isEmpty()) { QFileInfo fileinfo(filepath);
filepath = filename; if (fileinfo.completeBaseName().isEmpty()) {
// Avoid having empty filenames, or filenames with extension only: in this case, keep the original filename.
// We remove the extension from "filename" if it exists, as song.basefilename() also contains the extension.
QString path = fileinfo.path();
filepath.clear();
if (!path.isEmpty()) {
filepath.append(path);
if (path.right(1) != '/') {
filepath.append('/');
}
}
filepath.append(song.basefilename());
}
} }
else {
filepath = path + "/" + filename; if (filepath.isEmpty() || (filepath.contains('/') && (filepath.section('/', 0, -2).isEmpty() || filepath.section('/', 0, -2).isEmpty()))) {
return GetFilenameForSongResult();
} }
if (remove_problematic_) filepath = filepath.remove(kProblematicCharacters); if (remove_problematic_) filepath = filepath.remove(kProblematicCharacters);