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

Media library: sort songs by name if there are no track numbers

Browse Source
This commit is contained in:
Andrzej Rybczak
2017-08-31 09:41:20 +02:00
parent db28618929
commit def5c46225
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,6 +1,7 @@
ncmpcpp-0.8.1 (????-??-??)
* Setting 'colors_enabled' to 'no' no longer results in a crash.
* Using '--quiet' command line argument no longer results in a crash.
* If songs in media library have no track numbers, sort them by name.
ncmpcpp-0.8 (2017-05-21)
* Configuration variable 'execute_on_player_state_change' was added.

19
src/screens/media_library.cpp
View File

@@ -109,19 +109,26 @@ public:
return (*this)(a.value(), b.value());
}
bool operator()(const MPD::Song &a, const MPD::Song &b) {
int ret;
for (auto get = GetFuns.begin()+m_offset; get != GetFuns.end(); ++get) {
int ret = m_cmp(a.getTags(*get),
b.getTags(*get));
ret = m_cmp(a.getTags(*get),
b.getTags(*get));
if (ret != 0)
return ret < 0;
}
// Sort by track numbers.
try {
int ret = boost::lexical_cast<int>(a.getTags(&MPD::Song::getTrackNumber))
- boost::lexical_cast<int>(b.getTags(&MPD::Song::getTrackNumber));
return ret < 0;
ret = boost::lexical_cast<int>(a.getTags(&MPD::Song::getTrackNumber))
- boost::lexical_cast<int>(b.getTags(&MPD::Song::getTrackNumber));
} catch (boost::bad_lexical_cast &) {
return a.getTrackNumber() < b.getTrackNumber();
ret = a.getTrackNumber().compare(b.getTrackNumber());
}
if (ret != 0)
return ret < 0;
// If there are no track numbers, sort by name.
return a.getName() < b.getName();
}
};