From 7fa32641f04e93681d21f04022af673aa2c8c31a Mon Sep 17 00:00:00 2001 From: mkaay Date: Tue, 21 Dec 2010 18:20:30 +0100 Subject: new download backend: wrapped deferred, Request compatibility draft, other fixes added caution's fixes (VeehdCom, PornhubCom) --- module/plugins/hoster/PornhubCom.py | 16 ++++++-- module/plugins/hoster/VeehdCom.py | 80 +++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 module/plugins/hoster/VeehdCom.py (limited to 'module/plugins/hoster') diff --git a/module/plugins/hoster/PornhubCom.py b/module/plugins/hoster/PornhubCom.py index 2df7ba452..6afa9d295 100644 --- a/module/plugins/hoster/PornhubCom.py +++ b/module/plugins/hoster/PornhubCom.py @@ -8,7 +8,7 @@ class PornhubCom(Hoster): __name__ = "PornhubCom" __type__ = "hoster" __pattern__ = r'http://[\w\.]*?pornhub\.com/view_video\.php\?viewkey=[\w\d]+' - __version__ = "0.2" + __version__ = "0.3" __description__ = """Pornhub.com Download Hoster""" __author_name__ = ("jeix") __author_mail__ = ("jeix@hasnomail.de") @@ -48,10 +48,18 @@ class PornhubCom(Hoster): def get_file_name(self): if self.html is None: self.download_html() - - name = re.findall('

(.*?)

', self.html)[1] + ".flv" - return name + match = re.search(r']+>([^<]+) - ', self.html) + if match: + name = re.group(1) + else: + matches = re.findall('

(.*?)

', self.html) + if len(matches) > 1: + name = matches[1] + else: + name = matches[0] + + return name + '.flv' def file_exists(self): """ returns True or False diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py new file mode 100644 index 000000000..06e59c7fa --- /dev/null +++ b/module/plugins/hoster/VeehdCom.py @@ -0,0 +1,80 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- +import re +from module.plugins.Hoster import Hoster + +class VeehdCom(Hoster): + __name__ = 'VeehdCom' + __type__ = 'hoster' + __pattern__ = r'http://veehd\.com/video/\d+_\S+' + __config__ = [ + ('filename_spaces', 'bool', "Allow spaces in filename", 'False'), + ('replacement_char', 'str', "Filename replacement character", '_'), + ] + __version__ = '0.1' + __description__ = """Veehd.com Download Hoster""" + __author_name__ = ('cat') + __author_mail__ = ('cat@pyload') + + def _debug(self, msg): + self.log.debug('[%s] %s' % (self.__name__, msg)) + + def setup(self): + self.html = None + self.multiDL = True + self.req.canContinue = True + + def process(self, pyfile): + self.download_html() + if not self.file_exists(): + self.offline() + + pyfile.name = self.get_file_name() + self.download(self.get_file_url()) + + def download_html(self): + url = self.pyfile.url + self._debug("Requesting page: %s" % (repr(url),)) + self.html = self.load(url) + + def file_exists(self): + if self.html is None: + self.download_html() + + if 'Veehd' in self.html: + return False + return True + + def get_file_name(self): + if self.html is None: + self.download_html() + + match = re.search(r']*>([^<]+) on Veehd', self.html) + if not match: + self.fail("video title not found") + name = match.group(1) + + # replace unwanted characters in filename + if self.getConf('filename_spaces'): + pattern = '[^0-9A-Za-z\.\ ]+' + else: + pattern = '[^0-9A-Za-z\.]+' + + name = re.sub('[^0-9A-Za-z\.]+', self.getConf('replacement_char'), + name) + return name + '.avi' + + def get_file_url(self): + """ returns the absolute downloadable filepath + """ + if self.html is None: + self.download_html() + + match = re.search(r'