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

use SongIterator

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-11-01 19:45:19 +01:00
parent 485e6ee4a3
commit 4ad5c33f32
10 changed files with 138 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/actions.cpp
View File

@@ -1319,30 +1319,31 @@ void EditLibraryTag::run()
if (!new_tag.empty() && new_tag != myLibrary->Tags.current().value().tag())
{
Statusbar::print("Updating tags...");
Mpd.StartSearch(1);
Mpd.StartSearch(true);
Mpd.AddSearch(Config.media_lib_primary_tag, myLibrary->Tags.current().value().tag());
MPD::MutableSong::SetFunction set = tagTypeToSetFunction(Config.media_lib_primary_tag);
assert(set);
bool success = true;
std::string dir_to_update;
Mpd.CommitSearchSongs([set, &dir_to_update, &new_tag, &success](MPD::Song s) {
if (!success)
return;
MPD::MutableSong ms = s;
for (MPD::SongIterator s = Mpd.CommitSearchSongs(), end; s != end; ++s)
{
MPD::MutableSong ms = std::move(*s);
ms.setTags(set, new_tag, Config.tags_separator);
Statusbar::printf("Updating tags in \"%1%\"...", ms.getName());
std::string path = Config.mpd_music_dir + ms.getURI();
if (!Tags::write(ms))
{
success = false;
const char msg[] = "Error while updating tags in \"%1%\"";
Statusbar::printf(msg, wideShorten(ms.getURI(), COLS-const_strlen(msg)));
success = false;
s.finish();
break;
}
if (dir_to_update.empty())
dir_to_update = s.getURI();
dir_to_update = ms.getURI();
else
dir_to_update = getSharedDirectory(dir_to_update, s.getURI());
});
dir_to_update = getSharedDirectory(dir_to_update, ms.getURI());
};
if (success)
{
Mpd.UpdateDirectory(dir_to_update);