From 93592862b520a862c01f80c019e5c4bc43746c19 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 5 Jul 2014 16:54:20 +0200
Subject: [SimpleHoster] Better inline docs + changed "FILE_OFFLINE_PATTERN" to
 "OFFLINE_PATTERN"

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index b4fa4f8ac..8ccc32010 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -20,7 +20,7 @@ class ZippyshareCom(SimpleHoster):
     FILE_NAME_PATTERN = r'<title>Zippyshare\.com - (?P<N>[^<]+)</title>'
     FILE_SIZE_PATTERN = r'>Size:</font>\s*<font [^>]*>(?P<S>[0-9.,]+) (?P<U>[kKMG]+)i?B</font><br />'
     FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";'
-    FILE_OFFLINE_PATTERN = r'>File does not exist on this server</div>'
+    OFFLINE_PATTERN = r'>File does not exist on this server</div>'
 
     SH_COOKIES = [('zippyshare.com', 'ziplocale', 'en')]
 
-- 
cgit v1.2.3


From 05d258d98dd8c2faf0b769840fa1e3c4acccdce8 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 20 Jul 2014 03:25:14 +0200
Subject: Fix and improve 5060e4c6374a5116d0d8b02528f910f8c5f8bcf9

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 8ccc32010..ea168246a 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -48,7 +48,7 @@ class ZippyshareCom(SimpleHoster):
             # checksum = eval(re.search("((\d*)\s\%\s(\d*)\s\+\s(\d*)\s\%\s(\d*))", self.html).group(0))
 
             m = re.search(r"((?P<a>\d*)\s%\s(?P<b>\d*)\s\+\s(?P<c>\d*)\s%\s(?P<k>\d*))", self.html)
-            if not m:
+            if m is None:
                 self.parseError("Unable to detect values to calculate direct link")
             a = int(m.group("a"))
             b = int(m.group("b"))
-- 
cgit v1.2.3


From a9f81c043c62abcb3ce38971237693736833fdbe Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 20 Jul 2014 03:28:23 +0200
Subject: Fix hosters SH_COOKIES syntax

---
 module/plugins/hoster/ZippyshareCom.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index ea168246a..0c04d68e5 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -22,7 +22,8 @@ class ZippyshareCom(SimpleHoster):
     FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";'
     OFFLINE_PATTERN = r'>File does not exist on this server</div>'
 
-    SH_COOKIES = [('zippyshare.com', 'ziplocale', 'en')]
+    SH_COOKIES = [(".zippyshare.com", "ziplocale", "en")]
+
 
     def setup(self):
         self.multiDL = True
-- 
cgit v1.2.3


From ba916633f2bedb04c7358000b91aed69f52e8e43 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 1 Aug 2014 19:35:59 +0200
Subject: Remove trailing whitespaces + remove license headers + import urllib
 methods directly + sort and fix key attributes + use save_join instead join +
 sort some import declarations + other minor code cosmetics

---
 module/plugins/hoster/ZippyshareCom.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 0c04d68e5..33a672198 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Test links (random.bin):
+#
+# Test links:
 # http://www13.zippyshare.com/v/18665333/file.html
 
 import re
@@ -11,8 +11,10 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
-    __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)'
     __version__ = "0.49"
+
+    __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)'
+
     __description__ = """Zippyshare.com hoster plugin"""
     __author_name__ = ("spoob", "zoidberg", "stickell", "skylab")
     __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it", "development@sky-lab.de")
-- 
cgit v1.2.3


From 59b1df9619770b21eb9ed2e5d7e705ca7f99fb49 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 24 Sep 2014 19:16:52 +0200
Subject: [ZippyshareCom] Partially rewritten

---
 module/plugins/hoster/ZippyshareCom.py | 73 ++++++++++++++--------------------
 1 file changed, 30 insertions(+), 43 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 33a672198..8d81e6f24 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -1,74 +1,61 @@
 # -*- coding: utf-8 -*-
-#
-# Test links:
-# http://www13.zippyshare.com/v/18665333/file.html
 
 import re
 
+from os import path
+from urlparse import urljoin
+
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
-    __version__ = "0.49"
+    __version__ = "0.50"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)'
 
-    __description__ = """Zippyshare.com hoster plugin"""
-    __author_name__ = ("spoob", "zoidberg", "stickell", "skylab")
-    __author_mail__ = ("spoob@pyload.org", "zoidberg@mujmail.cz", "l.stickell@yahoo.it", "development@sky-lab.de")
+    __description__ = """ Zippyshare.com hoster plugin """
+    __author_name__ = ("stickell", "skylab", "Walter Purcaro")
+    __author_mail__ = ("l.stickell@yahoo.it", "development@sky-lab.de", "vuolter@gmail.com")
+
 
     FILE_NAME_PATTERN = r'<title>Zippyshare\.com - (?P<N>[^<]+)</title>'
     FILE_SIZE_PATTERN = r'>Size:</font>\s*<font [^>]*>(?P<S>[0-9.,]+) (?P<U>[kKMG]+)i?B</font><br />'
     FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";'
-    OFFLINE_PATTERN = r'>File does not exist on this server</div>'
+    OFFLINE_PATTERN = r'>File does not exist on this server<'
 
     SH_COOKIES = [(".zippyshare.com", "ziplocale", "en")]
 
 
     def setup(self):
         self.multiDL = True
+        self.resumeDownload = True
+
 
     def handleFree(self):
-        url = self.get_file_url()
-        if not url:
-            self.fail("Download URL not found.")
+        url = self.get_link()
         self.logDebug("Download URL: %s" % url)
         self.download(url)
 
-    def get_file_url(self):
-        """returns the absolute downloadable filepath"""
-        url_parts = re.search(r'(addthis:url="(http://www(\d+).zippyshare.com/v/(\d*)/file.html))', self.html)
-        number = url_parts.group(4)
-        check = re.search(r'<script type="text/javascript">([^<]*?)(var a = (\d*);)', self.html)
-        if check:
-            a = int(re.search(r'<script type="text/javascript">([^<]*?)(var a = (\d*);)', self.html).group(3))
-            k = int(re.search(r'<script type="text/javascript">([^<]*?)(\d*%(\d*))', self.html).group(3))
-            checksum = ((a + 3) % k) * ((a + 3) % 3) + 18
-        else:
-            # This might work but is insecure
-            # checksum = eval(re.search("((\d*)\s\%\s(\d*)\s\+\s(\d*)\s\%\s(\d*))", self.html).group(0))
-
-            m = re.search(r"((?P<a>\d*)\s%\s(?P<b>\d*)\s\+\s(?P<c>\d*)\s%\s(?P<k>\d*))", self.html)
-            if m is None:
-                self.parseError("Unable to detect values to calculate direct link")
-            a = int(m.group("a"))
-            b = int(m.group("b"))
-            c = int(m.group("c"))
-            k = int(m.group("k"))
-            if a == c:
-                checksum = ((a % b) + (a % k))
-            else:
-                checksum = ((a % b) + (c % k))
-
-        self.logInfo('Checksum: %s' % checksum)
-
-        filename = re.search(r'>Name:</font>\s*<font [^>]*>(?P<N>[^<]+)</font><br />', self.html).group('N')
-
-        url = "/d/%s/%s/%s" % (number, checksum, filename)
-        self.logInfo(self.file_info['HOST'] + url)
-        return self.file_info['HOST'] + url
+
+    def get_checksum(self):
+        m_a = re.search(r'var a = (\d+)\%(\d+);', self.html)
+        m_b = re.search(r'var b = (\d+)\%(\d+);', self.html)
+        if m_a is None or m_b is None:
+            self.parseError("Unable to calculate checksum")
+
+        # Checksum is calculated as (a*b+19), where a and b are the result of modulo calculations
+        a = map(lambda x: int(x), m_a.groups())
+        b = map(lambda x: int(x), m_b.groups())
+        return a[0] % a[1] * b[0] % b[1] + 19
+
+
+    def get_link(self):
+        checksum = self.get_checksum()
+        p_url = path.join("d", self.file_info['KEY'], str(checksum), self.pyfile.name)
+        dl_link = urljoin(self.file_info['HOST'], p_url)
+        return dl_link
 
 
 getInfo = create_getInfo(ZippyshareCom)
-- 
cgit v1.2.3


From eaeef7bd45cfcb69895434621b50202e6dac9a61 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Thu, 25 Sep 2014 20:46:04 +0200
Subject: [ZippyshareCom] Improve __pattern__ a bit

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 8d81e6f24..1bee788d5 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -13,7 +13,7 @@ class ZippyshareCom(SimpleHoster):
     __type__ = "hoster"
     __version__ = "0.50"
 
-    __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare.com)/v(?:/|iew.jsp.*key=)(?P<KEY>\d+)'
+    __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
     __description__ = """ Zippyshare.com hoster plugin """
     __author_name__ = ("stickell", "skylab", "Walter Purcaro")
-- 
cgit v1.2.3


From 4709a41c176dd2947709b7f35ccc84213d574624 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 26 Sep 2014 16:59:26 +0200
Subject: Rename SH flags

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 1bee788d5..4724a2980 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -25,7 +25,7 @@ class ZippyshareCom(SimpleHoster):
     FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";'
     OFFLINE_PATTERN = r'>File does not exist on this server<'
 
-    SH_COOKIES = [(".zippyshare.com", "ziplocale", "en")]
+    COOKIES = [(".zippyshare.com", "ziplocale", "en")]
 
 
     def setup(self):
-- 
cgit v1.2.3


From 350be82f74ea7756e4a7ab1656f93fa04575caa6 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Sep 2014 23:15:19 +0200
Subject: [ZippyshareCom] Fix alternative checksum type

---
 module/plugins/hoster/ZippyshareCom.py | 39 ++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 14 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 4724a2980..ef6b58c27 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,18 +11,18 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
-    __version__ = "0.50"
+    __version__ = "0.51"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
-    __description__ = """ Zippyshare.com hoster plugin """
-    __author_name__ = ("stickell", "skylab", "Walter Purcaro")
-    __author_mail__ = ("l.stickell@yahoo.it", "development@sky-lab.de", "vuolter@gmail.com")
+    __description__ = """Zippyshare.com hoster plugin"""
+    __author_name__ = "Walter Purcaro"
+    __author_mail__ = "vuolter@gmail.com"
 
 
-    FILE_NAME_PATTERN = r'<title>Zippyshare\.com - (?P<N>[^<]+)</title>'
-    FILE_SIZE_PATTERN = r'>Size:</font>\s*<font [^>]*>(?P<S>[0-9.,]+) (?P<U>[kKMG]+)i?B</font><br />'
-    FILE_INFO_PATTERN = r'document\.getElementById\(\'dlbutton\'\)\.href = "[^;]*/(?P<N>[^"]+)";'
+    FILE_NAME_PATTERN = r'>Name:.+?">(?P<N>.+?)<'
+    FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.]+) (?P<U>\w+)'
+
     OFFLINE_PATTERN = r'>File does not exist on this server<'
 
     COOKIES = [(".zippyshare.com", "ziplocale", "en")]
@@ -30,6 +30,7 @@ class ZippyshareCom(SimpleHoster):
 
     def setup(self):
         self.multiDL = True
+        self.chunkLimit = -1
         self.resumeDownload = True
 
 
@@ -40,15 +41,25 @@ class ZippyshareCom(SimpleHoster):
 
 
     def get_checksum(self):
-        m_a = re.search(r'var a = (\d+)\%(\d+);', self.html)
-        m_b = re.search(r'var b = (\d+)\%(\d+);', self.html)
-        if m_a is None or m_b is None:
+        m = re.search(r'\(a\*b\+19\)', self.html)
+        if m:
+            m = re.findall(r'var \w = (\d+)\%(\d+);', self.html)
+            c = lambda a,b: a * b + 19
+        else:
+            m = re.findall(r'(\d+) \% (\d+)', self.html)
+            c = lambda a,b: a + b
+
+        if not m:
             self.parseError("Unable to calculate checksum")
 
-        # Checksum is calculated as (a*b+19), where a and b are the result of modulo calculations
-        a = map(lambda x: int(x), m_a.groups())
-        b = map(lambda x: int(x), m_b.groups())
-        return a[0] % a[1] * b[0] % b[1] + 19
+        a = map(lambda x: int(x), m[0])
+        b = map(lambda x: int(x), m[1])
+
+        # Checksum is calculated as (a*b+19) or (a*b), where a and b are the result of modulo calculations
+        a = a[0] % a[1]
+        b = b[0] % b[1]
+
+        return c(a, b)
 
 
     def get_link(self):
-- 
cgit v1.2.3


From 13d788058ce3ebada150ebbe7c1a9415f76253d7 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 28 Sep 2014 00:39:28 +0200
Subject: [CatShareNet] Fixup

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index ef6b58c27..42640703c 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -55,7 +55,7 @@ class ZippyshareCom(SimpleHoster):
         a = map(lambda x: int(x), m[0])
         b = map(lambda x: int(x), m[1])
 
-        # Checksum is calculated as (a*b+19) or (a*b), where a and b are the result of modulo calculations
+        # Checksum is calculated as (a * b + 19) or (a + b), where a and b are the result of modulo calculations
         a = a[0] % a[1]
         b = b[0] % b[1]
 
-- 
cgit v1.2.3


From 8add4efc7dc3eeaa873030930e5bd31d6bdf8126 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 28 Sep 2014 14:57:02 +0200
Subject: [XFileSharingPro] COOKIES preset to english + improved setup routine

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 42640703c..6a6687eae 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -55,7 +55,7 @@ class ZippyshareCom(SimpleHoster):
         a = map(lambda x: int(x), m[0])
         b = map(lambda x: int(x), m[1])
 
-        # Checksum is calculated as (a * b + 19) or (a + b), where a and b are the result of modulo calculations
+        # Checksum is calculated as (a*b+19) or (a+b), where a and b are the result of modulo calculations
         a = a[0] % a[1]
         b = b[0] % b[1]
 
-- 
cgit v1.2.3


From b0868ae6446078bacf1635dde5e4ab316b4a94cb Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 7 Oct 2014 18:57:59 +0200
Subject: New __authors__ key replaces __author_name__ and __author_mail__ +
 Whitespaces and EOF fixup

---
 module/plugins/hoster/ZippyshareCom.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 6a6687eae..1637053db 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -16,8 +16,7 @@ class ZippyshareCom(SimpleHoster):
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
     __description__ = """Zippyshare.com hoster plugin"""
-    __author_name__ = "Walter Purcaro"
-    __author_mail__ = "vuolter@gmail.com"
+    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     FILE_NAME_PATTERN = r'>Name:.+?">(?P<N>.+?)<'
-- 
cgit v1.2.3


From ae7a7e66981456e5bbe2b54006d79b6f907be7a4 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Wed, 8 Oct 2014 20:18:13 +0200
Subject: Add __license__ key attribute to plugins

---
 module/plugins/hoster/ZippyshareCom.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 1637053db..24e5bf68c 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -16,6 +16,7 @@ class ZippyshareCom(SimpleHoster):
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
     __description__ = """Zippyshare.com hoster plugin"""
+    __license__ = "GPLv3"
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-- 
cgit v1.2.3


From c5d1a4fd8943877c6d2eb3843e0de725dba5191e Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 11 Oct 2014 15:09:53 +0200
Subject: Pattern update 2

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 24e5bf68c..f2ba853fc 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -21,7 +21,7 @@ class ZippyshareCom(SimpleHoster):
 
 
     FILE_NAME_PATTERN = r'>Name:.+?">(?P<N>.+?)<'
-    FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.]+) (?P<U>\w+)'
+    FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>\w+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
 
-- 
cgit v1.2.3


From 388a2f6478d42e423f1f8442d8539983f3762f22 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 14 Oct 2014 13:38:49 +0200
Subject: Improve unit detection in size pattern

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index f2ba853fc..29a23353f 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -21,7 +21,7 @@ class ZippyshareCom(SimpleHoster):
 
 
     FILE_NAME_PATTERN = r'>Name:.+?">(?P<N>.+?)<'
-    FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>\w+)'
+    FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
 
-- 
cgit v1.2.3


From c860958e4ae4ab326ac4d024afbf13617e9292d5 Mon Sep 17 00:00:00 2001
From: zapp-brannigan <fuerst.reinje@web.de>
Date: Fri, 17 Oct 2014 17:03:04 +0200
Subject: Update ZippyshareCom.py

The current version can not detect the filename, download is not working:

17.10.2014 16:43:23 DEBUG     ZippyshareCom: FILE NAME: <img style="margin-left: 10px;" src="/fileName?key=82680550&size=small" alt="file name"> FILE SIZE: 209998315
---
 module/plugins/hoster/ZippyshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 29a23353f..6144132f9 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
-    __version__ = "0.51"
+    __version__ = "0.52"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -20,7 +20,7 @@ class ZippyshareCom(SimpleHoster):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    FILE_NAME_PATTERN = r'>Name:.+?">(?P<N>.+?)<'
+    FILE_NAME_PATTERN = r'var exam1x = .+ \+ "/(?P<N>.+)";'
     FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
-- 
cgit v1.2.3


From 30655170bf21396b59d33a8cc443321b20569f95 Mon Sep 17 00:00:00 2001
From: zapp-brannigan <zapp-brannigan@users.noreply.github.com>
Date: Sun, 19 Oct 2014 09:10:00 +0200
Subject: [ZippyshareCom.py] fixed FILE_NAME_PATTERN again

Zippyshare sucks ;)
---
 module/plugins/hoster/ZippyshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 6144132f9..4ced2a035 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
-    __version__ = "0.52"
+    __version__ = "0.53"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -20,7 +20,7 @@ class ZippyshareCom(SimpleHoster):
     __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    FILE_NAME_PATTERN = r'var exam1x = .+ \+ "/(?P<N>.+)";'
+    FILE_NAME_PATTERN = r'var \w+ = .+ \+ "/(?P<N>.+)";'
     FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
-- 
cgit v1.2.3


From 2ae91b81a2f12a1c9b1f78524df78a2b3f1ef494 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 19 Oct 2014 14:52:42 +0200
Subject: Update hosters to self.error

---
 module/plugins/hoster/ZippyshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 6144132f9..9c1c3fa9b 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__ = "ZippyshareCom"
     __type__ = "hoster"
-    __version__ = "0.52"
+    __version__ = "0.53"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -50,7 +50,7 @@ class ZippyshareCom(SimpleHoster):
             c = lambda a,b: a + b
 
         if not m:
-            self.parseError("Unable to calculate checksum")
+            self.error("Unable to calculate checksum")
 
         a = map(lambda x: int(x), m[0])
         b = map(lambda x: int(x), m[1])
-- 
cgit v1.2.3


From 4da90891eb2544ac15a7d512aba8cb357f68ee5f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 25 Oct 2014 01:11:29 +0200
Subject: Spare code cosmetics

---
 module/plugins/hoster/ZippyshareCom.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 3cc52744f..b73113040 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -36,7 +36,6 @@ class ZippyshareCom(SimpleHoster):
 
     def handleFree(self):
         url = self.get_link()
-        self.logDebug("Download URL: %s" % url)
         self.download(url)
 
 
-- 
cgit v1.2.3


From 9f2ebe486a3e155fb6a60e07cccb77ab6a772eb2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 26 Oct 2014 02:31:54 +0200
Subject: Extend translation support in plugins + a lot of code cosmetics and
 typo fixes

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index b73113040..29b013b51 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -49,7 +49,7 @@ class ZippyshareCom(SimpleHoster):
             c = lambda a,b: a + b
 
         if not m:
-            self.error("Unable to calculate checksum")
+            self.error(_("Unable to calculate checksum"))
 
         a = map(lambda x: int(x), m[0])
         b = map(lambda x: int(x), m[1])
-- 
cgit v1.2.3


From 34984dae733c3f3d47b41a0acfba3724d53c65a1 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 28 Oct 2014 16:52:10 +0100
Subject: Code cosmetics: plugin class attributes

---
 module/plugins/hoster/ZippyshareCom.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 29b013b51..4201d0eaf 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -9,15 +9,15 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
 
 class ZippyshareCom(SimpleHoster):
-    __name__ = "ZippyshareCom"
-    __type__ = "hoster"
+    __name__    = "ZippyshareCom"
+    __type__    = "hoster"
     __version__ = "0.53"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
     __description__ = """Zippyshare.com hoster plugin"""
-    __license__ = "GPLv3"
-    __authors__ = [("Walter Purcaro", "vuolter@gmail.com")]
+    __license__     = "GPLv3"
+    __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
     FILE_NAME_PATTERN = r'var \w+ = .+ \+ "/(?P<N>.+)";'
-- 
cgit v1.2.3


From 768c648aa232195ab5a027c287bcbd2966401449 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 1 Nov 2014 00:18:36 +0100
Subject: [ZippyshareCom] Fix FILE_NAME_PATTERN (thx zapp-brannigan)

---
 module/plugins/hoster/ZippyshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 4201d0eaf..c12322823 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.53"
+    __version__ = "0.54"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -20,7 +20,7 @@ class ZippyshareCom(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    FILE_NAME_PATTERN = r'var \w+ = .+ \+ "/(?P<N>.+)";'
+    FILE_NAME_PATTERN = r'<title>Zippyshare.com - (?P<N>.+)</title>'
     FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
-- 
cgit v1.2.3


From f42749c593f9ec4db5426592077751193d98ce13 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 1 Nov 2014 19:37:18 +0100
Subject: [ZippyshareCom] Fix get_checksum (thx zapp-brannigan)

---
 module/plugins/hoster/ZippyshareCom.py | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index c12322823..549df73e0 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.54"
+    __version__ = "0.55"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -40,26 +40,12 @@ class ZippyshareCom(SimpleHoster):
 
 
     def get_checksum(self):
-        m = re.search(r'\(a\*b\+19\)', self.html)
+        m = re.search(r'var ab? = (\d+)\%(\d+)', self.html)
         if m:
-            m = re.findall(r'var \w = (\d+)\%(\d+);', self.html)
-            c = lambda a,b: a * b + 19
+            return int(m.group(1)) % int(m.group(2))
         else:
-            m = re.findall(r'(\d+) \% (\d+)', self.html)
-            c = lambda a,b: a + b
-
-        if not m:
             self.error(_("Unable to calculate checksum"))
 
-        a = map(lambda x: int(x), m[0])
-        b = map(lambda x: int(x), m[1])
-
-        # Checksum is calculated as (a*b+19) or (a+b), where a and b are the result of modulo calculations
-        a = a[0] % a[1]
-        b = b[0] % b[1]
-
-        return c(a, b)
-
 
     def get_link(self):
         checksum = self.get_checksum()
-- 
cgit v1.2.3


From 772e47ef806d18fd209e910be0535bce7c07dc7b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 2 Nov 2014 22:47:07 +0100
Subject: Update all other plugins

---
 module/plugins/hoster/ZippyshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 549df73e0..f34c23c3b 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -20,8 +20,8 @@ class ZippyshareCom(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    FILE_NAME_PATTERN = r'<title>Zippyshare.com - (?P<N>.+)</title>'
-    FILE_SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
+    NAME_PATTERN = r'<title>Zippyshare.com - (?P<N>.+)</title>'
+    SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
 
-- 
cgit v1.2.3


From 03f3b86f500c495932fd118b54569d92f700847c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 3 Nov 2014 16:57:55 +0100
Subject: Code cosmetics about file_info and other stuff

---
 module/plugins/hoster/ZippyshareCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index f34c23c3b..3b5e6df33 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.55"
+    __version__ = "0.56"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -49,8 +49,8 @@ class ZippyshareCom(SimpleHoster):
 
     def get_link(self):
         checksum = self.get_checksum()
-        p_url = path.join("d", self.file_info['KEY'], str(checksum), self.pyfile.name)
-        dl_link = urljoin(self.file_info['HOST'], p_url)
+        p_url = path.join("d", self.info['KEY'], str(checksum), self.pyfile.name)
+        dl_link = urljoin(self.info['HOST'], p_url)
         return dl_link
 
 
-- 
cgit v1.2.3


From f8f27d90f88014edb9922fe44b87829454110535 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 4 Nov 2014 01:43:16 +0100
Subject: [ZippyshareCom] Update plugin

---
 module/plugins/hoster/ZippyshareCom.py | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 3b5e6df33..9eaf09d04 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -3,6 +3,7 @@
 import re
 
 from os import path
+from urllib import unquote
 from urlparse import urljoin
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
@@ -11,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.56"
+    __version__ = "0.57"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -20,7 +21,7 @@ class ZippyshareCom(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    NAME_PATTERN = r'<title>Zippyshare.com - (?P<N>.+)</title>'
+    NAME_PATTERN = r'var linkz =.*/(?P<N>.+)";'
     SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
@@ -39,12 +40,20 @@ class ZippyshareCom(SimpleHoster):
         self.download(url)
 
 
+    def getFileInfo(self):
+        info = super(ZippyshareCom, self).getFileInfo()
+        self.pyfile.name = info['name'] = unquote(info['name'])
+        return info
+
+
     def get_checksum(self):
-        m = re.search(r'var ab? = (\d+)\%(\d+)', self.html)
-        if m:
-            return int(m.group(1)) % int(m.group(2))
-        else:
+        try:
+            a = int(re.search(r'var a = (\d+)', self.html).group(1))
+            b = int(re.search(r'var ab = a\%(\d+)', self.html).group(1))
+        except:
             self.error(_("Unable to calculate checksum"))
+        else:
+            return a % b
 
 
     def get_link(self):
-- 
cgit v1.2.3


From 62244ce5fbcb34052240fbb468d2a61849f1a010 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 8 Nov 2014 13:15:50 +0100
Subject: [ZippyshareCom] Update get_checksum

---
 module/plugins/hoster/ZippyshareCom.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 9eaf09d04..0e19c36ac 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.57"
+    __version__ = "0.58"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -48,12 +48,13 @@ class ZippyshareCom(SimpleHoster):
 
     def get_checksum(self):
         try:
-            a = int(re.search(r'var a = (\d+)', self.html).group(1))
-            b = int(re.search(r'var ab = a\%(\d+)', self.html).group(1))
+            a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups)
+            c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups)
+            b = (a1 % a2) * (c1 % c2)
         except:
             self.error(_("Unable to calculate checksum"))
         else:
-            return a % b
+            return b + 18
 
 
     def get_link(self):
-- 
cgit v1.2.3


From 199d0cdc681675d5e20b2167424becaef8391391 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 8 Nov 2014 13:17:38 +0100
Subject: [ZippyshareCom] Fix typo

---
 module/plugins/hoster/ZippyshareCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 0e19c36ac..bf380de77 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.58"
+    __version__ = "0.59"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -48,8 +48,8 @@ class ZippyshareCom(SimpleHoster):
 
     def get_checksum(self):
         try:
-            a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups)
-            c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups)
+            a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups())
+            c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
             b = (a1 % a2) * (c1 % c2)
         except:
             self.error(_("Unable to calculate checksum"))
-- 
cgit v1.2.3


From daad410496b744cd774ab10c00f8f220410b243c Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 9 Nov 2014 16:38:06 +0100
Subject: [ZippyshareCom] Update NAME_PATTERN

---
 module/plugins/hoster/ZippyshareCom.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index bf380de77..1b2b9bce2 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -12,7 +12,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.59"
+    __version__ = "0.60"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -21,7 +21,7 @@ class ZippyshareCom(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    NAME_PATTERN = r'var linkz =.*/(?P<N>.+)";'
+    NAME_PATTERN = r'("/[di]/\d+/".+?"/|<title>Zippyshare.com - )(?P<N>.+?)("|</title>)'
     SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
-- 
cgit v1.2.3


From 76b087986aa90967918ec52b459a857c11743203 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 10 Nov 2014 01:06:30 +0100
Subject: [ZippyshareCom] Update patterns

---
 module/plugins/hoster/ZippyshareCom.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 1b2b9bce2..72bdf3171 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -21,7 +21,7 @@ class ZippyshareCom(SimpleHoster):
     __authors__     = [("Walter Purcaro", "vuolter@gmail.com")]
 
 
-    NAME_PATTERN = r'("/[di]/\d+/".+?"/|<title>Zippyshare.com - )(?P<N>.+?)("|</title>)'
+    NAME_PATTERN = r'("\d{6,}/"[ ]*\+.+?"/|<title>Zippyshare.com - )(?P<N>.+?)("|</title>)'
     SIZE_PATTERN = r'>Size:.+?">(?P<S>[\d.,]+) (?P<U>[\w^_]+)'
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
@@ -48,8 +48,13 @@ class ZippyshareCom(SimpleHoster):
 
     def get_checksum(self):
         try:
-            a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups())
-            c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
+            m = re.search(r'\+[ ]*\((\d+)[ ]*\%[ ]*(\d+)[ ]*\+[ ]*(\d+)[ ]*\%[ ]*(\d+)\)[ ]*\+', self.html)
+            if m:
+                a1, a2, c1, c2 = map(int, m.groups())
+            else:
+                a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups())
+                c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
+
             b = (a1 % a2) * (c1 % c2)
         except:
             self.error(_("Unable to calculate checksum"))
-- 
cgit v1.2.3


From e8246525f3106c152d6d1436c6a3111e0334520f Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 15 Nov 2014 18:04:47 +0100
Subject: Fix cookie domain

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 72bdf3171..8bf5aa942 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -26,7 +26,7 @@ class ZippyshareCom(SimpleHoster):
 
     OFFLINE_PATTERN = r'>File does not exist on this server<'
 
-    COOKIES = [(".zippyshare.com", "ziplocale", "en")]
+    COOKIES = [("zippyshare.com", "ziplocale", "en")]
 
 
     def setup(self):
-- 
cgit v1.2.3


From bc3f5f4903444e438a8a07688c82f0c2995dafa9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 30 Nov 2014 21:15:54 +0100
Subject: [SimpleHoster] Unquote file name

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

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 8bf5aa942..0f41d338a 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -2,8 +2,7 @@
 
 import re
 
-from os import path
-from urllib import unquote
+from os.path import join
 from urlparse import urljoin
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
@@ -12,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.60"
+    __version__ = "0.61"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -40,12 +39,6 @@ class ZippyshareCom(SimpleHoster):
         self.download(url)
 
 
-    def getFileInfo(self):
-        info = super(ZippyshareCom, self).getFileInfo()
-        self.pyfile.name = info['name'] = unquote(info['name'])
-        return info
-
-
     def get_checksum(self):
         try:
             m = re.search(r'\+[ ]*\((\d+)[ ]*\%[ ]*(\d+)[ ]*\+[ ]*(\d+)[ ]*\%[ ]*(\d+)\)[ ]*\+', self.html)
@@ -64,8 +57,8 @@ class ZippyshareCom(SimpleHoster):
 
     def get_link(self):
         checksum = self.get_checksum()
-        p_url = path.join("d", self.info['KEY'], str(checksum), self.pyfile.name)
-        dl_link = urljoin(self.info['HOST'], p_url)
+        p_url    = join("d", self.info['KEY'], str(checksum), self.pyfile.name)
+        dl_link  = urljoin(self.info['HOST'], p_url)
         return dl_link
 
 
-- 
cgit v1.2.3


From 86d3b6249073947132ed3a9eeb1b1e987d19569a Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Mon, 1 Dec 2014 18:17:13 +0100
Subject: Update some plugins

---
 module/plugins/hoster/ZippyshareCom.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 0f41d338a..3edf3c5c1 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -11,7 +11,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.61"
+    __version__ = "0.62"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -57,8 +57,8 @@ class ZippyshareCom(SimpleHoster):
 
     def get_link(self):
         checksum = self.get_checksum()
-        p_url    = join("d", self.info['KEY'], str(checksum), self.pyfile.name)
-        dl_link  = urljoin(self.info['HOST'], p_url)
+        p_url    = join("d", self.info['pattern']['KEY'], str(checksum), self.pyfile.name)
+        dl_link  = urljoin(self.info['pattern']['HOST'], p_url)
         return dl_link
 
 
-- 
cgit v1.2.3


From 50f3fd2fad476184b2e64eb66319292c02ed68c2 Mon Sep 17 00:00:00 2001
From: sebdelsol <seb.morin@gmail.com>
Date: Fri, 12 Dec 2014 15:45:21 +0100
Subject: Update ZippyshareCom.py

#bug correction : bad download url that is rejected with a 400 html error.
change p_url creation to use '/'.join() instead of os.path.join() that doesn't work for an url.
---
 module/plugins/hoster/ZippyshareCom.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 3edf3c5c1..69be6833c 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -2,7 +2,6 @@
 
 import re
 
-from os.path import join
 from urlparse import urljoin
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
@@ -57,7 +56,7 @@ class ZippyshareCom(SimpleHoster):
 
     def get_link(self):
         checksum = self.get_checksum()
-        p_url    = join("d", self.info['pattern']['KEY'], str(checksum), self.pyfile.name)
+        p_url    = '/'.join(("d", self.info['pattern']['KEY'], str(checksum), self.pyfile.name))
         dl_link  = urljoin(self.info['pattern']['HOST'], p_url)
         return dl_link
 
-- 
cgit v1.2.3


From 5cb925f5d23ca05c8e9bd5df75a68b0b4c2dc408 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Tue, 16 Dec 2014 02:06:02 +0100
Subject: Update plugins

---
 module/plugins/hoster/ZippyshareCom.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 69be6833c..67b384c5f 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.62"
+    __version__ = "0.63"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
-- 
cgit v1.2.3


From 40cbbfb334c83f61f26b9ec0f4487347754ca7a9 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 27 Dec 2014 21:11:12 +0100
Subject: [ZippyshareCom] Fix get_checksum routine

---
 module/plugins/hoster/ZippyshareCom.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index 67b384c5f..b8ad9b6cb 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.63"
+    __version__ = "0.64"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -43,15 +43,16 @@ class ZippyshareCom(SimpleHoster):
             m = re.search(r'\+[ ]*\((\d+)[ ]*\%[ ]*(\d+)[ ]*\+[ ]*(\d+)[ ]*\%[ ]*(\d+)\)[ ]*\+', self.html)
             if m:
                 a1, a2, c1, c2 = map(int, m.groups())
+                res = (a1 % a2) + (c1 % c2)
             else:
                 a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups())
                 c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
-
-            b = (a1 % a2) * (c1 % c2)
+                b = (a1 % a2) * (c1 % c2)
+                res += 18
         except:
             self.error(_("Unable to calculate checksum"))
         else:
-            return b + 18
+            return res
 
 
     def get_link(self):
-- 
cgit v1.2.3


From f6ff07af7da9abcb5af541d186572ca4539662e3 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sun, 28 Dec 2014 02:35:39 +0100
Subject: [ZippyshareCom] Typo

---
 module/plugins/hoster/ZippyshareCom.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'module/plugins/hoster/ZippyshareCom.py')

diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py
index b8ad9b6cb..73dd1f22d 100644
--- a/module/plugins/hoster/ZippyshareCom.py
+++ b/module/plugins/hoster/ZippyshareCom.py
@@ -10,7 +10,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class ZippyshareCom(SimpleHoster):
     __name__    = "ZippyshareCom"
     __type__    = "hoster"
-    __version__ = "0.64"
+    __version__ = "0.65"
 
     __pattern__ = r'(?P<HOST>http://www\d{0,2}\.zippyshare\.com)/v(?:/|iew\.jsp.*key=)(?P<KEY>\d+)'
 
@@ -28,8 +28,8 @@ class ZippyshareCom(SimpleHoster):
 
 
     def setup(self):
-        self.multiDL = True
-        self.chunkLimit = -1
+        self.multiDL        = True
+        self.chunkLimit     = -1
         self.resumeDownload = True
 
 
@@ -43,16 +43,17 @@ class ZippyshareCom(SimpleHoster):
             m = re.search(r'\+[ ]*\((\d+)[ ]*\%[ ]*(\d+)[ ]*\+[ ]*(\d+)[ ]*\%[ ]*(\d+)\)[ ]*\+', self.html)
             if m:
                 a1, a2, c1, c2 = map(int, m.groups())
-                res = (a1 % a2) + (c1 % c2)
+                b = (a1 % a2) + (c1 % c2)
             else:
-                a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)', self.html).groups())
+                a1, a2 = map(int, re.search(r'\(\'downloadB\'\).omg = (\d+)%(\d+)'     , self.html).groups())
                 c1, c2 = map(int, re.search(r'\(\'downloadB\'\).omg\) \* \((\d+)%(\d+)', self.html).groups())
-                b = (a1 % a2) * (c1 % c2)
-                res += 18
-        except:
-            self.error(_("Unable to calculate checksum"))
+                b = (a1 % a2) * (c1 % c2) + 18
+
+        except Exception, e:
+            self.error(_("Unable to calculate checksum"), e)
+
         else:
-            return res
+            return b
 
 
     def get_link(self):
-- 
cgit v1.2.3