oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/Registry: eliminate MIME type copy

Browse Source
This commit is contained in:
Max Kellermann 2019-06-11 19:32:45 +02:00
parent 15dbb8082e
commit 7de6e4dbac
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/playlist/PlaylistRegistry.cxx
View File

@ -201,22 +201,29 @@ playlist_list_open_stream_mime2(InputStreamPtr &&is, StringView mime)
return nullptr;
}
/**
* Extract the "main" part of a MIME type string, i.e. the portion
* before the semicolon (if one exists).
*/
gcc_pure
static StringView
ExtractMimeTypeMainPart(StringView s) noexcept
{
const auto separator = s.Find(';');
if (separator != nullptr)
s.SetEnd(separator);
return s;
}
static std::unique_ptr<SongEnumerator>
playlist_list_open_stream_mime(InputStreamPtr &&is, const char *full_mime)
{
assert(full_mime != nullptr);
const char *semicolon = strchr(full_mime, ';');
if (semicolon == nullptr)
return playlist_list_open_stream_mime2(std::move(is),
full_mime);
if (semicolon == full_mime)
return nullptr;
/* probe only the portion before the semicolon*/
const std::string mime(full_mime, semicolon);
return playlist_list_open_stream_mime2(std::move(is), mime.c_str());
return playlist_list_open_stream_mime2(std::move(is),
ExtractMimeTypeMainPart(full_mime));
}
std::unique_ptr<SongEnumerator>