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

sort files in Browser::GetLocalDirectory()

Browse Source 
files are read in kinda random order, so if one added local dir
to playlist, (s)he would get them not sorted at all. fix that by
sorting files that have been read recently from current dir, so
that we get files sorted within each read directory (if read
recursively), which is nice.
This commit is contained in:
Andrzej Rybczak
2009-10-08 16:09:45 +02:00
parent eaa7364f79
commit 89779e6fb9
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/browser.cpp
View File

@@ -343,7 +343,8 @@ void Browser::GetDirectory(std::string dir, std::string subdir)
# else
Mpd.GetDirectory(dir, list);
# endif // !WIN32
sort(list.begin(), list.end(), CaseInsensitiveSorting());
if (!isLocal()) // local directory is already sorted
sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (ItemList::iterator it = list.begin(); it != list.end(); ++it)
{
@@ -407,6 +408,7 @@ void Browser::GetLocalDirectory(ItemList &v, const std::string &directory, bool
}
}
size_t old_size = v.size();
while ((file = readdir(dir)))
{
if (!Config.local_browser_show_hidden_files && file->d_name[0] == '.')
@@ -420,7 +422,10 @@ void Browser::GetLocalDirectory(ItemList &v, const std::string &directory, bool
if (S_ISDIR(file_stat.st_mode))
{
if (recursively)
{
GetLocalDirectory(v, full_path, 1);
old_size = v.size();
}
else
{
new_item.type = itDirectory;
@@ -441,6 +446,7 @@ void Browser::GetLocalDirectory(ItemList &v, const std::string &directory, bool
}
}
closedir(dir);
std::sort(v.begin()+old_size, v.end(), CaseInsensitiveSorting());
}
void Browser::ClearDirectory(const std::string &path) const