diff --git a/modules/imdb/pages.py b/modules/imdb/pages.py index 9262d6e5..ab03563b 100644 --- a/modules/imdb/pages.py +++ b/modules/imdb/pages.py @@ -30,13 +30,18 @@ __all__ = ['MoviePage','PersonPage','MovieCrewPage'] class MoviePage(BasePage): + ''' Page describing a movie, only used to go on the MovieCrewPage + ''' def iter_persons(self,id): self.browser.location('http://www.imdb.com/title/%s/fullcredits'%id) assert self.browser.is_on_page(MovieCrewPage) for p in self.browser.page.iter_persons(): yield p + class MovieCrewPage(BasePage): + ''' Page listing all the persons related to a movie + ''' def iter_persons(self): tables = self.parser.select(self.document.getroot(),'table.cast') if len(tables) > 0: @@ -48,6 +53,9 @@ class MovieCrewPage(BasePage): class PersonPage(BasePage): + ''' Page giving informations about a person + It is used to build a Person instance and to get the movie list related to a person + ''' def get_person(self,id): name = NotAvailable biography = NotAvailable @@ -80,7 +88,6 @@ class PersonPage(BasePage): person.gender = gender person.nationality = nationality person.biography = biography - person.awards = ["aw1","aw2"] person.roles = {} return person diff --git a/weboob/applications/cineoob/cineoob.py b/weboob/applications/cineoob/cineoob.py index 135fc63b..12ddd26d 100644 --- a/weboob/applications/cineoob/cineoob.py +++ b/weboob/applications/cineoob/cineoob.py @@ -98,16 +98,17 @@ def num_years(begin, end=None): return num_years class PersonInfoFormatter(IFormatter): - MANDATORY_FIELDS = ('id', 'name', 'real_name', 'birth_date', 'birth_place', 'gender', 'nationality', 'biography', 'awards','roles') + MANDATORY_FIELDS = ('id', 'name', 'real_name', 'birth_date', 'birth_place', 'gender', 'nationality', 'biography', 'roles') def format_obj(self, obj, alias): result = u'%s%s%s\n' % (self.BOLD, obj.name, self.NC) result += 'ID: %s\n' % obj.fullid result += 'Real name: %s\n' % obj.real_name - result += 'Birth date: %s\n' % obj.birth_date if obj.birth_date != NotAvailable: + result += 'Birth date: %s\n' % obj.birth_date.strftime('%Y-%m-%d') age = num_years(obj.birth_date) else: + result += 'Birth date: %s\n' % obj.birth_date age = NotAvailable result += 'Age: %s\n' % age result += 'Birth place: %s\n' % obj.birth_place @@ -119,10 +120,6 @@ class PersonInfoFormatter(IFormatter): result += ' -- %s\n' % role for movie in lmovies: result += ' * %s\n' % movie.original_title - if obj.awards: - result += '\n%sAwards%s\n' % (self.BOLD, self.NC) - for a in obj.awards: - result += ' * %s\n' % a result += '\n%sBiography%s\n' % (self.BOLD, self.NC) result += '%s'%obj.biography return result @@ -170,7 +167,7 @@ class Cineoob(ReplApplication): def do_info_movie(self, id): """ - info_movie ID + info_movie movie_ID Get information about a movie. """ @@ -186,7 +183,7 @@ class Cineoob(ReplApplication): def do_info_person(self, id): """ - info_person ID + info_person person_ID Get information about a person. """ @@ -202,7 +199,7 @@ class Cineoob(ReplApplication): def do_search_movie(self, pattern): """ - search [PATTERN] + search_movie [PATTERN] Search movies. """ @@ -217,7 +214,7 @@ class Cineoob(ReplApplication): def do_search_person(self, pattern): """ - search [PATTERN] + search_person [PATTERN] Search persons. """ @@ -232,7 +229,7 @@ class Cineoob(ReplApplication): def do_casting(self, movie_id): """ - casting movie_id + casting movie_ID List persons related to a movie. """ @@ -248,7 +245,7 @@ class Cineoob(ReplApplication): def do_filmography(self, person_id): """ - filmography person_id + filmography person_ID List movies of a person. """ diff --git a/weboob/capabilities/cinema.py b/weboob/capabilities/cinema.py index 57b85e7e..b9b17904 100644 --- a/weboob/capabilities/cinema.py +++ b/weboob/capabilities/cinema.py @@ -53,7 +53,6 @@ class Person(CapBaseObject): gender = StringField('Gender of a person') nationality = StringField('Nationality of a person') biography = StringField('Short biography of a person') - awards = Field('Awards won by the person',list) roles = Field('Lists of movies related to the person indexed by roles',dict) def __init__(self, id, name):