bd893e6336
-----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEEA5IzWngIOJSkMBxDI26KWMbbRRIFAmENYHwQHG1heEBtdXNp Y3BkLm9yZwAKCRAjbopYxttFEpGtD/9ToU27x36NAAFpChicSqbu3h2wtJ29lowT ivV80XB26pQeGK0DSXADSs38MVXo42i3vqg0zGWV9TRbcDs5VErXANVLN16qsKCu U0v1BDY11UiYp6ATiUjIahyG1UsmbRVZlfDyVIhYvmFpGLFw6+03HH6w2k/v85ns FxyXkYDYcUokPJPEQcChE1eIwKsGM6MjbdVIkJAEo3wGhL/Hhy2KUskrFcCo1PDj 7xxGrwauG+8wSjAWMA5vzl3udRaDauuXztm5QbQIDdsbRaCiBAdgkzC0PvIxTOr0 bR4WHVB0KSiM96yIXNtg/WZxO0XrxppmX/E4eZSgz0JGKMrAHcoTJAUCIDu3X719 gJnJLg7r2X5dTchXezv09YoJolKbw1bOooyAuE4FCDWMsOa2GRuBZC+8w7DNTZuo PTh+Z40fnfpNBofe+e/WZrXr6i2TKk8CqHEidq2GHlOkvTR7g6m8MjOLvZNHotMb 9ECr9MhzXH+nvEX8IaxvjWsfLJiDbUgnVsQ+6akGtkbragaDN/Wgr/XdkELoLlsK LZFY5ngnZmDXOu4tjBLJtfrTkZB2/Hld4xtF1qlsy9fvZBRKeKlpABTLaa8r/vnR Ta0rB2O3/dculZbHZRUnZvLS4Xv4g322vW9Wso9IBoWRn9fC8b2zR93k7breAqcn pKbYGg/j6g== =/954 -----END PGP SIGNATURE----- Merge tag 'v0.22.10' release v0.22.10
104 lines
2.9 KiB
C++
104 lines
2.9 KiB
C++
/*
|
|
* Copyright 2003-2021 The Music Player Daemon Project
|
|
* http://www.musicpd.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include "PlaylistSong.hxx"
|
|
#include "SongLoader.hxx"
|
|
#include "tag/Tag.hxx"
|
|
#include "tag/Builder.hxx"
|
|
#include "fs/Traits.hxx"
|
|
#include "song/DetachedSong.hxx"
|
|
#include "util/UriExtract.hxx"
|
|
|
|
#include <algorithm>
|
|
#include <string>
|
|
|
|
#include <string.h>
|
|
|
|
static void
|
|
merge_song_metadata(DetachedSong &add, const DetachedSong &base) noexcept
|
|
{
|
|
if (base.GetTag().IsDefined()) {
|
|
TagBuilder builder(add.GetTag());
|
|
builder.Complement(base.GetTag());
|
|
add.SetTag(builder.Commit());
|
|
}
|
|
|
|
add.SetLastModified(base.GetLastModified());
|
|
|
|
if (add.GetStartTime().IsZero()) {
|
|
add.SetStartTime(base.GetStartTime());
|
|
}
|
|
if (add.GetEndTime().IsZero()) {
|
|
add.SetEndTime(base.GetEndTime());
|
|
}
|
|
|
|
if (!add.GetAudioFormat().IsDefined())
|
|
add.SetAudioFormat(base.GetAudioFormat());
|
|
}
|
|
|
|
static bool
|
|
playlist_check_load_song(DetachedSong &song, const SongLoader &loader) noexcept
|
|
try {
|
|
DetachedSong tmp = loader.LoadSong(song.GetURI());
|
|
|
|
song.SetURI(tmp.GetURI());
|
|
if (!song.HasRealURI() && tmp.HasRealURI())
|
|
song.SetRealURI(tmp.GetRealURI());
|
|
|
|
merge_song_metadata(song, tmp);
|
|
return true;
|
|
} catch (...) {
|
|
return false;
|
|
}
|
|
|
|
bool
|
|
playlist_check_translate_song(DetachedSong &song, std::string_view base_uri,
|
|
const SongLoader &loader) noexcept
|
|
{
|
|
if (base_uri.compare(".") == 0)
|
|
/* PathTraitsUTF8::GetParent() returns "." when there
|
|
is no directory name in the given path; clear that
|
|
now, because it would break the database lookup
|
|
functions */
|
|
base_uri = {};
|
|
|
|
const char *uri = song.GetURI();
|
|
|
|
#ifdef _WIN32
|
|
if (!PathTraitsUTF8::IsAbsolute(uri) && std::strchr(uri, '\\') != nullptr) {
|
|
/* Windows uses the backslash as path separator, but
|
|
the MPD protocol uses the (forward) slash by
|
|
definition; to allow backslashes in relative URIs
|
|
loaded from playlist files, this step converts all
|
|
backslashes to (forward) slashes */
|
|
|
|
std::string new_uri(uri);
|
|
std::replace(new_uri.begin(), new_uri.end(), '\\', '/');
|
|
song.SetURI(std::move(new_uri));
|
|
uri = song.GetURI();
|
|
}
|
|
#endif
|
|
|
|
if (base_uri.data() != nullptr &&
|
|
!PathTraitsUTF8::IsAbsoluteOrHasScheme(uri))
|
|
song.SetURI(PathTraitsUTF8::Build(base_uri, uri));
|
|
|
|
return playlist_check_load_song(song, loader);
|
|
}
|