MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-30 07:56:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[smartpl] Fix parsing of CRLF and "NOT (" (closes #1502)

Browse Source
This commit is contained in:
ejurgensen 2022-06-28 20:46:20 +02:00
parent b968055144
commit 0bde7acce8
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/parsers/smartpl_lexer.l
View File

@ -56,7 +56,7 @@ yyyymmdd [0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]
%% %%
[\n\t ]+ /* Ignore whitespace */ [\n\r\t ]+ /* Ignore whitespace */
\#.*\n /* Ignore comments */ \#.*\n /* Ignore comments */
artist { yylval->str = strdup(yytext); return SMARTPL_T_STRTAG; } artist { yylval->str = strdup(yytext); return SMARTPL_T_STRTAG; }

10
src/parsers/smartpl_parser.y
View File

@ -336,6 +336,8 @@ static void sql_append_recursive(struct smartpl_result *result, struct result_pa
break; break;
case SQL_APPEND_PARENS: case SQL_APPEND_PARENS:
assert(a->r == NULL); assert(a->r == NULL);
if (is_not ? op_not : op)
sql_append(result, part, "%s ", is_not ? op_not : op);
sql_append(result, part, "("); sql_append(result, part, "(");
sql_from_ast(result, part, a->l); sql_from_ast(result, part, a->l);
sql_append(result, part, ")"); sql_append(result, part, ")");
@ -426,7 +428,7 @@ static void sql_from_ast(struct smartpl_result *result, struct result_part *part
case SMARTPL_T_RANDOM: case SMARTPL_T_RANDOM:
sql_append_recursive(result, part, a, "random()", NULL, 0, SQL_APPEND_ORDER); break; sql_append_recursive(result, part, a, "random()", NULL, 0, SQL_APPEND_ORDER); break;
case SMARTPL_T_PARENS: case SMARTPL_T_PARENS:
sql_append_recursive(result, part, a, NULL, NULL, 0, SQL_APPEND_PARENS); break; sql_append_recursive(result, part, a, NULL, "NOT", is_not, SQL_APPEND_PARENS); break;
default: default:
snprintf(result->errmsg, sizeof(result->errmsg), "Parser produced unrecognized AST type %d", a->type); snprintf(result->errmsg, sizeof(result->errmsg), "Parser produced unrecognized AST type %d", a->type);
result->err = -1; result->err = -1;
@ -533,7 +535,9 @@ static int result_set(struct smartpl_result *result, char *title, struct ast *cr
%token <ival> SMARTPL_T_AFTER %token <ival> SMARTPL_T_AFTER
%token <ival> SMARTPL_T_AGO %token <ival> SMARTPL_T_AGO
%left SMARTPL_T_OR SMARTPL_T_AND %left SMARTPL_T_OR
%left SMARTPL_T_AND
%left SMARTPL_T_NOT
%type <ast> criteria %type <ast> criteria
%type <ast> predicate %type <ast> predicate
@ -565,13 +569,13 @@ playlist:
criteria: criteria SMARTPL_T_AND criteria { $$ = ast_new(SMARTPL_T_AND, $1, $3); } criteria: criteria SMARTPL_T_AND criteria { $$ = ast_new(SMARTPL_T_AND, $1, $3); }
| criteria SMARTPL_T_OR criteria { $$ = ast_new(SMARTPL_T_OR, $1, $3); } | criteria SMARTPL_T_OR criteria { $$ = ast_new(SMARTPL_T_OR, $1, $3); }
| '(' criteria ')' { $$ = ast_new(SMARTPL_T_PARENS, $2, NULL); } | '(' criteria ')' { $$ = ast_new(SMARTPL_T_PARENS, $2, NULL); }
| SMARTPL_T_NOT criteria { struct ast *a = $2; a->type |= INVERT_MASK; $$ = $2; }
| predicate | predicate
; ;
predicate: SMARTPL_T_STRTAG strbool SMARTPL_T_STRING { $$ = ast_new($2, ast_data(SMARTPL_T_STRTAG, $1), ast_data(SMARTPL_T_STRING, $3)); } predicate: SMARTPL_T_STRTAG strbool SMARTPL_T_STRING { $$ = ast_new($2, ast_data(SMARTPL_T_STRTAG, $1), ast_data(SMARTPL_T_STRING, $3)); }
| SMARTPL_T_INTTAG intbool SMARTPL_T_NUM { $$ = ast_new($2, ast_data(SMARTPL_T_INTTAG, $1), ast_int(SMARTPL_T_NUM, $3)); } | SMARTPL_T_INTTAG intbool SMARTPL_T_NUM { $$ = ast_new($2, ast_data(SMARTPL_T_INTTAG, $1), ast_int(SMARTPL_T_NUM, $3)); }
| SMARTPL_T_DATETAG datebool dateexpr { $$ = ast_new($2, ast_data(SMARTPL_T_DATETAG, $1), $3); } | SMARTPL_T_DATETAG datebool dateexpr { $$ = ast_new($2, ast_data(SMARTPL_T_DATETAG, $1), $3); }
| SMARTPL_T_NOT predicate { struct ast *a = $2; a->type |= INVERT_MASK; $$ = $2; }
| enumexpr | enumexpr
; ;