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

[cookboob] cap/app modified to handle interval number of persons

Browse source
This commit is contained in:
Julien Veyssier 2013-03-30 15:02:56 +01:00
commit 06b670af47
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
weboob/applications/cookboob/cookboob.py
View file

@ -43,7 +43,10 @@ class RecipeInfoFormatter(IFormatter):
if not empty(obj.cooking_time): if not empty(obj.cooking_time):
result += 'Cooking time: %smin\n' % obj.cooking_time result += 'Cooking time: %smin\n' % obj.cooking_time
if not empty(obj.nb_person): if not empty(obj.nb_person):
result += 'Amount of people: %s\n' % obj.nb_person nbstr = obj.nb_person[0]
if len(obj.nb_person) > 1:
nbstr += '/%s' % obj.nb_person[1]
result += 'Amount of people: %s\n' % nbstr
result += '\n%sIngredients%s\n' % (self.BOLD, self.NC) result += '\n%sIngredients%s\n' % (self.BOLD, self.NC)
for i in obj.ingredients: for i in obj.ingredients:
result += ' * %s\n' % i result += ' * %s\n' % i

10
weboob/capabilities/recipe.py
View file

@ -51,12 +51,12 @@ class Recipe(CapBaseObject):
thumbnail_url = StringField('Direct url to recipe thumbnail') thumbnail_url = StringField('Direct url to recipe thumbnail')
picture_url = StringField('Direct url to recipe picture') picture_url = StringField('Direct url to recipe picture')
short_description = StringField('Short description of a recipe') short_description = StringField('Short description of a recipe')
nb_person = IntField('The recipe was made for this amount of persons') nb_person = Field('The recipe was made for this amount of persons', list)
preparation_time = IntField('Preparation time of the recipe in minutes') preparation_time = IntField('Preparation time of the recipe in minutes')
cooking_time = IntField('Cooking time of the recipe in minutes') cooking_time = IntField('Cooking time of the recipe in minutes')
ingredients = Field('Ingredient list necessary for the recipe',list) ingredients = Field('Ingredient list necessary for the recipe', list)
instructions = StringField('Instruction step list of the recipe') instructions = StringField('Instruction step list of the recipe')
comments = Field('User comments about the recipe',list) comments = Field('User comments about the recipe', list)
def __init__(self, id, title): def __init__(self, id, title):
CapBaseObject.__init__(self, id) CapBaseObject.__init__(self, id)
@ -91,7 +91,9 @@ class Recipe(CapBaseObject):
eyield = ET.SubElement(desc, 'yield') eyield = ET.SubElement(desc, 'yield')
if not empty(self.nb_person): if not empty(self.nb_person):
amount = ET.SubElement(eyield, 'amount') amount = ET.SubElement(eyield, 'amount')
amount.text = '%s' % self.nb_person amount.text = '%s' % self.nb_person[0]
if len(self.nb_person) > 1:
amount.text += '/%s' % self.nb_person[1]
etype = ET.SubElement(eyield, 'type') etype = ET.SubElement(eyield, 'type')
etype.text = 'persons' etype.text = 'persons'
if not empty(self.preparation_time): if not empty(self.preparation_time):