Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle listallinfo failures more gracefully

Browse Source
This commit is contained in:
Andrzej Rybczak
2020-12-20 16:14:47 +01:00
parent 48f64f1aa0
commit 948d168790
5 changed files with 46 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/screens/media_library.cpp
View File

@@ -302,7 +302,18 @@ void MediaLibrary::update()
m_albums_update_request = false;
sunfilter_albums.set(ReapplyFilter::Yes, true);
std::map<std::tuple<std::string, std::string, std::string>, time_t> albums;
for (MPD::SongIterator s = getDatabaseIterator(Mpd), end; s != end; ++s)
MPD::SongIterator s, end;
try
{
s = Mpd.GetDirectoryRecursive("/");
}
catch (MPD::Error &e)
{
// If there was a problem, fall back to a different column mode.
toggleColumnsMode();
throw;
}
for (; s != end; ++s)
{
std::string tag;
unsigned idx = 0;
@@ -349,7 +360,18 @@ void MediaLibrary::update()
std::map<std::string, time_t> tags;
if (Config.media_library_sort_by_mtime)
{
for (MPD::SongIterator s = getDatabaseIterator(Mpd), end; s != end; ++s)
MPD::SongIterator s, end;
try
{
s = Mpd.GetDirectoryRecursive("/");
}
catch (MPD::Error &e)
{
// If there was a problem, fall back to a different sorting mode.
toggleSortMode();
throw;
}
for (; s != end; ++s)
{
std::string tag;
unsigned idx = 0;

2
src/screens/search_engine.cpp
View File

@@ -500,7 +500,7 @@ void SearchEngine::Search()
input_song_iterator s, end;
if (Config.search_in_db)
{
s = input_song_iterator(getDatabaseIterator(Mpd));
s = input_song_iterator(Mpd.GetDirectoryRecursive("/"));
end = input_song_iterator(MPD::SongIterator());
}
else