Skip to content

Fix for #982: Playlist parser encoding issues and early exit with bad filepaths #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kstauch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for #982: Playlist parser encoding issues and early exit with bad filepaths #966

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions src/playlist/Playlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ auto Playlist::AddPath(const std::string& path, uint32_t index, bool recursive,

if (recursive)
{
try
for (const auto& entry : recursive_directory_iterator(path))
{
for (const auto& entry : recursive_directory_iterator(path))
try
{
if (is_regular_file(entry) && entry.path().extension() == ".milk")
{
Expand All @@ -106,17 +106,17 @@ auto Playlist::AddPath(const std::string& path, uint32_t index, bool recursive,
{
currentIndex = index + presetsAdded;
}
if (AddItem(entry.path().string(), currentIndex, allowDuplicates))
if (AddItem(entry.path().u8string(), currentIndex, allowDuplicates))
{
presetsAdded++;
}
}
}
}
catch (std::exception&)
{
// Todo: Add failure feedback
return presetsAdded;
catch (std::exception&)
{
// Todo: Add failure feedback
continue;
}
}
}
else
Expand All @@ -130,7 +130,7 @@ auto Playlist::AddPath(const std::string& path, uint32_t index, bool recursive,
{
currentIndex = index + presetsAdded;
}
if (AddItem(entry.path().string(), currentIndex, allowDuplicates))
if (AddItem(entry.path().u8string(), currentIndex, allowDuplicates))
{
presetsAdded++;
}
Expand Down Expand Up @@ -222,8 +222,8 @@ void Playlist::Sort(uint32_t startIndex, uint32_t count,
break;

case SortPredicate::FilenameOnly: {
leftFilename = path(left.Filename()).filename().string();
rightFilename = path(right.Filename()).filename().string();
leftFilename = path(left.Filename()).filename().u8string();
rightFilename = path(right.Filename()).filename().u8string();
break;
}
}
Expand Down