From 1e87a2a3fb260b22aa70f9fa24a8adaf59a04650 Mon Sep 17 00:00:00 2001
From: Thomas Perl <m@thp.io>
Date: Sun, 26 Oct 2014 23:15:51 +0100
Subject: [PATCH] Implement support for the new directory search API

---
 common/GPodderDirectorySearchModel.qml | 25 ++++++++----------------
 main.py                                | 27 ++++++++++++++++++++++++++
 touch/Directory.qml                    | 15 ++++++++++++--
 touch/DirectoryItem.qml                |  4 ++--
 touch/PodcastsPage.qml                 | 20 +++++++++++++++++--
 5 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/common/GPodderDirectorySearchModel.qml b/common/GPodderDirectorySearchModel.qml
index 5ff54dc..b4a7bfa 100644
--- a/common/GPodderDirectorySearchModel.qml
+++ b/common/GPodderDirectorySearchModel.qml
@@ -22,28 +22,19 @@ import QtQuick 2.0
 
 ListModel {
     id: directorySearchModel
+    property string provider
 
     function search(query, callback) {
         clear();
 
-        var result = new XMLHttpRequest();
-        result.onreadystatechange = function() {
-            if (result.readyState == XMLHttpRequest.DONE) {
-                var data = JSON.parse(result.responseText);
-                data.sort(function (a, b) {
-                    // Sort by subscriber count, descending
-                    return b.subscribers - a.subscribers;
-                });
-                for (var i=0; i<data.length; i++) {
-                    directorySearchModel.append(data[i]);
-                }
-                if (callback !== undefined) {
-                    callback();
-                }
+        py.call('main.get_directory_entries', [directorySearchModel.provider, query], function (result) {
+            for (var i=0; i<result.length; i++) {
+                directorySearchModel.append(result[i]);
             }
-        };
 
-        result.open('GET', 'http://gpodder.net/search.json?q=' + query);
-        result.send();
+            if (callback !== undefined) {
+                callback();
+            }
+        });
     }
 }
diff --git a/main.py b/main.py
index 6989676..ca1c6d2 100644
--- a/main.py
+++ b/main.py
@@ -32,6 +32,7 @@ import gpodder
 from gpodder.api import core
 from gpodder.api import util
 from gpodder.api import query
+from gpodder.api import registry
 
 import logging
 import functools
@@ -373,6 +374,30 @@ class gPotherSide:
     def get_config_value(self, option):
         return self.core.config.get_field(option)
 
+    def get_directory_providers(self):
+        def select_provider(p):
+            return p.kind in (p.PROVIDER_SEARCH, p.PROVIDER_STATIC)
+
+        return [{
+            'label': provider.name,
+            'can_search': provider.kind == provider.PROVIDER_SEARCH
+        } for provider in registry.directory.select(select_provider)]
+
+    def get_directory_entries(self, provider, query):
+        def match_provider(p):
+            return p.name == provider
+
+        for provider in registry.directory.select(match_provider):
+            return [{
+                'title': e.title,
+                'url': e.url,
+                'image': e.image,
+                'subscribers': e.subscribers,
+                'description': e.description,
+            } for e in provider.on_string(query)]
+
+        return []
+
 gpotherside = gPotherSide()
 pyotherside.atexit(gpotherside.atexit)
 
@@ -399,3 +424,5 @@ mark_episodes_as_old = gpotherside.mark_episodes_as_old
 save_playback_state = gpotherside.save_playback_state
 set_config_value = gpotherside.set_config_value
 get_config_value = gpotherside.get_config_value
+get_directory_providers = gpotherside.get_directory_providers
+get_directory_entries = gpotherside.get_directory_entries
diff --git a/touch/Directory.qml b/touch/Directory.qml
index f47f937..7136c24 100644
--- a/touch/Directory.qml
+++ b/touch/Directory.qml
@@ -24,6 +24,15 @@ import 'common'
 
 SlidePage {
     id: directory
+    property string provider
+    property bool can_search
+
+    Component.onCompleted: {
+        if (!directory.can_search) {
+            // Load static data
+            search('');
+        }
+    }
 
     function search(text) {
         loading.visible = true;
@@ -40,7 +49,7 @@ SlidePage {
 
         PScrollDecorator { flickable: listView }
 
-        model: GPodderDirectorySearchModel { id: directorySearchModel }
+        model: GPodderDirectorySearchModel { id: directorySearchModel; provider: directory.provider }
 
         header: Column {
             anchors {
@@ -48,9 +57,11 @@ SlidePage {
                 right: parent.right
             }
 
-            SlidePageHeader { title: 'Search gpodder.net' }
+            SlidePageHeader { title: directory.provider }
 
             Column {
+                visible: directory.can_search
+
                 spacing: 0.5 * 30 * pgst.scalef
 
                 anchors {
diff --git a/touch/DirectoryItem.qml b/touch/DirectoryItem.qml
index d3c7b4b..a92f685 100644
--- a/touch/DirectoryItem.qml
+++ b/touch/DirectoryItem.qml
@@ -46,7 +46,7 @@ ButtonArea {
         width: 80 * pgst.scalef
         height: 80 * pgst.scalef
 
-        source: scaled_logo_url
+        source: image
     }
 
     PLabel {
@@ -70,6 +70,6 @@ ButtonArea {
             verticalCenter: parent.verticalCenter
         }
 
-        text: subscribers
+        text: (subscribers > 0) ? subscribers : ''
     }
 }
diff --git a/touch/PodcastsPage.qml b/touch/PodcastsPage.qml
index 7a087c9..e3cb824 100644
--- a/touch/PodcastsPage.qml
+++ b/touch/PodcastsPage.qml
@@ -66,9 +66,25 @@ SlidePage {
                 },
             },
             {
-                label: 'Search gpodder.net',
+                label: 'Discover new podcasts',
                 callback: function () {
-                    pgst.loadPage('Directory.qml');
+                    py.call('main.get_directory_providers', [], function (result) {
+                        var items = [];
+                        for (var i=0; i<result.length; i++) {
+                            (function (provider) {
+                                items.push({
+                                    label: provider.label,
+                                    callback: function () {
+                                        pgst.loadPage('Directory.qml', {
+                                            provider: provider.label,
+                                            can_search: provider.can_search,
+                                        });
+                                    },
+                                });
+                            })(result[i]);
+                        }
+                        pgst.showSelection(items, 'Select provider');
+                    });
                 },
             },
         ]);