[PATCH 2/7] flickr: Implement search all elements

["Juan A. Suarez Romero" <jasuarez igalia com>]

In case of public Flickr source, as search all is not supported, search
all will return the latest photos uploaded to Flickr.

Signed-off-by: Juan A. Suarez Romero <jasuarez igalia com>
---
 src/flickr/gflickr.c    |   78 ++++++++++++++++++++++++++++++++++++++++++-----
 src/flickr/gflickr.h    |    6 +++
 src/flickr/grl-flickr.c |   22 +++++++++----
 3 files changed, 91 insertions(+), 15 deletions(-)

diff --git a/src/flickr/gflickr.c b/src/flickr/gflickr.c
index 19e1677..695c7dc 100644
--- a/src/flickr/gflickr.c
+++ b/src/flickr/gflickr.c
@@ -25,17 +25,18 @@
 #define FLICKR_PHOTO_LARGEST_URL                        \
   "http://farm%s.static.flickr.com/%s/%s_%s_b.jpg";
 
-#define FLICKR_ENDPOINT "http://api.flickr.com/services/rest/?";
+#define FLICKR_ENDPOINT  "http://api.flickr.com/services/rest/?";
 #define FLICKR_AUTHPOINT "http://flickr.com/services/auth/?";
 
-#define FLICKR_PHOTOS_SEARCH_METHOD "flickr.photos.search"
-#define FLICKR_PHOTOS_GETINFO_METHOD "flickr.photos.getInfo"
-#define FLICKR_PHOTOSETS_GETLIST_METHOD "flickr.photosets.getList"
+#define FLICKR_PHOTOS_SEARCH_METHOD       "flickr.photos.search"
+#define FLICKR_PHOTOS_GETINFO_METHOD      "flickr.photos.getInfo"
+#define FLICKR_PHOTOS_GETRECENT_METHOD    "flickr.photos.getRecent"
+#define FLICKR_PHOTOSETS_GETLIST_METHOD   "flickr.photosets.getList"
 #define FLICKR_PHOTOSETS_GETPHOTOS_METHOD "flickr.photosets.getPhotos"
-#define FLICKR_TAGS_GETHOTLIST_METHOD "flickr.tags.getHotList"
-#define FLICKR_AUTH_GETFROB_METHOD "flickr.auth.getFrob"
-#define FLICKR_AUTH_GETTOKEN_METHOD "flickr.auth.getToken"
-#define FLICKR_AUTH_CHECKTOKEN_METHOD "flickr.auth.checkToken"
+#define FLICKR_TAGS_GETHOTLIST_METHOD     "flickr.tags.getHotList"
+#define FLICKR_AUTH_GETFROB_METHOD        "flickr.auth.getFrob"
+#define FLICKR_AUTH_GETTOKEN_METHOD       "flickr.auth.getToken"
+#define FLICKR_AUTH_CHECKTOKEN_METHOD     "flickr.auth.checkToken"
 
 #define FLICKR_PHOTOS_SEARCH                            \
   FLICKR_ENDPOINT                                       \
@@ -50,6 +51,16 @@
   "&text=%s"                                            \
   "%s"
 
+#define FLICKR_PHOTOS_GETRECENT                         \
+  FLICKR_ENDPOINT                                       \
+  "api_key=%s"                                          \
+  "&api_sig=%s"                                         \
+  "&method=" FLICKR_PHOTOS_GETRECENT_METHOD             \
+  "&extras=media,date_taken,owner_name,url_o,url_t"     \
+  "&per_page=%d"                                        \
+  "&page=%d"                                            \
+  "%s"
+
 #define FLICKR_PHOTOSETS_GETLIST                \
   FLICKR_ENDPOINT                               \
   "api_key=%s"                                  \
@@ -739,6 +750,57 @@ g_flickr_photos_search (GFlickr *f,
   g_free (request);
 }
 
+void
+g_flickr_photos_getRecent (GFlickr *f,
+                           gint page,
+                           GFlickrListCb callback,
+                           gpointer user_data)
+{
+  gchar *auth;
+  g_return_if_fail (G_IS_FLICKR (f));
+
+  gchar *strpage = g_strdup_printf ("%d", page);
+  gchar *strperpage = g_strdup_printf ("%d", f->priv->per_page);
+
+  gchar *api_sig =
+    get_api_sig (f->priv->auth_secret,
+                 "api_key", f->priv->api_key,
+                 "extras", "media,date_taken,owner_name,url_o,url_t",
+                 "method", FLICKR_PHOTOS_GETRECENT_METHOD,
+                 "page", strpage,
+                 "per_page", strperpage,
+                 f->priv->auth_token? "auth_token": "",
+                 f->priv->auth_token? f->priv->auth_token: "",
+                 NULL);
+  g_free (strpage);
+  g_free (strperpage);
+
+  /* Build the request */
+  if (f->priv->auth_token) {
+    auth = g_strdup_printf ("&auth_token=%s", f->priv->auth_token);
+  } else {
+    auth = g_strdup ("");
+  }
+
+  gchar *request = g_strdup_printf (FLICKR_PHOTOS_GETRECENT,
+                                    f->priv->api_key,
+                                    api_sig,
+                                    f->priv->per_page,
+                                    page,
+                                    auth);
+  g_free (api_sig);
+  g_free (auth);
+
+  GFlickrData *gfd = g_slice_new (GFlickrData);
+  gfd->flickr = g_object_ref (f);
+  gfd->parse_xml = process_photolist_result;
+  gfd->list_cb = callback;
+  gfd->user_data = user_data;
+
+  read_url_async (f, request, gfd);
+  g_free (request);
+}
+
 gchar *
 g_flickr_photo_url_original (GFlickr *f, GHashTable *photo)
 {
diff --git a/src/flickr/gflickr.h b/src/flickr/gflickr.h
index 498db4a..dd583d8 100644
--- a/src/flickr/gflickr.h
+++ b/src/flickr/gflickr.h
@@ -100,6 +100,12 @@ g_flickr_photos_search (GFlickr *f,
                         GFlickrListCb callback,
                         gpointer user_data);
 
+void
+g_flickr_photos_getRecent (GFlickr *f,
+                           gint page,
+                           GFlickrListCb callback,
+                           gpointer user_data);
+
 gchar *
 g_flickr_photo_url_original (GFlickr *f, GHashTable *photo);
 
diff --git a/src/flickr/grl-flickr.c b/src/flickr/grl-flickr.c
index de41d7a..6065355 100644
--- a/src/flickr/grl-flickr.c
+++ b/src/flickr/grl-flickr.c
@@ -737,11 +737,19 @@ grl_flickr_source_search (GrlMediaSource *source,
   od->user_data = ss->user_data;
   od->count = ss->count;
   od->operation_id = ss->search_id;
-  g_flickr_photos_search (f,
-                          od->user_id,
-                          ss->text,
-                          NULL,
-                          od->page,
-                          search_cb,
-                          od);
+
+  if (od->user_id || od->text) {
+    g_flickr_photos_search (f,
+                            od->user_id,
+                            ss->text,
+                            NULL,
+                            od->page,
+                            search_cb,
+                            od);
+  } else {
+    g_flickr_photos_getRecent (f,
+                               od->page,
+                               search_cb,
+                               od);
+  }
 }
-- 
1.7.3.5