Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tagtree/tagcache add new clause operators begins/ends _oneof

Browse source 
new operators @^, @$
begins_oneof and ends_oneof

albumartist @^ "L|The L"
Led Zeppelin, The look

albumartist @$ "girls|Boys"
spice girls, beasty boys

Change-Id: I26ce3d8155d970a55e003f74e2f9478db76204f1
This commit is contained in:
William Wilgus 2022-03-19 02:15:35 -04:00
parent 0f2d623216
commit ddbca125a6
3 changed files with 31 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/tagcache.c
View file

@ -56,7 +56,7 @@
*/
/*#define LOGF_ENABLE*/
/*#define LOGF_CLAUSES define to enable logf clause matching (LOGF_ENABLE req'd) */
/*#define LOGF_CLAUSES define to enable logf clause matching (LOGF_ENABLE req'd) */
#include <stdio.h>
#include <stdlib.h>
@ -162,6 +162,8 @@ static const char *tag_type_str[] = {
[clause_ends_with] = "clause_ends_with",
[clause_not_ends_with] = "clause_not_ends_with",
[clause_oneof] = "clause_oneof",
[clause_begins_oneof] = "clause_begins_oneof",
[clause_ends_oneof] = "clause_ends_oneof",
[clause_logical_or] = "clause_logical_or"
};
#define logf_clauses logf
@ -1052,6 +1054,25 @@ inline static bool str_oneof(const char *str, const char *list)
return false;
}
inline static bool str_begins_ends_oneof(const char *str, const char *list, bool begins)
{
logf_clauses("%s %s (%s) %s", str, __func__, begins ? "begins" : "ends", list);
const char *sep;
int l, p, len = strlen(str);
while (*list)
{
sep = strchr(list, '|');
l = sep ? (intptr_t)sep - (intptr_t)list : (int)strlen(list);
p = begins ? 0 : len - l;
if (l <= len && !strncasecmp(&str[p], list, l))
return true;
list += sep ? l + 1 : l;
}
return false;
}
static bool check_against_clause(long numeric, const char *str,
const struct tagcache_search_clause *clause)
{
@ -1105,6 +1126,10 @@ static bool check_against_clause(long numeric, const char *str,
return !str_ends_with(str, clause->str);
case clause_oneof:
return str_oneof(str, clause->str);
case clause_begins_oneof:
return str_begins_ends_oneof(str, clause->str, true);
case clause_ends_oneof:
return str_begins_ends_oneof(str, clause->str, false);
default:
logf("Incorrect tag: %d", clause->type);
}

4
apps/tagcache.h
View file

@ -127,7 +127,9 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
enum clause { clause_none, clause_is, clause_is_not, clause_gt, clause_gteq,
clause_lt, clause_lteq, clause_contains, clause_not_contains,
clause_begins_with, clause_not_begins_with, clause_ends_with,
clause_not_ends_with, clause_oneof, clause_logical_or };
clause_not_ends_with, clause_oneof,
clause_begins_oneof, clause_ends_oneof,
clause_logical_or };
struct tagcache_stat {
bool initialized; /* Is tagcache currently busy? */

2
apps/tagtree.c
View file

@ -418,6 +418,8 @@ static int get_clause(int *condition)
CLAUSE('!', '^', clause_not_begins_with),
CLAUSE('$', ' ', clause_ends_with),
CLAUSE('!', '$', clause_not_ends_with),
CLAUSE('@', '^', clause_begins_oneof),
CLAUSE('@', '$', clause_ends_oneof),
CLAUSE('@', ' ', clause_oneof)
};