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

upnpsoap: factor out ObjecID translation into a separate function.

Browse Source
This commit is contained in:
Justin Maggard 2014-06-26 18:54:45 -07:00
parent a01ffa1787
commit c226e615ad
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
upnpsoap.c
View File

@ -1094,6 +1094,29 @@ callback(void *args, int argc, char **argv, char **azColName)
return 0; return 0;
} }
static int
translate_object_id(char **id, struct Response *args)
{
if (args->flags & FLAG_MS_PFS)
{
if( !strchr(*id, '$') && (strcmp(*id, "0") != 0) )
{
char *s;
s = sql_get_text_field(db, "SELECT OBJECT_ID from OBJECTS"
" where OBJECT_ID in "
"('"MUSIC_ID"$%q', '"VIDEO_ID"$%q', '"IMAGE_ID"$%q')",
*id, *id, *id);
if (s)
{
*id = s;
args->flags |= FLAG_FREE_OBJECT_ID;
}
}
}
return 0;
}
static void static void
BrowseContentDirectory(struct upnphttp * h, const char * action) BrowseContentDirectory(struct upnphttp * h, const char * action)
{ {
@ -1169,21 +1192,7 @@ BrowseContentDirectory(struct upnphttp * h, const char * action)
args.client = h->req_client ? h->req_client->type->type : 0; args.client = h->req_client ? h->req_client->type->type : 0;
args.flags = h->req_client ? h->req_client->type->flags : 0; args.flags = h->req_client ? h->req_client->type->flags : 0;
args.str = &str; args.str = &str;
if( args.flags & FLAG_MS_PFS ) translate_object_id(&ObjectID, &args);
{
if( !strchr(ObjectID, '$') && (strcmp(ObjectID, "0") != 0) )
{
ptr = sql_get_text_field(db, "SELECT OBJECT_ID from OBJECTS"
" where OBJECT_ID in "
"('"MUSIC_ID"$%q', '"VIDEO_ID"$%q', '"IMAGE_ID"$%q')",
ObjectID, ObjectID, ObjectID);
if( ptr )
{
ObjectID = ptr;
args.flags |= FLAG_FREE_OBJECT_ID;
}
}
}
DPRINTF(E_DEBUG, L_HTTP, "Browsing ContentDirectory:\n" DPRINTF(E_DEBUG, L_HTTP, "Browsing ContentDirectory:\n"
" * ObjectID: %s\n" " * ObjectID: %s\n"
" * Count: %d\n" " * Count: %d\n"
@ -1641,21 +1650,7 @@ SearchContentDirectory(struct upnphttp * h, const char * action)
args.client = h->req_client ? h->req_client->type->type : 0; args.client = h->req_client ? h->req_client->type->type : 0;
args.flags = h->req_client ? h->req_client->type->flags : 0; args.flags = h->req_client ? h->req_client->type->flags : 0;
args.str = &str; args.str = &str;
if( args.flags & FLAG_MS_PFS ) translate_object_id(&ContainerID, &args);
{
if( !strchr(ContainerID, '$') && (strcmp(ContainerID, "0") != 0) )
{
ptr = sql_get_text_field(db, "SELECT OBJECT_ID from OBJECTS"
" where OBJECT_ID in "
"('"MUSIC_ID"$%q', '"VIDEO_ID"$%q', '"IMAGE_ID"$%q')",
ContainerID, ContainerID, ContainerID);
if( ptr )
{
ContainerID = ptr;
args.flags |= FLAG_FREE_OBJECT_ID;
}
}
}
DPRINTF(E_DEBUG, L_HTTP, "Searching ContentDirectory:\n" DPRINTF(E_DEBUG, L_HTTP, "Searching ContentDirectory:\n"
" * ObjectID: %s\n" " * ObjectID: %s\n"
" * Count: %d\n" " * Count: %d\n"