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

* Rewrite filter parsing code. Might help with Olive Symphony or other Twonky-based clients that send odd filter requests.

Browse Source
This commit is contained in:
Justin Maggard 2009-05-01 00:45:23 +00:00
parent 76ab570ed1
commit f35e0831d1
1 changed files with 99 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
upnpsoap.c
View File

@ -232,51 +232,107 @@ GetCurrentConnectionInfo(struct upnphttp * h, const char * action)
static u_int32_t static u_int32_t
set_filter_flags(char * filter) set_filter_flags(char * filter)
{ {
char *item, *saveptr = NULL;
u_int32_t flags = 0; u_int32_t flags = 0;
if( !filter || (strlen(filter) <= 1) ) item = strtok_r(filter, ",", &saveptr);
return 0xFFFFFFFF; while( item != NULL )
if( strstr(filter, "@childCount") ) {
flags |= FILTER_CHILDCOUNT; if( strcmp(item, "@childCount") == 0 )
if( strstr(filter, "dc:creator") ) {
flags |= FILTER_DC_CREATOR; flags |= FILTER_CHILDCOUNT;
if( strstr(filter, "dc:date") ) }
flags |= FILTER_DC_DATE; else if( strcmp(item, "dc:creator") == 0 )
if( strstr(filter, "dc:description") ) {
flags |= FILTER_DC_DESCRIPTION; flags |= FILTER_DC_CREATOR;
if( strstr(filter, "dlna") ) }
flags |= FILTER_DLNA_NAMESPACE; else if( strcmp(item, "dc:date") == 0 )
if( strstr(filter, "@refID") ) {
flags |= FILTER_REFID; flags |= FILTER_DC_DATE;
if( strstr(filter, "res") ) }
flags |= FILTER_RES; else if( strcmp(item, "dc:description") == 0 )
if( strstr(filter, "res@bitrate") ) {
flags |= FILTER_RES_BITRATE; flags |= FILTER_DC_DESCRIPTION;
if( strstr(filter, "res@duration") ) }
flags |= FILTER_RES_DURATION; else if( strcmp(item, "dlna") == 0 )
if( strstr(filter, "res@nrAudioChannels") ) {
flags |= FILTER_RES_NRAUDIOCHANNELS; flags |= FILTER_DLNA_NAMESPACE;
if( strstr(filter, "res@resolution") ) }
flags |= FILTER_RES_RESOLUTION; else if( strcmp(item, "@refID") == 0 )
if( strstr(filter, "res@sampleFrequency") ) {
flags |= FILTER_RES_SAMPLEFREQUENCY; flags |= FILTER_REFID;
if( strstr(filter, "res@size") ) }
flags |= FILTER_RES_SIZE; else if( strcmp(item, "upnp:album") == 0 )
if( strstr(filter, "upnp:album") ) {
flags |= FILTER_UPNP_ALBUM; flags |= FILTER_UPNP_ALBUM;
if( strstr(filter, "upnp:albumArtURI") ) }
flags |= FILTER_UPNP_ALBUMARTURI; else if( strcmp(item, "upnp:albumArtURI") == 0 )
if( strstr(filter, "upnp:albumArtURI@dlna:profileID") ) {
flags |= FILTER_UPNP_ALBUMARTURI_DLNA_PROFILEID; flags |= FILTER_UPNP_ALBUMARTURI;
if( strstr(filter, "upnp:artist") ) }
flags |= FILTER_UPNP_ARTIST; else if( strcmp(item, "upnp:albumArtURI@dlna:profileID") == 0 )
if( strstr(filter, "upnp:genre") ) {
flags |= FILTER_UPNP_GENRE; flags |= FILTER_UPNP_ALBUMARTURI_DLNA_PROFILEID;
if( strstr(filter, "upnp:originalTrackNumber") ) }
flags |= FILTER_UPNP_ORIGINALTRACKNUMBER; else if( strcmp(item, "upnp:artist") == 0 )
if( strstr(filter, "upnp:searchClass") ) {
flags |= FILTER_UPNP_SEARCHCLASS; flags |= FILTER_UPNP_ARTIST;
}
else if( strcmp(item, "upnp:genre") == 0 )
{
flags |= FILTER_UPNP_GENRE;
}
else if( strcmp(item, "upnp:originalTrackNumber") == 0 )
{
flags |= FILTER_UPNP_ORIGINALTRACKNUMBER;
}
else if( strcmp(item, "upnp:searchClass") == 0 )
{
flags |= FILTER_UPNP_SEARCHCLASS;
}
else if( strcmp(item, "res") == 0 )
{
flags |= FILTER_RES;
}
else if( (strcmp(item, "res@bitrate") == 0) ||
((strcmp(item, "bitrate") == 0) && (flags & FILTER_RES)) )
{
flags |= FILTER_RES;
flags |= FILTER_RES_BITRATE;
}
else if( (strcmp(item, "res@duration") == 0) ||
((strcmp(item, "duration") == 0) && (flags & FILTER_RES)) )
{
flags |= FILTER_RES;
flags |= FILTER_RES_DURATION;
}
else if( (strcmp(item, "res@nrAudioChannels") == 0) ||
((strcmp(item, "nrAudioChannels") == 0) && (flags & FILTER_RES)) )
{
flags |= FILTER_RES;
flags |= FILTER_RES_NRAUDIOCHANNELS;
}
else if( (strcmp(item, "res@resolution") == 0) ||
((strcmp(item, "resolution") == 0) && (flags & FILTER_RES)) )
{
flags |= FILTER_RES;
flags |= FILTER_RES_RESOLUTION;
}
else if( (strcmp(item, "res@sampleFrequency") == 0) ||
((strcmp(item, "sampleFrequency") == 0) && (flags & FILTER_RES)) )
{
flags |= FILTER_RES;
flags |= FILTER_RES_SAMPLEFREQUENCY;
}
else if( (strcmp(item, "res@size") == 0) ||
((strcmp(item, "size") == 0) && (flags & FILTER_RES)) )
{
flags |= FILTER_RES;
flags |= FILTER_RES_SIZE;
}
item = strtok_r(NULL, ",", &saveptr);
}
return flags; return flags;
} }