[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/base/plasma/MediaCenterComponents/dataengines
From:       Onur-Hayri Bakici <thehayro () gmail ! com>
Date:       2010-08-14 15:50:29
Message-ID: 20100814155029.90FDFAC84E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1163608 by bakici:

Added addon: veo; some bugfixes

 M  +0 -2      addons/flickr/contents/code/main.js  
 M  +18 -0     addons/photobucket/contents/code/main.js  
 A             addons/veoh (directory)  
 A             addons/veoh/contents (directory)  
 A             addons/veoh/contents/code (directory)  
 A             addons/veoh/contents/code/main.js  
 M  +0 -1      addons/youtube/contents/code/main.js  
 M  +3 -60     javascript/service/contents/code/mediaservice.js  
 M  +1 -0      javascript/service/contents/services/provider.operations  


--- trunk/playground/base/plasma/MediaCenterComponents/dataengines/addons/flickr/contents/code/main.js \
#1163607:1163608 @@ -226,8 +226,6 @@
   return false;
 }
 
-
-
 function xmlError(e)
 {
   print(e);
--- trunk/playground/base/plasma/MediaCenterComponents/dataengines/addons/photobucket/contents/code/main.js \
#1163607:1163608 @@ -245,6 +245,24 @@
   return false;
 }
 
+Photobucket.prototype.buildParams = function(queryParams)
+{
+  var params = "";
+  if (queryParams['text'] != null)
+    params += "text=" + queryParams['text'];
+  if (queryParams['max-results'] != null)
+    params += "per-page=" + queryParams['max-results'];
+  if (queryParams['min-results'] != null)
+    params += queryParams['min-results'];
+  if (queryParams['user'] != null)
+    //params += queryParams['user'];
+    print("Parameter user for flickr not supported yet");
+  if (queryParams['tags'] != null)
+    print("Parameter tags for photobucket not supported");
+  if (queryParams['page'] != null)
+    params += "page=" + queryParams['page'];
+  return params;
+}
 
 function getSignature(key, baseString) {
   b64pad = '=';
--- trunk/playground/base/plasma/MediaCenterComponents/dataengines/addons/youtube/contents/code/main.js \
#1163607:1163608 @@ -21,7 +21,6 @@
 {
   print("Hello youtube");
   this.baseUrl = "http://gdata.youtube.com/feeds/api/";
-  this.mediaengine = GetWebMediaEngine();
 }
 
 Youtube.prototype.searchMedia = function(queryParams)
--- trunk/playground/base/plasma/MediaCenterComponents/dataengines/javascript/service/contents/code/mediaservice.js \
#1163607:1163608 @@ -132,6 +132,7 @@
 {
   print("new addon: " + addon)
   addons.push(addon);
+  setData(addonsObject[i].name, 'text', '');
   print(addons.length);
 }
 
@@ -142,13 +143,11 @@
 for (i in addonsObject) 
 {
   print("Addon: " + addonsObject[i].name);
-  setData(addonsObject[i].name, 'text', '');
   engine.loadAddon("org.kde.plasma.dataengine.webmedia", addonsObject[i].id);
 }
 
 function GetAddon(name)
 {
-  print("Here: " + name);
   for (var i = 0; i < addons.length; i++)
   {
     if (addons[i] == name)
@@ -162,9 +161,9 @@
 
 function setupJob(job)
 {
+  job.addon = selectedAddon;
   if (job.operationName == 'searchMedia')
   {
-    job.addon = selectedAddon;
     job.start = function()
     {
       print("Service starts a request to " + this.addon + " with " + \
this.parameters.length + " parameters"); @@ -176,7 +175,7 @@
   {
       job.start = function()
       {
-	print("And I am starting a request of " + this.parameters['text']);
+	print("Service starts a request to " + this.addon + " with " + \
this.parameters.length + " parameters");  \
this.addon.searchCollection(this.parameters);  this.result = true;
       };
@@ -192,60 +191,4 @@
     service.setupJob = setupJob;
     return service;
  }
- 
- /*
-  queries look like this:
-  all:media&text=searchstring searches all providers for searchstring
-  provider:media&text=searchstring searches a specific provider for searchstring
- */
- /*if (source.indexOf(":") == -1)
-   return;
- var queryParams = new Array();
- var params = source.split("&");
- for (var i = 0; i < params.length; i++)
- {
-  var pos = params[i].indexOf("=");
-  if (pos > 0)
-  {
-    var key = params[i].substring(0, pos);
-    var val = params[i].substring(pos + 1);
-    queryParams[key] = val;
   }
- }
- // params[0] is provider:media
- var p = params[0].split(":");
- var service = null;
- for (var i = 0; i < mediaEngine.addons.length; i++)
- {
-  var provider = mediaEngine.addons[i];
-  if (p[0] == "all")
-  {
-    print("Its " + provider.toString());
-    
-    if (p[1].toLowerCase() == "media"){
-      provider.searchMedia(queryParams);
-      continue;
-    }
-    if (p[1].toLowerCase() == "mediacollection")
-    {
-     if (provider.searchCollection)
-       provider.searchCollection(queryParams);
-    continue;
-    }
-    continue;
-  }
-  if (p[0] == provider.toString().toLowerCase())
-  {
-    if (p[1] == "media"){
-      provider.searchMedia(queryParams);
-      return;
-    }
-    if (p[1] == "mediaCollection".toLowerCase())
-    {
-    if (provider.searchCollection)
-       provider.searchCollection(queryParams);
-    return;
-    }
-  }
- }*/
-}
--- trunk/playground/base/plasma/MediaCenterComponents/dataengines/javascript/service/contents/services/provider.operations \
#1163607:1163608 @@ -10,6 +10,7 @@
     <entry name="tags" type="string"/>
   </group>
   <group name="searchCollection">
+    <entry name="text" type="string"/>
     <entry name="user" type="string"/>
   </group>
 </kcfg>


[prev in list] [next in list] [prev in thread] [next in thread]