Merge pull request #1 from pyload/stable

Merge

1 files changed, 22 insertions, 16 deletions

diff --git a/module/plugins/hoster/TwoSharedCom.py b/module/plugins/hoster/TwoSharedCom.py
index 7881ca098..1dd67f974 100644
--- a/module/plugins/hoster/TwoSharedCom.py
+++ b/module/plugins/hoster/TwoSharedCom.py
@@ -6,29 +6,35 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class TwoSharedCom(SimpleHoster):
-    __name__ = "TwoSharedCom"
-    __type__ = "hoster"
-    __pattern__ = r'http://(?:www\.)?2shared.com/(account/)?(download|get|file|document|photo|video|audio)/.*'
-    __version__ = "0.11"
+    __name__    = "TwoSharedCom"
+    __type__    = "hoster"
+    __version__ = "0.12"
+
+    __pattern__ = r'http://(?:www\.)?2shared\.com/(account/)?(download|get|file|document|photo|video|audio)/.+'
+
     __description__ = """2Shared.com hoster plugin"""
-    __author_name__ = "zoidberg"
-    __author_mail__ = "zoidberg@mujmail.cz"
+    __license__     = "GPLv3"
+    __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
+
+
+    NAME_PATTERN = r'<h1>(?P<N>.*)</h1>'
+    SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted\.'
+
+    LINK_PATTERN = r'window.location =\'(.+?)\';'
 
-    FILE_NAME_PATTERN = r'<h1>(?P<N>.*)</h1>'
-    FILE_SIZE_PATTERN = r'<span class="dtitle">File size:</span>\s*(?P<S>[0-9,.]+) (?P<U>[kKMG])i?B'
-    FILE_OFFLINE_PATTERN = r'The file link that you requested is not valid\.|This file was deleted\.'
-    DOWNLOAD_URL_PATTERN = r"window.location ='([^']+)';"
 
     def setup(self):
-        self.resumeDownload = self.multiDL = True
+        self.resumeDownload = True
+        self.multiDL        = True
+
 
     def handleFree(self):
-        found = re.search(self.DOWNLOAD_URL_PATTERN, self.html)
-        if not found:
-            self.parseError('Download link')
-        link = found.group(1)
-        self.logDebug("Download URL %s" % link)
+        m = re.search(self.LINK_PATTERN, self.html)
+        if m is None:
+            self.error(_("Download link"))
 
+        link = m.group(1)
         self.download(link)