diff options
Diffstat (limited to 'module/plugins/hoster/VeehdCom.py')
| -rw-r--r-- | module/plugins/hoster/VeehdCom.py | 34 | 
1 files changed, 18 insertions, 16 deletions
| diff --git a/module/plugins/hoster/VeehdCom.py b/module/plugins/hoster/VeehdCom.py index 22fc4b207..66c258439 100644 --- a/module/plugins/hoster/VeehdCom.py +++ b/module/plugins/hoster/VeehdCom.py @@ -1,20 +1,24 @@  # -*- coding: utf-8 -*-  import re +  from module.plugins.Hoster import Hoster  class VeehdCom(Hoster): -    __name__ = 'VeehdCom' -    __type__ = 'hoster' +    __name__ = "VeehdCom" +    __type__ = "hoster" +    __version__ = "0.23" +      __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.23' +      __description__ = """Veehd.com hoster plugin"""      __author_name__ = "cat"      __author_mail__ = "cat@pyload" +      def _debug(self, msg):          self.logDebug('[%s] %s' % (self.__name__, msg)) @@ -36,7 +40,7 @@ class VeehdCom(Hoster):          self.html = self.load(url)      def file_exists(self): -        if self.html is None: +        if not self.html:              self.download_html()          if '<title>Veehd</title>' in self.html: @@ -44,13 +48,14 @@ class VeehdCom(Hoster):          return True      def get_file_name(self): -        if self.html is None: +        if not self.html:              self.download_html() -        match = re.search(r'<title[^>]*>([^<]+) on Veehd</title>', self.html) -        if not match: +        m = re.search(r'<title[^>]*>([^<]+) on Veehd</title>', self.html) +        if m is None:              self.fail("video title not found") -        name = match.group(1) + +        name = m.group(1)          # replace unwanted characters in filename          if self.getConfig('filename_spaces'): @@ -58,20 +63,17 @@ class VeehdCom(Hoster):          else:              pattern = '[^0-9A-Za-z\.]+' -        name = re.sub(pattern, self.getConfig('replacement_char'), -                      name) -        return name + '.avi' +        return re.sub(pattern, self.getConfig('replacement_char'), name) + '.avi'      def get_file_url(self):          """ returns the absolute downloadable filepath          """ -        if self.html is None: +        if not self.html:              self.download_html() -        match = re.search(r'<embed type="video/divx" src="(http://([^/]*\.)?veehd\.com/dl/[^"]+)"', +        m = re.search(r'<embed type="video/divx" src="(http://([^/]*\.)?veehd\.com/dl/[^"]+)"',                            self.html) -        if not match: +        if m is None:              self.fail("embedded video url not found") -        file_url = match.group(1) -        return file_url +        return m.group(1) | 
