From 205ffd02517fb8f8c787ba4cb4cb733b8f6b7249 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 13 Mar 2013 18:01:23 +0100 Subject: [PATCH] [qcineoob] role list imported from cineoob [imdb] if birth date isn't complete => NotAvailable --- modules/imdb/pages.py | 8 ++------ weboob/applications/cineoob/cineoob.py | 6 +++--- weboob/applications/qcineoob/movie.py | 5 ++++- weboob/applications/qcineoob/person.py | 5 ++++- weboob/applications/qcineoob/ui/movie.ui | 10 ---------- weboob/applications/qcineoob/ui/person.ui | 10 ---------- 6 files changed, 13 insertions(+), 31 deletions(-) diff --git a/modules/imdb/pages.py b/modules/imdb/pages.py index dbaccd96..c9e2507f 100644 --- a/modules/imdb/pages.py +++ b/modules/imdb/pages.py @@ -158,12 +158,8 @@ class PersonPage(BasePage): times = self.parser.select(td_overview,'time[itemprop=birthDate]') if len(times) > 0: time = times[0].attrib.get('datetime','').split('-') - if len(time) == 2: - time.append('1') - elif len(time) == 1: - time.append('1') - time.append('1') - birth_date = datetime(int(time[0]),int(time[1]),int(time[2])) + if len(time) == 3 and int(time[0]) >= 1900: + birth_date = datetime(int(time[0]),int(time[1]),int(time[2])) dtimes = self.parser.select(td_overview,'time[itemprop=deathDate]') if len(dtimes) > 0: dtime = dtimes[0].attrib.get('datetime','').split('-') diff --git a/weboob/applications/cineoob/cineoob.py b/weboob/applications/cineoob/cineoob.py index 84859b83..4c5f5e41 100644 --- a/weboob/applications/cineoob/cineoob.py +++ b/weboob/applications/cineoob/cineoob.py @@ -35,6 +35,8 @@ from weboob.core import CallErrors __all__ = ['Cineoob'] +ROLE_LIST = ['actor','director','writer','composer','producer'] +COUNTRY_LIST = ['us','fr','de','jp'] class MovieInfoFormatter(IFormatter): MANDATORY_FIELDS = ('id', 'original_title', 'release_date', 'other_titles', 'duration', 'pitch', 'note', 'roles', 'country') @@ -202,13 +204,11 @@ class Cineoob(ReplApplication): 'search_movie_subtitle': 'subtitle_list', 'info_subtitle': 'subtitle_info' } - ROLE_LIST = ['actor','director','writer','composer','producer'] - COUNTRY_LIST = ['us','fr','de','jp'] def complete_filmography(self, text, line, *ignored): args = line.split(' ') if len(args) == 3: - return self.ROLE_LIST + return ROLE_LIST def complete_casting(self, text, line, *ignored): return self.complete_filmography(text,line,ignored) diff --git a/weboob/applications/qcineoob/movie.py b/weboob/applications/qcineoob/movie.py index 2960b70f..d1866107 100644 --- a/weboob/applications/qcineoob/movie.py +++ b/weboob/applications/qcineoob/movie.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Julien Veyssier +# Copyright(C) 2010-2011 Romain Bignon # # This file is part of weboob. # @@ -25,6 +25,7 @@ from PyQt4.QtGui import QFrame, QImage, QPixmap from weboob.applications.qcineoob.ui.movie_ui import Ui_Movie from weboob.capabilities.base import NotAvailable from weboob.applications.suboob.suboob import LANGUAGE_CONV +from weboob.applications.cineoob.cineoob import ROLE_LIST class Movie(QFrame): def __init__(self, movie, backend, parent=None): @@ -57,6 +58,8 @@ class Movie(QFrame): self.ui.pitchPlain.setPlainText('%s'%movie.pitch) self.ui.countryLabel.setText('%s'%movie.country) self.ui.noteLabel.setText('%s'%movie.note) + for role in ROLE_LIST: + self.ui.castingCombo.addItem('%ss'%role) self.ui.verticalLayout.setAlignment(Qt.AlignTop) self.ui.verticalLayout_2.setAlignment(Qt.AlignTop) diff --git a/weboob/applications/qcineoob/person.py b/weboob/applications/qcineoob/person.py index 2046d2ce..ba3eaf9f 100644 --- a/weboob/applications/qcineoob/person.py +++ b/weboob/applications/qcineoob/person.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright(C) 2013 Julien Veyssier +# Copyright(C) 2010-2011 Romain Bignon # # This file is part of weboob. # @@ -24,6 +24,7 @@ from PyQt4.QtGui import QFrame, QImage, QPixmap, QApplication from weboob.applications.qcineoob.ui.person_ui import Ui_Person from weboob.capabilities.base import NotAvailable +from weboob.applications.cineoob.cineoob import ROLE_LIST class Person(QFrame): def __init__(self, person, backend, parent=None): @@ -49,6 +50,8 @@ class Person(QFrame): else: self.ui.deathDateLabel.parent().hide() self.ui.shortBioPlain.setPlainText('%s'%person.short_biography) + for role in ROLE_LIST: + self.ui.filmographyCombo.addItem(role) self.ui.verticalLayout_2.setAlignment(Qt.AlignTop) def gotThumbnail(self): diff --git a/weboob/applications/qcineoob/ui/movie.ui b/weboob/applications/qcineoob/ui/movie.ui index 78c2e50b..6399fbd3 100644 --- a/weboob/applications/qcineoob/ui/movie.ui +++ b/weboob/applications/qcineoob/ui/movie.ui @@ -83,16 +83,6 @@ all - - - actors - - - - - directors - - diff --git a/weboob/applications/qcineoob/ui/person.ui b/weboob/applications/qcineoob/ui/person.ui index a926f535..3e53f736 100644 --- a/weboob/applications/qcineoob/ui/person.ui +++ b/weboob/applications/qcineoob/ui/person.ui @@ -67,16 +67,6 @@ filmography all - - - actor - - - - - director - -