Rockbox

This is the bug/patch tracker for Rockbox. Click here for more information.

Quick links: Bugs · Patches · Rockbox frontpage

Tasklist

FS#12132 - tagnavi: Support "basename" in formats and conditions; replace <Untagged> in track views

Attached to Project: Rockbox
Opened by sideral (sideral) - Sunday, 29 May 2011, 00:20 GMT+2
Last edited by sideral (sideral) - Thursday, 04 August 2011, 14:38 GMT+2
Task Type Patches
Category Database
Status Closed
Assigned To No-one
Player Type All players
Severity Low
Priority Normal
Reported Version Daily build (which?)
Due in Version Undecided
Due Date Undecided
Percent Complete 100%
Private No

Details

This patch set (in patch 0006) adds support to the tagnavi.config syntax for using a file's basename (path name without directories) in display formats and conditions.

Patch 0007 changes the database's default title format to display a file's basename rather than "<Untagged>" if no title tag is present in the file.

In passing, patch 0001 fixes two bugs introduced with r26192 ( FS#10976  - make the <Untagged> string translatable):

* The translation was done too early: before the tagnavi format clauses were checked. This prevented comparisons against "<Untagged>" when a non-English translation was active.
* The code overwrote the buffer containing the constant string "<Untagged>" with the translation. This is neither safe nor necessary: The result pointer simply can be swapped with a pointer to the translation.

Patches 0002–0005 contain various minor DB cleanups the other patches rely on. (I'll commit the fixes and cleanups separately from the basename feature after some testing.)

Patches relative to r29928.
   0001-Fix-two-regressions-introduced-with-r26192-F... (1.6 KiB) 
 b/apps/tagtree.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

   0002-add_uniqbuf-Fix-confusing-indentation-in-if-... (0.7 KiB) 
 b/apps/tagcache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

   0003-Rename-read_numeric_tag-to-find_tag-as-it-is... (4.2 KiB) 
 b/apps/tagcache.c |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

   0004-Added-a-comment-for-the-tagcache_search.type... (0.8 KiB) 
 b/apps/tagcache.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

   0005-check_clauses-Optimizations.patch (2.3 KiB) 
 b/apps/tagcache.c |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

   0006-tagnavi.config-Add-support-for-basename-in-f... (4.8 KiB) 
 b/apps/tagcache.c |   20 ++++++++++++++++++--
 b/apps/tagcache.h |    4 ++--
 b/apps/tagtree.c  |   14 +++++++++++++-
 3 files changed, 33 insertions(+), 5 deletions(-)

   0007-Add-a-new-default-format-for-untagged-tracks... (0.7 KiB) 
 b/apps/tagnavi.config |    1 +
 1 file changed, 1 insertion(+)

This task depends upon

Closed by  sideral (sideral)
Thursday, 04 August 2011, 14:38 GMT+2
Reason for closing:  Accepted
Comment by Michael Sevakis (MikeS) - Wednesday, 01 June 2011, 04:00 GMT+2
All your basename are belong to us.

I appreciate you taking on the basname/untagged issue (well, one of my peeves as it were).
Comment by sideral (sideral) - Wednesday, 01 June 2011, 10:52 GMT+2
Committed the untagged-translation fix (patch 0001) as r29941.
Comment by sideral (sideral) - Monday, 06 June 2011, 18:24 GMT+2
Updated patch 0006: Added support for "%{width}.{truncation}s" in tagnavi %formats. String truncation is especially useful when using part of a string tag, filename, or basename for sorting and %strip'ing.

Also renovated the format_str() code a bit (improved structuring, removed code duplication) and increased the maximum length of a printf conversion specification to 20 characters.

Rebased patch to r29975 (required because of r29937 /  FS#12136 ).
   0006-FS-12132-patch-6-tagnavi.config-Add-support-... (7.8 KiB) 
 b/apps/tagcache.c |   20 ++++++++++++--
 b/apps/tagcache.h |    4 +-
 b/apps/tagtree.c  |   77 ++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 69 insertions(+), 32 deletions(-)

Comment by sideral (sideral) - Tuesday, 07 June 2011, 01:04 GMT+2
Committed patches 0002–0005 as r29978–r29981.
Comment by sideral (sideral) - Tuesday, 07 June 2011, 15:33 GMT+2
Updated patch 0007 to also provides a sane default format for Database->Tracks.
   0007-FS-12132-patch-7-Add-a-new-default-format-fo... (1.7 KiB) 
 b/apps/tagnavi.config |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comment by sideral (sideral) - Monday, 01 August 2011, 14:22 GMT+2
Committed patches 6 and 7 as r30229–r30231.

The binsize increase struck me as a bit large, so I went and optimized it a bit – see attached patch. Also reduces stack usage quite a bit.
   0008-FS-12132-patch-8-retrieve_entries-Decrease-b... (5.2 KiB) 
 b/apps/tagtree.c |   61 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

Comment by sideral (sideral) - Thursday, 04 August 2011, 14:37 GMT+2
Committed patch 8 as r30248. Sadly, it didn't yield the binsize decrease I'd envisioned across the board, but I think the stack-usage decrease was worth it, as was the buffer-bounds check fix.

Loading...