Ticket #5736: patch-libmythupnp-filter.diff

upnpcds.h

@@ -99 +99 @@
         }
 
         void    Add         ( CDSObject *pObject );
-        QString GetResultXML();
+        QString GetResultXML(FilterMap &filter);
 };
 
 //////////////////////////////////////////////////////////////////////////////

upnpcdsobjects.cpp

@@ -150 +150 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-QString CDSObject::toXml()// FilterMap &filter )
+QString CDSObject::toXml( FilterMap &filter )
 {
     QString     sXML;
     Q3TextStream os( sXML, QIODevice::WriteOnly );
     
     os.setEncoding( Q3TextStream::UnicodeUTF8 );
 
-    toXml( os ); //, filter );
+    toXml( os , filter );
 
     return( sXML );
 }
@@ -166 +166 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-void CDSObject::toXml( Q3TextStream &os ) //, FilterMap &filter )
+void CDSObject::toXml( Q3TextStream &os , FilterMap &filter )
 {
     QString sEndTag = "";
-    bool    bFilter = false;
+    bool    bFilter = true;
 
-    //  -=>TODO: Need to add Filter Support
+    if (filter.find( "*" ) != filter.end())
+        bFilter = false;
 
-//    if (filter.find( "*" ) != filter.end())
-//        bFilter = false;
-
     switch( m_eType )
     {   
         case OT_Container:
@@ -220 +218 @@
             else
                 sName = pProp->m_sName;
 
-            if (pProp->m_bRequired || !bFilter ) //|| ( filter.find( sName ) != filter.end())
+            if (pProp->m_bRequired || !bFilter || ( filter.find( sName ) != filter.end()))
             {
                 os << "<"  << sName << ">";
                 os << pProp->m_sValue;
@@ -258 +256 @@
                   pObject != NULL; 
                   pObject = m_children.next() )
     {
-        pObject->toXml( os ); //, filter );
+        pObject->toXml( os , filter );
     }
 
     // ----------------------------------------------------------------------

upnpcds.cpp

@@ -33 +33 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-QString UPnpCDSExtensionResults::GetResultXML()
+QString UPnpCDSExtensionResults::GetResultXML(FilterMap &filter)
 {
     QString sXML;
 
@@ -41 +41 @@
                      pObject != NULL;
                      pObject  = m_List.next() )
     {
-        sXML += pObject->toXml();    
+        sXML += pObject->toXml(filter);    
     }
 
     return( sXML );
@@ -222 +222 @@
     VERBOSE(VB_UPNP, QString("UPnpCDS::HandleBrowse ObjectID=%1, ContainerId=%2")
                              .arg(request.m_sObjectId)
                              .arg(request.m_sContainerID));
+                             
+    FilterMap filter = (FilterMap)request.m_sFilter.split(",");
 
     if (request.m_sObjectId == "0")
     {
@@ -244 +246 @@
 
                 m_root.SetChildCount( m_extensions.count() );
 
-                sResultXML      = m_root.toXml();
+                sResultXML      = m_root.toXml(filter);
 
                 break;
             }
@@ -285 +287 @@
                     {
                         if (pResult->m_eErrorCode == UPnPResult_Success)
                         {
-                            sResultXML  += pResult->GetResultXML();
+                            sResultXML  += pResult->GetResultXML(filter);
                             nNumberReturned ++;
                         }
 
@@ -326 +328 @@
                 nNumberReturned = pResult->m_List.count();
                 nTotalMatches   = pResult->m_nTotalMatches;
                 nUpdateID       = pResult->m_nUpdateID;
-                sResultXML      = pResult->GetResultXML();
+                sResultXML      = pResult->GetResultXML(filter);
             }
 
             delete pResult;
@@ -340 +342 @@
     if (eErrorCode == UPnPResult_Success)
     {
         NameValueList list;
-
+        VERBOSE(VB_UPNP, sResultXML);
         QString sResults = DIDL_LITE_BEGIN;
         sResults += sResultXML;
         sResults += DIDL_LITE_END;
@@ -444 +446 @@
 
 
     UPnpCDSExtension    *pExtension = m_extensions.first();
+    
+    FilterMap filter =  (FilterMap) request.m_sFilter.split(",");
 
     //bool bSearchDone = false;
 
@@ -465 +469 @@
             nNumberReturned = pResult->m_List.count();
             nTotalMatches   = pResult->m_nTotalMatches;
             nUpdateID       = pResult->m_nUpdateID;
-            sResultXML      = pResult->GetResultXML();
+            sResultXML      = pResult->GetResultXML(filter);
             //bSearchDone = true;
         }
 

upnpcdsobjects.h

@@ -120 +120 @@
 
 typedef Q3PtrList < ContainerClass > Classes;
 
+typedef QStringList FilterMap;
+
 //////////////////////////////////////////////////////////////////////////////
 
 class CDSObject
@@ -173 +175 @@
         void          SetPropValue( QString sName, QString sValue );
         QString       GetPropValue( QString sName );
 
-        QString       toXml      ();
-        void          toXml      ( Q3TextStream &os );
+        QString       toXml      ( FilterMap &filter);
+        void          toXml      ( Q3TextStream &os, FilterMap &filter );
 
         long          GetChildCount();
         void          SetChildCount( long nCount );