MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 23:25:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Recognize '@' as an operator identical to ':' (#841)

Browse Source 
* Recognize '@' as an operator identical to ':'

* Add comments

* Add shortened example query
This commit is contained in:
Will Saxon 2019-11-16 06:27:43 -05:00 committed by ejurgensen
parent f5e59c9b26
commit f3ebb574ba
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/DAAP2SQL.g
View File

@ -215,7 +215,7 @@ expr returns [ pANTLR3_STRING result, int valid ]
} }
/* No need to exclude empty artist and album, as forked-daapd makes sure there always exists an artist/album. */ /* No need to exclude empty artist and album, as forked-daapd makes sure there always exists an artist/album. */
if (neg_op && op == ':' if (neg_op && (op == ':' || op == '@')
&& (strcmp((char *)field, "daap.songalbumartist") == 0 && (strcmp((char *)field, "daap.songalbumartist") == 0
|| strcmp((char *)field, "daap.songartist") == 0 || strcmp((char *)field, "daap.songartist") == 0
|| strcmp((char *)field, "daap.songalbum") == 0)) || strcmp((char *)field, "daap.songalbum") == 0))
@ -226,7 +226,7 @@ expr returns [ pANTLR3_STRING result, int valid ]
} }
/* Need to check against NULL too */ /* Need to check against NULL too */
if (op == ':') if (op == ':' || op == '@')
$result->append8($result, "("); $result->append8($result, "(");
} }
@ -273,7 +273,9 @@ expr returns [ pANTLR3_STRING result, int valid ]
/* String field: escape string, check for '*' */ /* String field: escape string, check for '*' */
else else
{ {
if (op != ':') /* With Apple Music 1.0.1.37, we observed some ':' queries using '@' instead, resulting in 'Unknown operator' errors */
/* Ex: '/databases/1/containers?query=('com.apple.itunes.extended-media-kind@1', ...) */
if (op != ':' && op != '@')
{ {
DPRINTF(E_LOG, L_DAAP, "Operation '\%c' not valid for string values\n", op); DPRINTF(E_LOG, L_DAAP, "Operation '\%c' not valid for string values\n", op);
$valid = 0; $valid = 0;
@ -307,6 +309,7 @@ expr returns [ pANTLR3_STRING result, int valid ]
switch(op) switch(op)
{ {
case '@':
case ':': case ':':
if (neg_op) if (neg_op)
$result->append8($result, " <> "); $result->append8($result, " <> ");
@ -351,7 +354,7 @@ expr returns [ pANTLR3_STRING result, int valid ]
$result->append8($result, "'"); $result->append8($result, "'");
/* For empty string value, we need to check against NULL too */ /* For empty string value, we need to check against NULL too */
if ((*val == '\0') && (op == ':')) if ((*val == '\0') && (op == ':' || op == '@'))
{ {
if (neg_op) if (neg_op)
$result->append8($result, " AND "); $result->append8($result, " AND ");