Merge lp:~davidc3/unity-scope-openclipart/previews into lp:unity-scope-openclipart

[David Callé]

Add previews

Implement previews:
- License info
- Open in Inkscape action if installed

http://ubuntuone.com/7mJr5n5sKEf3qmZllPvulB

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-amd64-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openclipart-ci/1/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

113 + GLib.spawn_async([shutil.which("inkscape"), result.metadata['resource'].get_string().replace(' ', '%20')])

Please use a safer method to convert the string into a valid uri. (Gio.file_new_for_uri(..).get_uri())

93 + if shutil.which("inkscape"):

Perhaps check if the resource if not empty string first?

82 + if self.result.metadata and 'resource' in self.result.metadata and self.result.metadata['resource'].get_string() != '':
83 + thumb = Gio.FileIcon.new(Gio.file_new_for_uri(self.result.metadata['resource'].get_string()))
84 + else:
85 + thumb = Gio.FileIcon.new(Gio.file_new_for_uri(self.result.icon_hint))
86 + preview.props.image = thumb

Why don't you do this first and pass thumb to GenericPreview constructor?

review: Needs Fixing

[lp:~davidc3/unity-scope-openclipart/previews]

23. By David Callé on 2013-04-23

Fix review issues

[Michal Hruby (mhr3)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-openclipart-raring-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-openclipart-ci/2/rebuild

review: Approve (continuous-integration)

=== modified file 'data/openclipart.scope.in'
--- data/openclipart.scope.in	2013-03-15 17:29:38 +0000
+++ data/openclipart.scope.in	2013-04-23 15:45:03 +0000
@@ -4,7 +4,7 @@
 Icon=
 _Keywords=openclipart;clipart;svg;vector;
 RequiredMetadata=
-OptionalMetadata=published[s];author[s];
+OptionalMetadata=published[s];author[s];resource[s];
 Loader=/usr/share/unity-scopes/openclipart/unity_openclipart_daemon.py
 RemoteContent=true
 Type=graphics

=== modified file 'src/unity_openclipart_daemon.py'
--- src/unity_openclipart_daemon.py	2013-03-19 22:40:52 +0000
+++ src/unity_openclipart_daemon.py	2013-04-23 15:45:03 +0000
@@ -19,6 +19,7 @@
 import urllib
 import feedparser
 import gettext
+import shutil
 
 APP_NAME = 'unity-scope-openclipart'
 LOCAL_PATH = '/usr/share/locale/'
@@ -52,7 +53,10 @@
 m2 = {'id'   :'author',
       'type' :'s',
       'field':Unity.SchemaFieldType.OPTIONAL}
-EXTRA_METADATA = [m1, m2]
+m3 = {'id'   :'resource',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+EXTRA_METADATA = [m1, m2, m3]
 
 def search(search, filters):
     '''
@@ -85,12 +89,17 @@
         try:
             if f is None:
                 continue
+            resource = ''
+            for link in f['links']:
+                if link['rel'] == 'enclosure':
+                    resource = link['href']
             results.append({'uri':f['link'],
                             'icon':f['media_thumbnail'][0]['url'],
                             'title':f['title'],
                             'comment':f['summary'],
-                            'published':GLib.Variant('s', f['published']),
-                            'author':GLib.Variant('s', f['author'])})
+                            'published':f['published'],
+                            'author':f['author'],
+                            'resource':resource})
         except Exception as error:
             print(error)
     return results
@@ -130,22 +139,32 @@
                     i['comment'] = ''
                 if not 'dnd_uri' in i or not i['dnd_uri'] or i['dnd_uri'] == '':
                     i['dnd_uri'] = i['uri']
-                i['metadata'] = {}
-                if EXTRA_METADATA:
-                    for e in i:
-                        for m in EXTRA_METADATA:
-                            if m['id'] == e:
-                                i['metadata'][e] = i[e]
-                i['metadata']['provider_credits'] = GLib.Variant('s', PROVIDER_CREDITS)
-                result = Unity.ScopeResult.create(str(i['uri']), str(i['icon']),
-                                                  i['category'], i['result_type'],
-                                                  str(i['mimetype']), str(i['title']),
-                                                  str(i['comment']), str(i['dnd_uri']),
-                                                  i['metadata'])
-                result_set.add_result(result)
+                result_set.add_result(**i)
         except Exception as error:
             print (error)
 
+class Preview (Unity.ResultPreviewer):
+
+    def do_run(self):
+        resource = False
+        if self.result.metadata and 'resource' in self.result.metadata and self.result.metadata['resource'].get_string() != '':
+            resource = True
+            thumb = Gio.FileIcon.new(Gio.file_new_for_uri(self.result.metadata['resource'].get_string()))
+        else:
+            thumb = Gio.FileIcon.new(Gio.file_new_for_uri(self.result.icon_hint))
+        preview = Unity.GenericPreview.new(self.result.title, self.result.comment.strip(), thumb)
+        preview.add_info(Unity.InfoHint.new("license", _("License"), None, _("Public Domain")))
+        if self.result.metadata and 'author' in self.result.metadata and self.result.metadata['author'].get_string() != '':
+            preview.props.subtitle = _("By ") + self.result.metadata['author'].get_string()
+        icon = Gio.FileIcon.new (Gio.file_new_for_path(PROVIDER_ICON))
+        view_action = Unity.PreviewAction.new("view", _("View"), icon)
+        preview.add_action(view_action)
+        
+        if resource and shutil.which("inkscape"):
+            inkscape_action = Unity.PreviewAction.new("inkscape", _("Open in Inkscape"), None)
+            preview.add_action(inkscape_action)
+        return preview
+
 class Scope (Unity.AbstractScope):
     def __init__(self):
         Unity.AbstractScope.__init__(self)
@@ -197,5 +216,18 @@
         se = MySearch (search_context)
         return se
 
+    def do_create_previewer(self, result, metadata):
+        rp = Preview()
+        rp.set_scope_result(result)
+        rp.set_search_metadata(metadata)
+        return rp
+
+    def do_activate(self, result, metadata, id):
+        if id == 'inkscape':
+            uri = Gio.file_new_for_uri(result.metadata['resource'].get_string()).get_uri()
+            GLib.spawn_async([shutil.which("inkscape"), uri.replace(' ', '%20')])
+            return Unity.ActivationResponse(handled=Unity.HandledType.HIDE_DASH, goto_uri=None)
+        return Unity.ActivationResponse()
+
 def load_scope():
     return Scope()