From 39c33eb4827ba8aca9248c40dab5bd4be2c03fe0 Mon Sep 17 00:00:00 2001
From: Nitzo <nitzo2001@yahoo.com>
Date: Tue, 23 Feb 2016 03:13:52 +0200
Subject: [GoogledriveCom] Update

---
 module/plugins/hoster/GoogledriveCom.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'module/plugins/hoster')

diff --git a/module/plugins/hoster/GoogledriveCom.py b/module/plugins/hoster/GoogledriveCom.py
index 617a56c54..afe7f1fb8 100644
--- a/module/plugins/hoster/GoogledriveCom.py
+++ b/module/plugins/hoster/GoogledriveCom.py
@@ -13,7 +13,7 @@ from module.plugins.internal.misc import html_unescape
 class GoogledriveCom(SimpleHoster):
     __name__    = "GoogledriveCom"
     __type__    = "hoster"
-    __version__ = "0.20"
+    __version__ = "0.21"
     __status__  = "testing"
 
     __pattern__ = r'https?://(?:www\.)?(drive|docs)\.google\.com/(file/d/\w+|uc\?.*id=)'
@@ -31,8 +31,6 @@ class GoogledriveCom(SimpleHoster):
     NAME_PATTERN    = r'(?:<title>|class="uc-name-size".*>)(?P<N>.+?)(?: - Google Drive</title>|</a> \()'
     OFFLINE_PATTERN = r'align="center"><p class="errorMessage"'
 
-    LINK_FREE_PATTERN = r'"([^"]+uc\?.*?)"'
-
 
     def setup(self):
         self.multiDL         = True
@@ -42,16 +40,15 @@ class GoogledriveCom(SimpleHoster):
 
     def handle_free(self, pyfile):
         for _i in xrange(2):
-            m = re.search(self.LINK_FREE_PATTERN, self.data)
+            m = re.search(r'"([^"]+uc\?.*?)"', self.data)
 
             if m is None:
                 return
 
             link = self.fixurl(m.group(1), "https://docs.google.com/")
-            dl   = self.isresource(link)
 
-            if dl:
-                self.link = dl
+            if re.search(r'/uc\?.*&confirm=', link):
+                self.link = link
                 return
             else:
                 self.data = self.load(link)
-- 
cgit v1.2.3