summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/VimeoCom.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/VimeoCom.py')
-rw-r--r--module/plugins/hoster/VimeoCom.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/module/plugins/hoster/VimeoCom.py b/module/plugins/hoster/VimeoCom.py
index 0e42c1674..a5196cb92 100644
--- a/module/plugins/hoster/VimeoCom.py
+++ b/module/plugins/hoster/VimeoCom.py
@@ -8,11 +8,12 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
class VimeoCom(SimpleHoster):
__name__ = "VimeoCom"
__type__ = "hoster"
- __version__ = "0.03"
+ __version__ = "0.04"
__pattern__ = r'https?://(?:www\.)?(player\.)?vimeo\.com/(video/)?(?P<ID>\d+)'
- __config__ = [("quality", "Lowest;Mobile;SD;HD;Highest", "Quality", "Highest"),
- ("original", "bool", "Try to download the original file first", True)]
+ __config__ = [("use_premium", "bool" , "Use premium account if available" , True ),
+ ("quality" , "Lowest;Mobile;SD;HD;Highest", "Quality" , "Highest"),
+ ("original" , "bool" , "Try to download the original file", True )]
__description__ = """Vimeo.com hoster plugin"""
__license__ = "GPLv3"
@@ -34,27 +35,26 @@ class VimeoCom(SimpleHoster):
self.chunkLimit = -1
- def handleFree(self):
+ def handleFree(self, pyfile):
password = self.getPassword()
if self.js and 'class="btn iconify_down_b"' in self.html:
- html = self.js.eval(self.load(self.pyfile.url, get={'action': "download", 'password': password}, decode=True))
+ html = self.js.eval(self.load(pyfile.url, get={'action': "download", 'password': password}, decode=True))
pattern = r'href="(?P<URL>http://vimeo\.com.+?)".*?\>(?P<QL>.+?) '
else:
- id = re.match(self.__pattern__, self.pyfile.url).group('ID')
- html = self.load("https://player.vimeo.com/video/" + id, get={'password': password})
+ html = self.load("https://player.vimeo.com/video/" + self.info['pattern']['ID'], get={'password': password})
pattern = r'"(?P<QL>\w+)":{"profile".*?"(?P<URL>http://pdl\.vimeocdn\.com.+?)"'
- link = dict([(l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html)])
+ link = dict((l.group('QL').lower(), l.group('URL')) for l in re.finditer(pattern, html))
- if self.getConfig("original"):
+ if self.getConfig('original'):
if "original" in link:
- self.download(link[q])
+ self.link = link[q]
return
else:
self.logInfo(_("Original file not downloadable"))
- quality = self.getConfig("quality")
+ quality = self.getConfig('quality')
if quality == "Highest":
qlevel = ("hd", "sd", "mobile")
elif quality == "Lowest":
@@ -64,7 +64,7 @@ class VimeoCom(SimpleHoster):
for q in qlevel:
if q in link:
- self.download(link[q])
+ self.link = link[q]
return
else:
self.logInfo(_("No %s quality video found") % q.upper())