Merge lp:~frederik-elwert/lens-cooking/chefkoch-scope into lp:lens-cooking

[Frederik Elwert]

Added scope for chefkoch.de and added this as a new category to the lens.

[Eduard Gotwig (gotwig)]

Approved, thank you for your big help :-)!

review: Approve

[Eduard Gotwig (gotwig)]

I am going to merge this in 5 hours.

=== added file 'chefkoch.scope'
--- chefkoch.scope	1970-01-01 00:00:00 +0000
+++ chefkoch.scope	2012-05-22 20:35:21 +0000
@@ -0,0 +1,3 @@
+[Scope]
+DBusName=net.launchpad.scope.cooking.chefkoch
+DBusPath=/net/launchpad/scope/cooking/chefkoch

=== added file 'chefkoch.svg'
--- chefkoch.svg	1970-01-01 00:00:00 +0000
+++ chefkoch.svg	2012-05-22 20:35:21 +0000
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32.625004"
+   height="28.500004"
+   id="svg3018"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="chefkoch.svg">
+  <defs
+     id="defs3020" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="0.096507634"
+     inkscape:cy="4.5050419"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1301"
+     inkscape:window-height="744"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3023">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-335.3125,-518.46875)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3219"
+       d="m 342.15481,519.26909 c -3.31663,-0.003 -6.00944,2.58203 -6.01217,5.77118 -0.002,2.7707 2.02629,5.09149 4.7339,5.65418 l -0.0132,15.43625 21.50651,0.0183 0.0132,-15.43622 c 2.70857,-0.55807 4.74117,-2.8754 4.74353,-5.64609 0.003,-3.18916 -2.68563,-5.77862 -6.00229,-5.78146 -1.9333,-0.002 -3.65477,0.87481 -4.75521,2.23917 -1.09836,-1.36232 -2.80673,-2.24563 -4.73683,-2.24728 -1.92681,-0.002 -3.63969,0.86865 -4.74061,2.22516 -1.09859,-1.35838 -2.80999,-2.23161 -4.73683,-2.23325 z"
+       style="fill:#eef4f3;fill-opacity:1;fill-rule:evenodd;stroke:#4c6f0f;stroke-width:1.62983214999999992;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+    <path
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#4c6f0f;stroke-width:1.62999999999999967;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 340.73707,540.8274 21.38024,0.0183"
+       id="path4436"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>

=== modified file 'debian/unity-lens-cooking.install'
--- debian/unity-lens-cooking.install	2012-04-06 14:37:30 +0000
+++ debian/unity-lens-cooking.install	2012-05-22 20:35:21 +0000
@@ -1,15 +1,18 @@
 build/share/unity/lenses/cooking/cooking.lens /usr/share/unity/lenses/cooking
 cooking.svg /usr/share/unity/lenses/cooking
 recipefy.png /usr/share/unity/lenses/cooking/icons
+chefkoch.svg /usr/share/unity/lenses/cooking/icons
 gourmet.png /usr/share/unity/lenses/cooking/icons
 cuisine.png /usr/share/unity/lenses/cooking/icons
+unity-lens-cooking /usr/share/unity/lenses/cooking
+unity-lens-cooking.service /usr/share/dbus-1/services
 recipefy.scope /usr/share/unity/lenses/cooking
-unity-lens-cooking /usr/share/unity/lenses/cooking
 unity-scope-recipefy /usr/share/unity/lenses/cooking
-unity-lens-cooking.service /usr/share/dbus-1/services
 unity-scope-recipefy.service /usr/share/dbus-1/services
+chefkoch.scope /usr/share/unity/lenses/cooking
+unity-scope-chefkoch /usr/share/unity/lenses/cooking
+unity-scope-chefkoch.service /usr/share/dbus-1/services
+gourmet.scope /usr/share/unity/lenses/cooking
 unity-scope-gourmet /usr/share/unity/lenses/cooking
 unity-scope-gourmet.service /usr/share/dbus-1/services
-gourmet.scope /usr/share/unity/lenses/cooking
 build/mo/* /usr/share/locale
-

=== modified file 'setup.py'
--- setup.py	2012-04-04 20:42:32 +0000
+++ setup.py	2012-05-22 20:35:21 +0000
@@ -14,10 +14,17 @@
      ['unity-lens-cooking',
       'unity-scope-gourmet',
       'unity-scope-recipefy',
-      'cooking.svg',]),
+      'unity-scope-chefkoch',
+      'chefkoch.svg',
+      'cooking.svg',
+      'cuisine.png',
+      'gourmet.png',
+      ]),
     ('share/dbus-1/services',
      ['unity-lens-cooking.service',
       'unity-scope-gourmet.service',
-      'unity-scope-recipefy.service',]),
+      'unity-scope-recipefy.service',
+      'unity-scope-chefkoch.service',
+      ]),
     ], cmdclass={"build":  build_extra.build_extra,
                  "build_i18n": build_i18n.build_i18n,})

=== modified file 'unity-lens-cooking'
--- unity-lens-cooking	2012-04-05 14:39:09 +0000
+++ unity-lens-cooking	2012-05-22 20:35:21 +0000
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 # -*- coding: utf-8 -*-
-# Copyright 2012 Eduard Gotwig
+# Copyright 2012 Eduard Gotwig, Frederik Elwert <[e-mail]>
 # License: GPLv3
 
 from gi.repository import GLib, GObject, Gio
@@ -23,8 +23,9 @@
 # Translatable strings
 
 
-ONLINE = _("Recipefy Recipes")
-LOCAL = _("Gourmet Recipes")
+RECIPEFY = _("Recipefy Recipes")
+CHEFKOCH = _("Chefkoch Recipes")
+GOURMET = _("Gourmet Recipes")
 
 LIKES = _("Likes")
 TIME = _("Time")
@@ -60,8 +61,9 @@
 		### Then, we populate the categories
 		cats = []
 		# A category is a display name, an icon and a renderer
-		cats.append (Unity.Category.new (ONLINE,Gio.ThemedIcon.new("/usr/share/unity/lenses/cooking/icons/recipefy.png"),Unity.CategoryRenderer.HORIZONTAL_TILE))
-		cats.append (Unity.Category.new (LOCAL,Gio.ThemedIcon.new("/usr/share/unity/lenses/cooking/icons/gourmet.png"),Unity.CategoryRenderer.HORIZONTAL_TILE))
+		cats.append (Unity.Category.new (RECIPEFY,Gio.ThemedIcon.new("/usr/share/unity/lenses/cooking/icons/recipefy.png"),Unity.CategoryRenderer.HORIZONTAL_TILE))
+		cats.append (Unity.Category.new (CHEFKOCH,Gio.ThemedIcon.new("/usr/share/unity/lenses/cooking/icons/chefkoch.svg"),Unity.CategoryRenderer.HORIZONTAL_TILE))
+		cats.append (Unity.Category.new (GOURMET,Gio.ThemedIcon.new("/usr/share/unity/lenses/cooking/icons/gourmet.png"),Unity.CategoryRenderer.HORIZONTAL_TILE))
 		self._lens.props.categories = cats
 		### Populate filters NOT IN USE FOR NOW
 		"""filters = []

=== added file 'unity-scope-chefkoch'
--- unity-scope-chefkoch	1970-01-01 00:00:00 +0000
+++ unity-scope-chefkoch	2012-05-22 20:35:21 +0000
@@ -0,0 +1,131 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright 2012 Eduard Gotwig, Frederik Elwert <[e-mail]>
+# License: GPLv3
+
+from gi.repository import GLib, GObject, Gio
+from gi.repository import Dee
+from gi.repository import Unity
+import lxml.html
+import os
+import re
+import gettext
+import locale
+import sys
+
+APP_NAME="unity-lens-cooking"
+LOCAL_PATH="/usr/share/locale"
+
+gettext.bindtextdomain(APP_NAME, LOCAL_PATH)
+gettext.textdomain(APP_NAME)
+_ = gettext.gettext
+
+RUNNING     = _("Failed to own name %s. Bailing out. An other instance is already running!")
+
+FULLSTAR_RE = re.compile(r'suche-scrore-(\d).gif')
+HALFSTAR_RE = re.compile(r'suche-scrore-(\d)_(\d).gif')
+
+# The scope dbus id
+BUS_NAME = "net.launchpad.scope.cooking.chefkoch"
+
+class Daemon:
+    def __init__ (self):
+        # Create the scope (this matches the path defined in the .scope file)
+        self.scope = Unity.Scope.new ("/net/launchpad/scope/cooking/chefkoch")
+        # Is the scope searchable from the home dash?
+        self.scope.search_in_global = False
+        # Connect to the search changed signal (it is fired when the lens is opened for the first time, then for each search change)
+        self.scope.connect ("search-changed", self.on_search_changed)
+        # Listen to the lens filters
+        self.scope.connect ("filters-changed", lambda scope : scope.queue_search_changed(Unity.SearchType.DEFAULT))
+        # The scope is ready
+        self.scope.export()
+    # On each search change, this method is called
+    def on_search_changed (self, scope, search, search_type, cancellable):
+        # Get the search string
+        search_string = search.props.search_string.strip()
+        print "Search changed to \"%s\"" % search_string
+        # Get the Dee model (the database used by the lens to store and display search results)
+        model = search.props.results_model
+        # Empty the model
+        model.clear()
+        # Update the model
+        self.update_results_model (search_string, model)
+        # Signal to the lens that the search is finished (the spinning search icon stops)
+        search.finished()
+
+    # Update the model
+    def update_results_model(self, search, model):
+        self.chefkoch(search, model)
+
+    # This method sends the search string to chefkoch and brings back results
+    def chefkoch_search(self,search):
+        # Search for recipes over GET
+        url = ("http://www.chefkoch.de/rs/s0/%s/Rezepte.html" % (search))
+        print "Searching for Recipes at %s" % url
+        tree = lxml.html.parse(url)
+        tree.getroot().make_links_absolute()
+        items = tree.xpath("//table[@class='result']//tr[@bgcolor]")
+        print 'Got %d results' % len(items)
+        return items
+    # This method parses the results and adds them to the model
+    def chefkoch(self, search, model):
+        # Skip empty search
+        if not search:
+            print 'Empty search, skipping.'
+            return
+        # We iterate through each of the returned results
+        for i, item in enumerate(self.chefkoch_search(search)):
+            title = item.xpath("string(td[2]/a)")
+            icon =  item.xpath("td[1]/img/@src")[0]
+            if icon == 'http://cdn.chefkoch.de/img/no-image-rsmain.gif':
+                icon = '/usr/share/unity/lenses/cooking/icons/cuisine.png'
+            uri = item.xpath("td[2]/a/@href")[0]
+            stars = {0: '☆☆☆☆☆', 1: '✮☆☆☆☆', 2: '★☆☆☆☆', 3: '★✮☆☆☆', 4: '★★☆☆☆', 5: '★★✮☆☆', 6: '★★★☆☆', 7: '★★★✮☆', 8: '★★★★☆', 9: '★★★★✮', 10: '★★★★★'}
+            likes = 0
+            stars_img = item.xpath("td[3]/img/@src")[0]
+            result = FULLSTAR_RE.search(stars_img)
+            if result:
+                likes = int(result.group(1)) * 2
+            else:
+                result = HALFSTAR_RE.search(stars_img)
+                if result:
+                    likes = int(result.group(1)) * 2 + 1
+            time = item[3].text
+            difficulty = item[3].find('br').tail
+            comments = [stars[likes], time + ' ⌚ ', difficulty]
+            comment = ' | '.join(comments)
+
+            # If the uri seems valid, we add the results to the Dee model
+            if (uri.startswith("http://")):
+                # uri, icon, category (matching the order of the categories in the lens), mimetype, title, comment, drag and drop uri
+                model.append(uri, icon, 1, "text/html", title, comment, uri)
+                # We can append the same result to multiple models, just by changing the category
+
+if __name__ == "__main__":
+    # Check if we are running in a German locale. Otherwise, the results are
+    # rather useless, so don't create the daemon.
+    lang = locale.getdefaultlocale()[0]
+    if '_' in lang:
+        lang = lang.split('_', 1)[0]
+    if not lang == 'de':
+        raise SystemExit('No German locale, exiting chefkoch scope')
+    # The following lines take care of the Bus connexion.
+    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)", (BUS_NAME, 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, RUNNING % BUS_NAME
+        raise SystemExit (1)
+
+    daemon = Daemon()
+    GObject.MainLoop().run()

=== added file 'unity-scope-chefkoch.service'
--- unity-scope-chefkoch.service	1970-01-01 00:00:00 +0000
+++ unity-scope-chefkoch.service	2012-05-22 20:35:21 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=net.launchpad.scope.cooking.chefkoch
+Exec=/usr/share/unity/lenses/cooking/unity-scope-chefkoch

=== modified file 'unity-scope-gourmet'
--- unity-scope-gourmet	2012-04-07 23:41:13 +0000
+++ unity-scope-gourmet	2012-05-22 20:35:21 +0000
@@ -128,10 +128,10 @@
 				# uri, icon, category (matching the order of the categories in the lens), mimetype, title, comment, drag and drop uri
 				if row[14]:
 					open('/tmp/unity-scope-gourmet/icon' + str(i), 'wb').write(row[14])
-					model.append(uri, '/tmp/unity-scope-gourmet/icon' + str(i), 1, "text/html", title, comment, uri)
+					model.append(uri, '/tmp/unity-scope-gourmet/icon' + str(i), 2, "text/html", title, comment, uri)
 				else:
 					if os.path.exists('/tmp/unity-scope-gourmet/icon' + str(i)):	os.remove('/tmp/unity-scope-gourmet/icon' + str(i))
-					model.append(uri, '/usr/share/unity/lenses/cooking/icons/cuisine.png', 1, "text/html", title, comment, uri)
+					model.append(uri, '/usr/share/unity/lenses/cooking/icons/cuisine.png', 2, "text/html", title, comment, uri)
 					# We can append the same result to multiple models, just by changing the category
 				
 # The following lines take care of the Bus connexion.