comparison rdf/PluginRDFDescription.cpp @ 1845:6f626cfdba51

Pull out Provider struct

 PluginRDFDescription::getPluginMaker() const
 {
     return m_pluginMaker;
 }
 
-QString
-PluginRDFDescription::getPluginInfoURL() const
-{
-    return m_pluginInfoURL;
-}
-
-QString
-PluginRDFDescription::getPluginDownloadURL() const
-{
-    return m_pluginDownloadURL;
-}
-
-std::set<PluginRDFDescription::DownloadType>
-PluginRDFDescription::getPluginDownloadTypes() const
-{
-    return m_pluginDownloadTypes;
-}
-
-std::map<QString, PluginRDFDescription::Pack>
-PluginRDFDescription::getPluginFoundInPacks() const
-{
-    return m_pluginFoundInPacks;
+Provider
+PluginRDFDescription::getPluginProvider() const
+{
+    return m_provider;
 }
 
 QStringList
 PluginRDFDescription::getOutputIds() const
 {

 
     n = index->complete
         (Triple(plugin, index->expand("foaf:page"), Node()));
 
     if (n.type == Node::URI && n.value != "") {
-        m_pluginInfoURL = n.value;
+        m_provider.infoUrl = n.value;
     }
 
     // There may be more than one library node claiming this
     // plugin. That's because older RDF descriptions tend to use a
     // library node URI derived from the description's own URI, so it

         
         n = index->complete
             (Triple(libn, index->expand("foaf:page"), Node()));
 
         if (n.type == Node::URI && n.value != "") {
-            m_pluginInfoURL = n.value;
+            m_provider.infoUrl = n.value;
         }
 
         n = index->complete
             (Triple(libn, index->expand("doap:download-page"), Node()));
 
         if (n.type == Node::URI && n.value != "") {
-            m_pluginDownloadURL = n.value;
+            m_provider.downloadUrl = n.value;
 
             n = index->complete
                 (Triple(libn, index->expand("vamp:has_source"), Node()));
             if (n.type == Node::Literal && n.value == "true") {
-                m_pluginDownloadTypes.insert(DownloadSourceCode);
+                m_provider.downloadTypes.insert(Provider::DownloadSourceCode);
             }
 
             Nodes binaries = index->match
                 (Triple(libn, index->expand("vamp:has_binary"), Node()))
                 .objects();
 
             for (Node bin: binaries) {
                 if (bin.type != Node::Literal) continue;
                 if (bin.value == "linux32") {
-                    m_pluginDownloadTypes.insert(DownloadLinux32);
+                    m_provider.downloadTypes.insert(Provider::DownloadLinux32);
                 } else if (bin.value == "linux64") {
-                    m_pluginDownloadTypes.insert(DownloadLinux64);
+                    m_provider.downloadTypes.insert(Provider::DownloadLinux64);
                 } else if (bin.value == "win32") {
-                    m_pluginDownloadTypes.insert(DownloadWindows);
+                    m_provider.downloadTypes.insert(Provider::DownloadWindows);
                 } else if (bin.value == "osx") {
-                    m_pluginDownloadTypes.insert(DownloadMac);
+                    m_provider.downloadTypes.insert(Provider::DownloadMac);
                 }
             }
         }
 
         Nodes packs = index->match

                << libn << endl;
 
         for (Node packn: packs) {
             if (packn.type != Node::URI) continue;
 
-            Pack pack;
+            QString packName;
+            QString packUrl;
             n = index->complete
                 (Triple(packn, index->expand("dc:title"), Node()));
             if (n.type == Node::Literal) {
-                pack.name = n.value;
+                packName = n.value;
             }
             n = index->complete
                 (Triple(packn, index->expand("foaf:page"), Node()));
             if (n.type == Node::URI) {
-                pack.downloadURL = n.value;
+                packUrl = n.value;
             }
 
-            if (pack.name != "" && pack.downloadURL != "") {
-                m_pluginFoundInPacks[packn.value] = pack;
+            if (packName != "" && packUrl != "") {
+                m_provider.foundInPacks[packName] = packUrl;
             }
         }
     }
 
 #ifdef DEBUG_PLUGIN_RDF_DESCRIPTION

     SVCERR << " * id: " << m_pluginId << endl;
     SVCERR << " * uri: <" << m_pluginUri << ">" << endl;
     SVCERR << " * name: " << m_pluginName << endl;
     SVCERR << " * description: " << m_pluginDescription << endl;
     SVCERR << " * maker: " << m_pluginMaker << endl;
-    SVCERR << " * info url: <" << m_pluginInfoURL << ">" << endl;
-    SVCERR << " * download url: <" << m_pluginDownloadURL << ">" << endl;
+    SVCERR << " * info url: <" << m_provider.infoUrl << ">" << endl;
+    SVCERR << " * download url: <" << m_provider.downloadUrl << ">" << endl;
     SVCERR << " * download types:" << endl;
-    for (auto t: m_pluginDownloadTypes) {
+    for (auto t: m_provider.downloadTypes) {
         SVCERR << "   * " << int(t) << endl;
     }
     SVCERR << " * packs:" << endl;
-    for (auto t: m_pluginFoundInPacks) {
-        SVCERR << "   * " << t.first << " { name: " << t.second.name
-               << ", download url: " << t.second.downloadURL << " }" << endl;
+    for (auto t: m_provider.foundInPacks) {
+        SVCERR << "   * " << t.first
+               << ", download url: <" << t.second << ">" << endl;
     }
     SVCERR << endl;
 #endif    
 
     return true;