nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tagtree: Use strnatcasecmp() for the database browser too. 

Even though you can insert leading zeros that makes ascii sort work for
numbers, sometimes the leading zeros don't suffice. In order to always
sort numerically strnatcasecmp() is needed.

With the default tagnavi.config this affects albums with discnum > 9
or tracnums > 99. This FS#12888.

Change-Id: Ie265c86eaf6dd07b6beda9e5eef25eb81eef8fd4
This commit is contained in:
Thomas Martitz 2014-01-15 23:18:35 +01:00
parent 4f5b13077e
commit 84c7d6133b
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/tagtree.c
View File

@ -53,6 +53,7 @@
#include "storage.h"
#include "dir.h"
#include "playback.h"
#include "strnatcmp.h"
#include "panic.h"
#define str_or_empty(x) (x ? x : "(NULL)")
@ -791,6 +792,17 @@ static int compare(const void *p1, const void *p2)
return strncasecmp(e1->name, e2->name, MAX_PATH);
}
static int nat_compare(const void *p1, const void *p2)
{
struct tagentry *e1 = (struct tagentry *)p1;
struct tagentry *e2 = (struct tagentry *)p2;
if (sort_inverse)
return strnatcasecmp(e2->name, e1->name);
return strnatcasecmp(e1->name, e2->name);
}
static void tagtree_buffer_event(void *data)
{
struct tagcache_search tcs;
@ -1530,7 +1542,8 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
struct tagentry *entries = get_entries(c);
qsort(&entries[special_entry_count],
current_entry_count - special_entry_count,
sizeof(struct tagentry), compare);
sizeof(struct tagentry),
global_settings.interpret_numbers ? nat_compare : compare);
}
if (!init)