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

[David Callé]

Add previews

Add previews
http://ubuntuone.com/6V596HuRUsnMbajw216EYg

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

LGTM

review: Approve

=== modified file 'data/gallica.scope.in'
--- data/gallica.scope.in	2013-04-24 22:16:25 +0000
+++ data/gallica.scope.in	2013-04-25 14:46:27 +0000
@@ -4,7 +4,7 @@
 Icon=
 _Keywords=gallica;book;library;books;art;history;bnf;
 RequiredMetadata=
-OptionalMetadata=
+OptionalMetadata=author[s];publisher[s];published_date[s];
 Loader=/usr/share/unity-scopes/gallica/unity_gallica_daemon.py
 RemoteContent=true
 Type=books
 
=== modified file 'src/unity_gallica_daemon.py'
--- src/unity_gallica_daemon.py	2013-04-24 22:16:25 +0000
+++ src/unity_gallica_daemon.py	2013-04-25 14:46:27 +0000
@@ -45,7 +45,16 @@
       'renderer':Unity.CategoryRenderer.VERTICAL_TILE}
 CATEGORIES = [c1]
 FILTERS = []
-EXTRA_METADATA = []
+m1 = {'id'   :'author',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+m2 = {'id'   :'publisher',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+m3 = {'id'   :'published_date',
+      'type' :'s',
+      'field':Unity.SchemaFieldType.OPTIONAL}
+EXTRA_METADATA = [m1, m2, m3]
 
 def search(search, filters):
     '''
@@ -80,9 +89,10 @@
     for record in data.iter():
         try:
             if record.tag == "{http://www.loc.gov/zing/srw/}record":
-                thumb, title, uri = None, None, None
+                thumb, title, uri, comment = None, None, None, None
+                publisher, published_date = '', ''
+                author = []
                 for r in record:
-                    
                     if r.tag == "{http://www.loc.gov/zing/srw/}extraRecordData":
                         for element in r:
                             if element.tag == "{http://gallica.bnf.fr/namespaces/gallica}thumbnail":
@@ -98,9 +108,26 @@
                                     if e.tag == "{http://purl.org/dc/elements/1.1/}title":
                                         if e.text != "":
                                             title = e.text
+                                    elif e.tag == "{http://purl.org/dc/elements/1.1/}description":
+                                        if e.text != "":
+                                            comment = e.text
+                                    elif e.tag == "{http://purl.org/dc/elements/1.1/}creator":
+                                        if e.text != "":
+                                            author.append(e.text)
+                                    elif e.tag == "{http://purl.org/dc/elements/1.1/}publisher":
+                                        if e.text != "":
+                                            publisher = e.text
+                                    elif e.tag == "{http://purl.org/dc/elements/1.1/}date":
+                                        if e.text != "":
+                                            date = e.text
+                author = ", ".join(author)
                 results.append({'uri':uri,
                                 'icon':thumb,
-                                'title':title})
+                                'title':title,
+                                'comment':comment,
+                                'author':author,
+                                'publisher':publisher,
+                                'published_date':date})
         except Exception as error:  
             print (error)
             continue
@@ -141,22 +168,27 @@
                     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):
+        icon = Gio.FileIcon.new(Gio.file_new_for_uri(self.result.icon_hint))
+        preview = Unity.GenericPreview.new(self.result.title, self.result.comment.strip(), icon)
+        preview.props.subtitle = self.result.metadata['author'].get_string()
+        if self.result.metadata['publisher'].get_string():
+            preview.add_info(Unity.InfoHint.new("publisher", _("Publisher"), None, self.result.metadata['publisher'].get_string()))
+        if self.result.metadata['published_date'].get_string():
+            preview.add_info(Unity.InfoHint.new("published", _("Published"), None, self.result.metadata['published_date'].get_string()))
+#        if self.result.metadata['followers'].get_int32():
+#            preview.add_info(Unity.InfoHint.new("followers", _("Followers"), None, str(self.result.metadata['followers'].get_int32())))
+        icon = Gio.FileIcon.new (Gio.file_new_for_path(PROVIDER_ICON))
+        view_action = Unity.PreviewAction.new("open", _("View"), icon)
+        preview.add_action(view_action)
+        return preview
+
 class Scope (Unity.AbstractScope):
     def __init__(self):
         Unity.AbstractScope.__init__(self)
@@ -208,5 +240,11 @@
         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 load_scope():
     return Scope()