summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/GoogledriveCom.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/GoogledriveCom.py')
-rw-r--r--module/plugins/hoster/GoogledriveCom.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py
index 1c33a1e4e..903b5361e 100644
--- a/module/plugins/hoster/GoogledriveCom.py
+++ b/module/plugins/hoster/GoogledriveCom.py
@@ -13,7 +13,8 @@ from module.utils import html_unescape
class GoogledriveCom(SimpleHoster):
__name__ = "GoogledriveCom"
__type__ = "hoster"
- __version__ = "0.12"
+ __version__ = "0.14"
+ __status__ = "testing"
__pattern__ = r'https?://(?:www\.)?(drive|docs)\.google\.com/(file/d/\w+|uc\?.*id=)'
__config__ = [("use_premium", "bool", "Use premium account if available", True)]
@@ -23,8 +24,6 @@ class GoogledriveCom(SimpleHoster):
__authors__ = [("zapp-brannigan", "fuerst.reinje@web.de")]
- DISPOSITION = False #: Remove in 0.4.10
-
NAME_PATTERN = r'(?:<title>|class="uc-name-size".*>)(?P<N>.+?)(?: - Google Drive</title>|</a> \()'
OFFLINE_PATTERN = r'align="center"><p class="errorMessage"'
@@ -33,11 +32,11 @@ class GoogledriveCom(SimpleHoster):
def setup(self):
self.multiDL = True
- self.resumeDownload = True
- self.chunkLimit = 1
+ self.resume_download = True
+ self.chunk_limit = 1
- def handleFree(self, pyfile):
+ def handle_free(self, pyfile):
for _i in xrange(2):
m = re.search(self.LINK_FREE_PATTERN, self.html)
@@ -49,9 +48,9 @@ class GoogledriveCom(SimpleHoster):
if not urlparse.urlparse(link).scheme:
link = urlparse.urljoin("https://docs.google.com/", link)
- direct_link = self.directLink(link, False)
+ direct_link = self.direct_link(link, False)
if not direct_link:
- self.html = self.load(link, decode=True)
+ self.html = self.load(link)
else:
self.link = direct_link
break