Merge lp:~stolowski/phablet-extras/unity-lens-mock-new-api into lp:phablet-extras/unity-lens-mock

[Paweł Stołowski]

Updated for new scopes API.

Updated for new scopes API.

Please have a look at https://code.launchpad.net/~stolowski/unity/phablet-new-libunity/+merge/167717 before approving.

[Michał Sawicz (saviq)]

This should depend on unity-scopes-runner, probably?

review: Needs Fixing

[lp:~stolowski/phablet-extras/unity-lens-mock-new-api]

16. By Paweł Stołowski on 2013-06-19

Require unity-scopes-runner.

[Paweł Stołowski (stolowski)]

> This should depend on unity-scopes-runner, probably?
Right, done.

[Michał Sawicz (saviq)]

This looks good, before top-approving, will verify again with:

https://code.launchpad.net/~unity-team/unity/8.new-libunity/+merge/167733
https://code.launchpad.net/~stolowski/demo-assets/new-api/+merge/167718

review: Approve

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-15 17:08:02 +0000
+++ debian/changelog	2013-06-19 14:03:24 +0000
@@ -1,3 +1,9 @@
+unity-lens-mock (0.5) UNRELEASED; urgency=low
+
+  * Ported to new scopes API.
+
+ -- Pawel Stolowski <[e-mail]>  Wed, 05 Jun 2013 16:47:30 +0200
+
 unity-lens-mock (0.4) quantal; urgency=low
 
   * Search in description, too

=== modified file 'debian/control'
--- debian/control	2013-02-05 12:21:24 +0000
+++ debian/control	2013-06-19 14:03:24 +0000
@@ -15,6 +15,7 @@
 Depends: ${misc:Depends},
          ${python:Depends},
          gir1.2-unity-5.0,
+         unity-scopes-runner (>= 7.0.3)
 Breaks: unity (<< 6.0.0)
 Description: Unity Lens driven by JSON files
  This Lens allows you to provide data via JSON files for testing and mocking Unity

=== modified file 'unity-lens-mock' (properties changed: -x to +x)
--- unity-lens-mock	2013-02-01 14:41:46 +0000
+++ unity-lens-mock	2013-06-19 14:03:24 +0000
@@ -4,6 +4,8 @@
  -- unity-lens-mock
 
  Reads a json file and starts a Unity lens / scope pair based on data in the file. 
+ It's meant to be run via scope-runner, e.g.
+   /usr/share/unity-scopes/scope-runner-dbus.py /usr/bin/unity-lens-mock <data file>
 
 @author:     Michał Sawicz <[e-mail]>
             
@@ -22,11 +24,11 @@
 
 from gi.repository import GObject
 
-from unity_lens_mock.lens import MockLens
+from unity_lens_mock.scope import MockScope
 
 __all__ = []
-__version__ = 0.1
-__updated__ = '2013-01-30'
+__version__ = 0.5
+__updated__ = '2013-06-05'
 
 __program_name__ = os.path.basename(sys.argv[0])
 __program_version__ = "v%s" % __version__
@@ -36,19 +38,22 @@
 
 DEBUG = 1
 
-if __name__ == "__main__":
+def load_scope():
     try:
         # setup option parser
         parser = OptionParser(
             version=__program_version_string__,
             usage=__program_usage_string__
         )
-        
+
         # process options
         (opts, args) = parser.parse_args(sys.argv)
         
-        if len(args) != 2:
+        if len(args) < 2:
             raise ValueError("provide a path to the json file")
+
+        data = json.load(open(args[-1]), encoding='utf-8')
+        return MockScope(data)
     
     except Exception, e:
         indent = len(__program_name__) * " "
@@ -56,7 +61,3 @@
         sys.stderr.write(indent + "  for help use --help" + "\n")
         raise SystemExit(2)
 
-
-    mockLens = MockLens(json.load(open(args[1]), encoding='utf-8'))
-
-    GObject.MainLoop().run()

=== renamed file 'unity_lens_mock/lens.py' => 'unity_lens_mock/scope.py'
--- unity_lens_mock/lens.py	2013-02-01 11:22:22 +0000
+++ unity_lens_mock/scope.py	2013-06-19 14:03:24 +0000
@@ -8,8 +8,6 @@
     Unity
 )
 
-from scope import MockScope
-
 __rendererMap__ = {
     'vertical_tile': Unity.CategoryRenderer.VERTICAL_TILE
 }
@@ -18,70 +16,83 @@
     'radio': Unity.RadioOptionFilter
 }
 
-class MockLens(object):
-    '''Mock Unity lens'''
+__resultTypeMap__ = [
+    Unity.ResultType.DEFAULT
+]
+
+class MockSearch (Unity.ScopeSearchBase):
+    def __init__(self, search_context, data):
+        Unity.ScopeSearchBase.__init__(self)
+        self.__data = data
+        self.set_search_context(search_context)
+
+    def __search(self):
+        result_set = self.search_context.result_set
+        query = self.search_context.search_query.lower()
+        if query == "":
+            if (self.search_context.search_type == Unity.SearchType.DEFAULT):
+                for entry in self.__data['data']:
+                    result_set.add_result(Unity.ScopeResult.create(entry[0], entry[1], entry[2], __resultTypeMap__[entry[3]], entry[4], entry[5], entry[6], entry[7], {}))
+            else:
+                for entry in self.__data['global_data']:
+                    result_set.add_result(Unity.ScopeResult.create(entry[0], entry[1], entry[2], __resultTypeMap__[entry[3]], entry[4], entry[5], entry[6], entry[7], {}))
+        else:
+            if (self.search_context.search_type == Unity.SearchType.DEFAULT):
+                for entry in self.__data.get('search_data', self.__data.get('common_search_data', self.__data.get('data', ()))):
+                    if (query in entry[5].lower() or query in entry[6].lower()):
+                        result_set.add_result(Unity.ScopeResult.create(entry[0], entry[1], entry[2], __resultTypeMap__[entry[3]], entry[4], entry[5], entry[6], entry[7], {}))
+            else:
+                for entry in self.__data.get('global_search_data', self.__data.get('common_search_data', self.__data.get('global_data', ()))):
+                    if (query in entry[5].lower() or query in entry[6].lower()):
+                        result_set.add_result(Unity.ScopeResult.create(entry[0], entry[1], entry[2], __resultTypeMap__[entry[3]], entry[4], entry[5], entry[6], entry[7], {}))
+
+    def do_run(self):
+        try:
+            result_set = self.search_context.result_set
+            self.__search()
+        except Exception as error:
+            print(error)
+
+class MockScope(Unity.AbstractScope):
+    '''Mock Unity Scope'''
 
     __data = None
-    __lens = None
 
     def __init__(self, data):
         '''Command line options.'''
+        Unity.AbstractScope.__init__(self)
         self.__data = data
-        self.__requestName(self.__data['lens']['dbusname'])
-        
-        self.__lens = Unity.Lens.new(self.__data['lens']['dbuspath'], self.__data['lens']['id'])
-        
-        self.__lens.props.search_hint = self.__data['lens']['searchhint']
-        self.__lens.props.visible = self.__data['lens']['visible']
-        self.__lens.props.search_in_global = self.__data['lens']['global']
-
-        self.__populate_categories()
-        self.__populate_filters()
-
-        for scope in self.__data['scopes']:
-            s = MockScope(scope)
-            self.__lens.add_local_scope(s.getUnityScope())
-        
-        self.__lens.export()
-
-    def __requestName(self, dbusname):
-        '''Connect to the session bus, exit if there is a running instance.'''
-        try:
-            session_bus_connection = Gio.bus_get_sync(Gio.BusType.SESSION, None)
-            session_bus = Gio.DBusProxy.new_sync(session_bus_connection, 0, None,
-                                                    'org.freedesktop.DBus',
-                                                    '/org/freedesktop/DBus',
-                                                    'org.freedesktop.DBus', None)
-            result = session_bus.call_sync('RequestName',
-                                            GLib.Variant("(su)", (dbusname, 0x4)),
-                                            0, -1, None)
-    
-            # Unpack variant response with signature "(u)". 1 means we got it.
-            result = result.unpack()[0]
-    
-            if result != 1:
-                print >> sys.stderr, "Failed to own dbusname %s. Bailing out." % dbusname
-                raise SystemExit(1)
-        except:
-            raise SystemExit(1)
-        
-    def __populate_categories(self):
+        self.__unique_name = self.__data['scope']['dbusname']
+        self.__unique_path = self.__data['scope']['dbuspath']
+        
+        #self.__lens.props.visible = self.__data['lens']['visible']
+        #self.__lens.props.search_in_global = self.__data['lens']['global']
+
+    def do_get_schema(self):
+        schema = Unity.Schema.new()
+        return schema
+
+    def do_get_search_hint(self):
+        return self.__data['scope']['searchhint']
+        
+    def do_get_categories(self):
         '''Populate categories'''
-        categories = []
-        for category in self.__data['lens']['categories']:
-            categories.append(
-                Unity.Category.new(
-                    category['name'],
-                    Gio.ThemedIcon.new(category['iconpath']),
-                    __rendererMap__[category['renderer']]
-            ))
-        
-        self.__lens.props.categories = categories
-        
-    def __populate_filters(self):
+        cs = Unity.CategorySet.new ()
+        for category in self.__data['scope']['categories']:
+            cat = Unity.Category.new(
+                category['id'],
+                category['name'],
+                Gio.ThemedIcon.new(category['iconpath']),
+                __rendererMap__[category['renderer']]
+            )
+            cs.add(cat)
+        return cs
+        
+    def do_get_filters(self):
+        fs = Unity.FilterSet.new ()
         filters = []
         try:
-            for filterData in self.__data['lens']['filters']:
+            for filterData in self.__data['scope']['filters']:
                 f = __filterMap__[filterData['type']].new(
                     filterData['id'],
                     filterData['name'],
@@ -90,8 +101,23 @@
                 )
                 for optionData in filterData['options']:
                     f.add_option(*optionData)
-                filters.append(f)
+                fs.add(f)
         except KeyError:
             pass
-
-        self.__lens.props.filters = filters
\ No newline at end of file
+        return fs
+
+    def do_get_group_name(self):
+        return self.__unique_name
+
+    def do_get_unique_name(self):
+        return self.__unique_path
+
+    def do_create_search_for_query (self, search_context):
+        se = MockSearch(search_context, self.__data['scope'])
+        return se
+
+    def do_create_previewer(self, result, metadata):
+        return None #TODO
+
+    def do_activate (self, result, metadata, id):
+        return Unity.ActivationResponse.new (Unity.HandledType.NOT_HANDLED, uri)

=== removed file 'unity_lens_mock/scope.py'
--- unity_lens_mock/scope.py	2013-02-15 17:08:02 +0000
+++ unity_lens_mock/scope.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# encoding: utf-8
-
-from gi.repository import (
-    Unity,
-    Gio
-)
-
-class MockScope(object):
-
-    __scope = None
-    __data = None
-
-    def __init__ (self, data):
-        self.__data = data
-        self.__scope = Unity.Scope.new(self.__data['dbuspath'])
-        
-        # Listen for changes and requests
-        self.__scope.connect("search_changed", self._on_search_changed)
-        self.__scope.connect("filters-changed", self._on_filters_changed)
-        self.__scope.connect("activate-uri", self._activate_uri)
-
-    def getUnityScope(self):
-        return self.__scope
-
-    def _activate_uri (self, scope, uri):
-        return Unity.ActivationResponse.new (Unity.HandledType.NOT_HANDLED, uri)
-            
-    def _on_search_changed (self, scope, search, searchType, cancellable):
-        search.props.results_model.clear()
-
-        if search.props.search_string == "":
-            if (searchType == Unity.SearchType.DEFAULT):
-                for entry in self.__data['data']:
-                    search.props.results_model.append(*entry)
-            else:
-                for entry in self.__data['global_data']:
-                    search.props.results_model.append(*entry)
-        else:
-            if (searchType == Unity.SearchType.DEFAULT):
-                for entry in self.__data.get('search_data', self.__data.get('common_search_data', self.__data.get('data', ()))):
-                    query = search.props.search_string.lower()
-                    if (query in entry[4].lower() or query in entry[5].lower()):
-                        search.props.results_model.append(*entry)
-            else:
-                for entry in self.__data.get('global_search_data', self.__data.get('common_search_data', self.__data.get('global_data', ()))):
-                    query = search.props.search_string.lower()
-                    if (query in entry[4].lower() or query in entry[5].lower()):
-                        search.props.results_model.append(*entry)
-             
-        search.finished()
-
-    def _on_filters_changed(self, scope):
-        pass