move id2url to Video class

weboob/backends/youporn/backend.py

@@ -45,13 +45,6 @@ class YoupornBackend(BaseBackend, ICapVideoProvider):
             return self._browser
         raise AttributeError, name
 
-    @classmethod
-    def id2url(cls, _id):
-        if isinstance(_id, int) or isinstance(_id, (str,unicode)) and _id.isdigit():
-            return 'http://www.youporn.com/watch/%d' % int(_id)
-        else:
-            return str(_id)
-
     def need_url(func):
         def inner(self, *args, **kwargs):
             url = args[0]

weboob/backends/youporn/browser.py

@@ -22,9 +22,9 @@ import urllib
 
 from weboob.tools.browser import BaseBrowser
 
-from . import tools
 from .pages.index import IndexPage
 from .pages.video import VideoPage
+from .video import YoupornVideo
 
 
 __all__ = ['YoupornBrowser']
@@ -53,5 +53,5 @@ class YoupornBrowser(BaseBrowser):
         return self.page.iter_videos()
 
     def get_video(self, _id):
-        self.location(tools.id2url(_id))
+        self.location(YoupornVideo.id2url(_id))
         return self.page.video

weboob/backends/youporn/pages/index.py

@@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
 
-from weboob.capabilities.video import Video
-
-from .. import tools
 from .base import PornPage
+from ..video import YoupornVideo
 
 
 __all__ = ['IndexPage']
@@ -66,11 +64,10 @@ class IndexPage(PornPage):
                     rating = float(p.text.strip())
                     rating_max = float(p.find('span').text.strip()[2:])
 
-                yield Video(int(_id),
-                            title=title,
-                            rating=rating,
-                            rating_max=rating_max,
-                            duration=duration,
-                            thumbnail_url=thumbnail_url,
-                            nsfw=True,
-                            id2url=tools.id2url)
+                yield YoupornVideo(int(_id),
+                                   title=title,
+                                   rating=rating,
+                                   rating_max=rating_max,
+                                   duration=duration,
+                                   thumbnail_url=thumbnail_url,
+                                   nsfw=True)

weboob/backends/youporn/pages/video.py

@@ -23,7 +23,7 @@ import datetime
 from logging import warning
 
 from .base import PornPage
-from weboob.capabilities.video import Video
+from ..video import YoupornVideo
 
 class VideoPage(PornPage):
     URL_REGEXP = re.compile("https?://[w\.]*youporn.com/watch/(\d+)/?.*")
@@ -32,10 +32,10 @@ class VideoPage(PornPage):
         if not PornPage.on_loaded(self):
             return
 
-        self.video = Video(self.get_id(),
-                           self.get_title(),
-                           self.get_url(),
-                           nsfw=True)
+        self.video = YoupornVideo(self.get_id(),
+                                  self.get_title(),
+                                  self.get_url(),
+                                  nsfw=True)
 
         self.set_details(self.video)
 

weboob/backends/youporn/video.py

@@ -18,8 +18,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """
 
-def id2url(_id):
-    if isinstance(_id, int) or isinstance(_id, (str,unicode)) and _id.isdigit():
-        return 'http://www.youporn.com/watch/%d' % int(_id)
-    else:
-        return str(_id)
+from weboob.capabilities.video import BaseVideo
+
+class YoupornVideo(BaseVideo):
+    @classmethod
+    def id2url(cls, _id):
+        if isinstance(_id, int) or isinstance(_id, (str,unicode)) and _id.isdigit():
+            return 'http://www.youporn.com/watch/%d' % int(_id)
+        else:
+            return str(_id)