nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[allrecipes] times improvment, fix search string with spaces

Browse source
This commit is contained in:
Julien Veyssier 2013-03-30 14:31:34 +01:00
commit f14aeb1363
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/allrecipes/backend.py
View file

@ -22,6 +22,8 @@ from weboob.tools.backend import BaseBackend
from .browser import AllrecipesBrowser from .browser import AllrecipesBrowser
from urllib import quote_plus
__all__ = ['AllrecipesBackend'] __all__ = ['AllrecipesBackend']
@ -41,7 +43,7 @@ class AllrecipesBackend(BaseBackend, ICapRecipe):
return self.browser.get_recipe(id) return self.browser.get_recipe(id)
def iter_recipes(self, pattern): def iter_recipes(self, pattern):
return self.browser.iter_recipes(pattern.encode('utf-8')) return self.browser.iter_recipes(quote_plus(pattern.encode('utf-8')))
def fill_recipe(self, recipe, fields): def fill_recipe(self, recipe, fields):
if 'nb_person' in fields or 'instructions' in fields: if 'nb_person' in fields or 'instructions' in fields:

16
modules/allrecipes/pages.py
View file

@ -92,12 +92,24 @@ class RecipePage(BasePage):
instructions += '%s: %s\n' % (num_instr, inst.text_content()) instructions += '%s: %s\n' % (num_instr, inst.text_content())
num_instr += 1 num_instr += 1
prepmin = 0
emprep = self.parser.select(self.document.getroot(), 'span#prepHoursSpan em')
if len(emprep) > 0:
prepmin += int(emprep[0].text) * 60
emprep = self.parser.select(self.document.getroot(), 'span#prepMinsSpan em') emprep = self.parser.select(self.document.getroot(), 'span#prepMinsSpan em')
if len(emprep) > 0: if len(emprep) > 0:
preparation_time = int(emprep[0].text) prepmin += int(emprep[0].text)
if prepmin != 0:
preparation_time = prepmin
cookmin = 0
emcooktime = self.parser.select(self.document.getroot(), 'span#cookHoursSpan em')
if len(emcooktime) > 0:
cookmin += int(emcooktime[0].text) * 60
emcooktime = self.parser.select(self.document.getroot(), 'span#cookMinsSpan em') emcooktime = self.parser.select(self.document.getroot(), 'span#cookMinsSpan em')
if len(emcooktime) > 0: if len(emcooktime) > 0:
cooking_time = int(emcooktime[0].text) cookmin += int(emcooktime[0].text)
if cookmin != 0:
cooking_time = cookmin
l_nbpers = self.parser.select(self.document.getroot(), 'span#lblYield[itemprop=recipeYield]') l_nbpers = self.parser.select(self.document.getroot(), 'span#lblYield[itemprop=recipeYield]')
if len(l_nbpers) > 0: if len(l_nbpers) > 0:
nb_person = int(l_nbpers[0].text.split()[0]) nb_person = int(l_nbpers[0].text.split()[0])