From 7996c1e05a8993aeee9b115e0ba92245d7dd08be Mon Sep 17 00:00:00 2001
From: Christophe Benz <christophe.benz@gmail.com>
Date: Mon, 26 Apr 2010 19:22:45 +0200
Subject: [PATCH] remove page_url attribue, better check types for numbers

---
 weboob/backends/youjizz/pages/index.py |  1 -
 weboob/backends/youporn/pages/index.py |  1 -
 weboob/capabilities/video.py           | 12 ++++++------
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/weboob/backends/youjizz/pages/index.py b/weboob/backends/youjizz/pages/index.py
index 4842318c..1f2aa018 100644
--- a/weboob/backends/youjizz/pages/index.py
+++ b/weboob/backends/youjizz/pages/index.py
@@ -57,7 +57,6 @@ class IndexPage(BasePage):
 
             yield Video(_id,
                         title=title,
-                        page_url=self.browser.id2url(_id),
                         duration=duration,
                         preview_url=preview_url,
                         nsfw=True)
diff --git a/weboob/backends/youporn/pages/index.py b/weboob/backends/youporn/pages/index.py
index 011ca3bb..d8369d3d 100644
--- a/weboob/backends/youporn/pages/index.py
+++ b/weboob/backends/youporn/pages/index.py
@@ -67,7 +67,6 @@ class IndexPage(PornPage):
 
                 yield Video(int(_id),
                             title=title,
-                            page_url=self.browser.id2url(_id),
                             rating=rating,
                             rating_max=rating_max,
                             duration=duration,
diff --git a/weboob/capabilities/video.py b/weboob/capabilities/video.py
index dbdb59ea..44e7dd74 100644
--- a/weboob/capabilities/video.py
+++ b/weboob/capabilities/video.py
@@ -25,23 +25,23 @@ __all__ = ['ICapVideoProvider', 'Video']
 
 
 class Video(object):
-    def __init__(self, _id, title=u'', url=u'', page_url=u'', author=u'', duration=0, date=None,
-            rating=0, rating_max=0, preview_url=None, nsfw=False):
+    def __init__(self, _id, title=None, url=None, author=None, duration=0, date=None,
+            rating=0.0, rating_max=0.0, preview_url=None, nsfw=False):
         self.id = _id
         self.title = title
         self.url = url
-        self.page_url = page_url
         self.author = author
-        self.duration = duration
+        self.duration = int(duration)
         self.date = date
-        self.rating = rating
-        self.rating_max = rating_max
+        self.rating = float(rating)
+        self.rating_max = float(rating_max)
         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()