MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #509 from chme/smartplstartswith 

[smartpl] Add "starts with" to smart playlist language
This commit is contained in:
ejurgensen 2018-04-11 19:04:30 +02:00 committed by GitHub
parent f33175a4b2 b3dbce7109
commit fe05f80822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README_SMARTPL.md
View File

@ -44,13 +44,14 @@ Where valid field-names (with their types) are:
* time_played (date) * time_played (date)
Valid operators include: Valid operators include:
* is, includes (string) * is, includes, starts with (string)
* >, <, <=, >=, = (int) * >, <, <=, >=, = (int)
* after, before (date) * after, before (date)
* is (enumeration) * is (enumeration)
The "is" operator must exactly match the field value, while the "includes" operator matches a substring. The "is" operator must exactly match the field value, while the "includes" operator matches a substring.
Both matches are case-insensitive. The "starts with" operator matches, if the value starts with the given prefix.
All three matches are case-insensitive.
Valid operands include: Valid operands include:
* "string value" (string) * "string value" (string)

5
src/SMARTPL.g
View File

@ -38,7 +38,7 @@ nexpr : NOT^ crit
; ;
crit : LPAR expression RPAR -> expression crit : LPAR expression RPAR -> expression
| STRTAG (INCLUDES|IS) STR | STRTAG (INCLUDES|IS|STARTSWITH) STR
| INTTAG INTBOOL INT | INTTAG INTBOOL INT
| DATETAG (AFTER|BEFORE) dateval | DATETAG (AFTER|BEFORE) dateval
| ENUMTAG IS ENUMVAL | ENUMTAG IS ENUMVAL
@ -85,6 +85,9 @@ INCLUDES : 'includes'
IS : 'is' IS : 'is'
; ;
STARTSWITH : 'starts with'
;
INTBOOL : (GREATER|GREATEREQUAL|LESS|LESSEQUAL|EQUAL) INTBOOL : (GREATER|GREATEREQUAL|LESS|LESSEQUAL|EQUAL)
; ;

14
src/SMARTPL2SQL.g
View File

@ -114,6 +114,20 @@ expression returns [ pANTLR3_STRING result ]
$result->append8($result, sqlite3_mprintf("\%q", (const char *)val)); $result->append8($result, sqlite3_mprintf("\%q", (const char *)val));
$result->append8($result, "'"); $result->append8($result, "'");
} }
| STRTAG STARTSWITH STR
{
pANTLR3_UINT8 val;
val = $STR.text->toUTF8($STR.text)->chars;
val++;
val[strlen((const char *)val) - 1] = '\0';
$result = $STR.text->factory->newRaw($STR.text->factory);
$result->append8($result, "f.");
$result->appendS($result, $STRTAG.text->toUTF8($STRTAG.text));
$result->append8($result, " LIKE '");
$result->append8($result, sqlite3_mprintf("\%q", (const char *)val));
$result->append8($result, "\%'");
}
| INTTAG INTBOOL INT | INTTAG INTBOOL INT
{ {
$result = $INTTAG.text->factory->newRaw($INTTAG.text->factory); $result = $INTTAG.text->factory->newRaw($INTTAG.text->factory);