From 27ef9ae477e33d8e449fcca5e230c1df554cc8ba Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Fri, 22 Feb 2013 13:54:16 +0100 Subject: [PATCH] [subtitle] add cd number --- modules/attilasub/pages.py | 6 ++++++ weboob/applications/suboob/suboob.py | 3 ++- weboob/capabilities/subtitle.py | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/attilasub/pages.py b/modules/attilasub/pages.py index 523b8f9b..f0222c64 100644 --- a/modules/attilasub/pages.py +++ b/modules/attilasub/pages.py @@ -57,6 +57,8 @@ class SubtitlesPage(BasePage): cols = self.parser.select(line,'td') traduced_title = self.parser.select(cols[0],'font',1).text.lower() original_title = self.parser.select(cols[1],'font',1).text.lower() + nb_cd = self.parser.select(cols[2],'font',1).text.strip() + nb_cd = int(nb_cd.split()[0]) traduced_title_words = traduced_title.split() original_title_words = original_title.split() @@ -70,6 +72,7 @@ class SubtitlesPage(BasePage): subtitle = Subtitle(id,name) subtitle.url = url subtitle.fps = 0 + subtitle.nb_cd = nb_cd subtitle.description = "no desc" return subtitle @@ -100,6 +103,8 @@ class SubtitlesPage(BasePage): traduced_title = " ".join(traduced_title_words) original_title = " ".join(original_title_words) + nb_cd = self.parser.select(cols[2],'font',1).text.strip() + nb_cd = int(nb_cd.split()[0]) name = "%s (%s)"%(original_title,traduced_title) href = self.parser.select(cols[3],'a',1).attrib.get('href','') url = "http://davidbillemont3.free.fr/%s"%href @@ -107,5 +112,6 @@ class SubtitlesPage(BasePage): subtitle = Subtitle(id,name) subtitle.url = url subtitle.fps = 0 + subtitle.nb_cd = nb_cd subtitle.description = "no desc" yield subtitle diff --git a/weboob/applications/suboob/suboob.py b/weboob/applications/suboob/suboob.py index 248364ff..419244e5 100644 --- a/weboob/applications/suboob/suboob.py +++ b/weboob/applications/suboob/suboob.py @@ -45,6 +45,7 @@ class SubtitleInfoFormatter(IFormatter): result += 'ID: %s\n' % obj.fullid result += 'URL: %s\n' % obj.url result += 'FPS: %s\n' % obj.fps + result += 'NB CD: %s\n' % obj.nb_cd result += '\n%sDescription%s\n' % (self.BOLD, self.NC) result += obj.description return result @@ -57,7 +58,7 @@ class SubtitleListFormatter(PrettyFormatter): return obj.name def get_description(self, obj): - return 'url : %s' % (obj.url) + return '%s CD ; url : %s' % (obj.nb_cd,obj.url) class Suboob(ReplApplication): diff --git a/weboob/capabilities/subtitle.py b/weboob/capabilities/subtitle.py index 39a3d2cb..3ec4557c 100644 --- a/weboob/capabilities/subtitle.py +++ b/weboob/capabilities/subtitle.py @@ -32,7 +32,8 @@ class Subtitle(CapBaseObject): name = StringField('Name of subtitle') url = StringField('Direct url to subtitle file') fps = StringField('Framerate of corresponding video') - description = StringField('Description of corresponding video') + nb_cd = StringField('Number of cd') + description=StringField('Description of corresponding video') def __init__(self, id, name): CapBaseObject.__init__(self, id)