diff options
| author |  Walter Purcaro <vuolter@gmail.com>
| 2014-09-07 23:40:50 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@gmail.com>
| 2014-09-14 10:58:42 +0200 |
| commit | 887ad58e4c6c20b992311bbdf931bcd18e73d384 (patch) | |
| tree | f31beb241bacca0bfea4c1acc4e9ace813755cef /module/plugins/hoster/XVideosCom.py | |
| parent | [AccountManager] Fixed #733 (diff) | |
| parent | [File4safe] distributing LINK_PATTERN (diff) | |
| download | pyload-887ad58e4c6c20b992311bbdf931bcd18e73d384.tar.xz | |
Merge branch 'stable' into 0.4.10
Conflicts:
module/plugins/Account.py
module/plugins/AccountManager.py
module/plugins/Hook.py
module/plugins/OCR.py
module/plugins/Plugin.py
module/plugins/PluginManager.py
module/plugins/ReCaptcha.py
module/plugins/accounts/Ftp.py
module/plugins/accounts/Http.py
module/plugins/internal/MultiHoster.py
module/plugins/ocr/GigasizeCom.py
module/plugins/ocr/LinksaveIn.py
module/plugins/ocr/NetloadIn.py
module/plugins/ocr/ShareonlineBiz.py
Diffstat (limited to 'module/plugins/hoster/XVideosCom.py')
| -rw-r--r-- | module/plugins/hoster/XVideosCom.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/module/plugins/hoster/XVideosCom.py b/module/plugins/hoster/XVideosCom.py index b2fa5243f..4f2611740 100644 --- a/module/plugins/hoster/XVideosCom.py +++ b/module/plugins/hoster/XVideosCom.py @@ -1,18 +1,23 @@ # -*- coding: utf-8 -*- import re -import urllib + +from urllib import unquote from module.plugins.Hoster import Hoster class XVideosCom(Hoster): __name__ = "XVideos.com" + __type__ = "hoster" __version__ = "0.1" + __pattern__ = r'http://(?:www\.)?xvideos\.com/video([0-9]+)/.*' + __description__ = """XVideos.com hoster plugin""" - __author_name__ = "" - __author_mail__ = "" + __author_name__ = None + __author_mail__ = None + def process(self, pyfile): site = self.load(pyfile.url) @@ -20,4 +25,4 @@ class XVideosCom(Hoster): re.search(r"<h2>([^<]+)<span", site).group(1), re.match(self.__pattern__, pyfile.url).group(1), ) - self.download(urllib.unquote(re.search(r"flv_url=([^&]+)&", site).group(1))) + self.download(unquote(re.search(r"flv_url=([^&]+)&", site).group(1))) |