summaryrefslogtreecommitdiffstats
path: root/apps/tagtree.c
diff options
context:
space:
mode:
authorMichael Hohmuth <sideral@rockbox.org>2011-07-31 16:26:31 +0000
committerMichael Hohmuth <sideral@rockbox.org>2011-07-31 16:26:31 +0000
commitaccea18ded5d2f1bb4db3118f9c7bfa994a2f77d (patch)
tree45bac9c9c5b715ff1bb4902e934b4fbb0d0ec88d /apps/tagtree.c
parent936494f9c5f6bc20e6b48a8b724822c2c5ef5bcc (diff)
downloadrockbox-accea18ded5d2f1bb4db3118f9c7bfa994a2f77d.tar.gz
rockbox-accea18ded5d2f1bb4db3118f9c7bfa994a2f77d.tar.bz2
rockbox-accea18ded5d2f1bb4db3118f9c7bfa994a2f77d.zip
FS#12132 patch 6, part 1: tagnavi.config: Add support for string
truncation in tagnavi %formats using the standard "%{width}.{truncation}s" format syntax. String truncation is especially useful when using part of a string tag, filename, or basename for sorting and %strip'ing. (Basename support is forthcoming in a subsequent commit.) 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. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30229 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tagtree.c')
-rw-r--r--apps/tagtree.c76
1 files changed, 48 insertions, 28 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 3df8d9db2b..a929fb6c33 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -1074,9 +1074,9 @@ static bool show_search_progress(bool init, int count)
static int format_str(struct tagcache_search *tcs, struct display_format *fmt,
char *buf, int buf_size)
{
- char fmtbuf[8];
+ char fmtbuf[20];
bool read_format = false;
- int fmtbuf_pos = 0;
+ unsigned fmtbuf_pos = 0;
int parpos = 0;
int buf_pos = 0;
int i;
@@ -1097,47 +1097,67 @@ static int format_str(struct tagcache_search *tcs, struct display_format *fmt,
if (read_format)
{
- fmtbuf[fmtbuf_pos++] = fmt->formatstr[i];
- if (fmtbuf_pos >= buf_size)
+ char formatchar = fmt->formatstr[i];
+
+ fmtbuf[fmtbuf_pos++] = formatchar;
+ if (fmtbuf_pos >= sizeof fmtbuf)
{
logf("format parse error");
return -2;
}
-
- if (fmt->formatstr[i] == 's')
+
+ if (formatchar == 's' || formatchar == 'd')
{
+ unsigned space_left = buf_size - buf_pos;
+ char tmpbuf[space_left + 1];
+ char *result;
+
fmtbuf[fmtbuf_pos] = '\0';
read_format = false;
- if (fmt->tags[parpos] == tcs->type)
- {
- snprintf(&buf[buf_pos], buf_size - buf_pos, fmtbuf, tcs->result);
- }
- else
+
+ switch (formatchar)
{
- /* Need to fetch the tag data. */
- if (!tagcache_retrieve(tcs, tcs->idx_id, fmt->tags[parpos],
- &buf[buf_pos], buf_size - buf_pos))
+ case 's':
+ if (fmt->tags[parpos] == tcs->type)
{
- logf("retrieve failed");
- return -3;
+ result = tcs->result;
+ }
+ else
+ {
+ /* Need to fetch the tag data. */
+ int tag = fmt->tags[parpos];
+
+ if (!tagcache_retrieve(tcs, tcs->idx_id,
+ (tag == tag_virt_basename ?
+ tag_filename : tag),
+ tmpbuf, space_left))
+ {
+ logf("retrieve failed");
+ return -3;
+ }
+
+ if (tag == tag_virt_basename
+ && (result = strrchr(tmpbuf, '/')) != NULL)
+ {
+ result++;
+ }
+ else
+ result = tmpbuf;
}
+ snprintf(&buf[buf_pos], space_left, fmtbuf, result);
+ break;
+
+ case 'd':
+ snprintf(&buf[buf_pos], space_left, fmtbuf,
+ tagcache_get_numeric(tcs, fmt->tags[parpos]));
}
+
buf_pos += strlen(&buf[buf_pos]);
parpos++;
}
- else if (fmt->formatstr[i] == 'd')
- {
- fmtbuf[fmtbuf_pos] = '\0';
- read_format = false;
- snprintf(&buf[buf_pos], buf_size - buf_pos, fmtbuf,
- tagcache_get_numeric(tcs, fmt->tags[parpos]));
- buf_pos += strlen(&buf[buf_pos]);
- parpos++;
- }
- continue;
}
-
- buf[buf_pos++] = fmt->formatstr[i];
+ else
+ buf[buf_pos++] = fmt->formatstr[i];
if (buf_pos - 1 >= buf_size)
{