From 9fe80530529d4d358aaa93782a5243f3cfaa61f0 Mon Sep 17 00:00:00 2001 From: Christophe Benz Date: Mon, 26 Apr 2010 19:21:58 +0200 Subject: [PATCH] simplify search command code --- weboob/capabilities/video.py | 3 +++ weboob/frontends/videoob/application.py | 11 ++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/weboob/capabilities/video.py b/weboob/capabilities/video.py index dff5f963..dbdb59ea 100644 --- a/weboob/capabilities/video.py +++ b/weboob/capabilities/video.py @@ -39,6 +39,9 @@ class Video(object): self.preview_url = preview_url self.nsfw = nsfw + @property + def formatted_duration(self): + return '%d:%02d:%02d' % (self.duration / 3600, (self.duration % 3600 / 60), self.duration % 60) class ICapVideoProvider(ICap): def iter_page_urls(self, mozaic_url): raise NotImplementedError() diff --git a/weboob/frontends/videoob/application.py b/weboob/frontends/videoob/application.py index a0859061..367b7d8b 100644 --- a/weboob/frontends/videoob/application.py +++ b/weboob/frontends/videoob/application.py @@ -67,15 +67,8 @@ class Videoob(ConsoleApplication): results['BEFORE'] = u'Last videos' results['HEADER'] = ('ID', 'Title', 'Duration') for backend in self.weboob.iter_backends(): - try: - iterator = backend.iter_search_results(pattern) - except NotImplementedError: - continue - else: - rows = [] - for video in iterator: - rows.append((video.id, video.title, '%d:%02d:%02d' % (video.duration/3600, (video.duration%3600/60), video.duration%60))) - results[backend.name] = rows + results[backend.name] = [(video.id, video.title, video.formatted_duration) for video in + backend.iter_search_results(pattern=pattern)] return results @ConsoleApplication.command('Get video file URL from page URL')