storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upnpsoap: Support searches specifying @parentid = 0.

Browse Source
This commit is contained in:
Justin Maggard 2014-02-04 12:03:57 -08:00
parent a3252bd2dd
commit 65fb740414
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
upnpsoap.c
View File

@ -1312,7 +1312,7 @@ charcat(struct string_s *str, char c)
} }
static inline char * static inline char *
parse_search_criteria(const char *str) parse_search_criteria(const char *str, char *sep)
{ {
struct string_s criteria; struct string_s criteria;
int len; int len;
@ -1448,6 +1448,7 @@ parse_search_criteria(const char *str)
{ {
strcatf(&criteria, "PARENT_ID"); strcatf(&criteria, "PARENT_ID");
s += 9; s += 9;
strcpy(sep, "*");
continue; continue;
} }
else else
@ -1585,7 +1586,7 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
int totalMatches; int totalMatches;
int ret; int ret;
char *ContainerID, *Filter, *SearchCriteria, *SortCriteria; char *ContainerID, *Filter, *SearchCriteria, *SortCriteria;
char *orderBy = NULL, *where = NULL; char *orderBy = NULL, *where = NULL, sep[] = "$*";
char groupBy[] = "group by DETAIL_ID"; char groupBy[] = "group by DETAIL_ID";
struct NameValueParserData data; struct NameValueParserData data;
int RequestedCount = 0; int RequestedCount = 0;
@ -1659,23 +1660,22 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
SearchCriteria, Filter, SortCriteria); SearchCriteria, Filter, SortCriteria);
if( strcmp(ContainerID, "0") == 0 ) if( strcmp(ContainerID, "0") == 0 )
*ContainerID = '*'; ContainerID[0] = '*';
else if( strcmp(ContainerID, MUSIC_ALL_ID) == 0 )
if( strcmp(ContainerID, MUSIC_ALL_ID) == 0 ||
GETFLAG(DLNA_STRICT_MASK) )
groupBy[0] = '\0'; groupBy[0] = '\0';
if( GETFLAG(DLNA_STRICT_MASK) ) where = parse_search_criteria(SearchCriteria, sep);
groupBy[0] = '\0';
where = parse_search_criteria(SearchCriteria);
DPRINTF(E_DEBUG, L_HTTP, "Translated SearchCriteria: %s\n", where); DPRINTF(E_DEBUG, L_HTTP, "Translated SearchCriteria: %s\n", where);
totalMatches = sql_get_int_field(db, "SELECT (select count(distinct DETAIL_ID)" totalMatches = sql_get_int_field(db, "SELECT (select count(distinct DETAIL_ID)"
" from OBJECTS o left join DETAILS d on (o.DETAIL_ID = d.ID)" " from OBJECTS o left join DETAILS d on (o.DETAIL_ID = d.ID)"
" where (OBJECT_ID glob '%q$*') and (%s))" " where (OBJECT_ID glob '%q%s') and (%s))"
" + " " + "
"(select count(*) from OBJECTS o left join DETAILS d on (o.DETAIL_ID = d.ID)" "(select count(*) from OBJECTS o left join DETAILS d on (o.DETAIL_ID = d.ID)"
" where (OBJECT_ID = '%q') and (%s))", " where (OBJECT_ID = '%q') and (%s))",
ContainerID, where, ContainerID, where); ContainerID, sep, where, ContainerID, where);
if( totalMatches < 0 ) if( totalMatches < 0 )
{ {
/* Must be invalid SQL, so most likely bad or unhandled search criteria. */ /* Must be invalid SQL, so most likely bad or unhandled search criteria. */
@ -1707,10 +1707,10 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
sql = sqlite3_mprintf( SELECT_COLUMNS sql = sqlite3_mprintf( SELECT_COLUMNS
"from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" "from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"
" where OBJECT_ID glob '%q$*' and (%s) %s " " where OBJECT_ID glob '%q%s' and (%s) %s "
"%z %s" "%z %s"
" limit %d, %d", " limit %d, %d",
ContainerID, where, groupBy, ContainerID, sep, where, groupBy,
(*ContainerID == '*') ? NULL : (*ContainerID == '*') ? NULL :
sqlite3_mprintf("UNION ALL " SELECT_COLUMNS sqlite3_mprintf("UNION ALL " SELECT_COLUMNS
"from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" "from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)"