From fd105f8e51768ec1943cda2375bdfdbe5b0a3951 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Fri, 9 Jan 2015 00:35:51 +0100
Subject: "New Year" Update: hoster plugins

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

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

diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py
index fa54d6060..0acdb7647 100644
--- a/module/plugins/hoster/SpeedyshareCom.py
+++ b/module/plugins/hoster/SpeedyshareCom.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SpeedyshareCom(SimpleHoster):
     __name__    = "SpeedyshareCom"
     __type__    = "hoster"
-    __version__ = "0.03"
+    __version__ = "0.04"
 
     __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
 
@@ -27,7 +27,7 @@ class SpeedyshareCom(SimpleHoster):
 
     OFFLINE_PATTERN = r'class=downloadfilenamenotfound>.*</span>'
 
-    LINK_PATTERN = r'<a href=\'(.*)\'><img src=/gf/slowdownload\.png alt=\'Slow Download\' border=0'
+    LINK_FREE_PATTERN = r'<a href=\'(.*)\'><img src=/gf/slowdownload\.png alt=\'Slow Download\' border=0'
 
 
     def setup(self):
@@ -35,17 +35,13 @@ class SpeedyshareCom(SimpleHoster):
         self.chunkLimit = 1
 
 
-    def handleFree(self):
-        m = re.search(self.LINK_PATTERN, self.html)
+    def handleFree(self, pyfile):
+        m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
             self.error(_("Download link not found"))
 
         dl_link = urljoin("http://www.speedyshare.com", m.group(1))
         self.download(dl_link, disposition=True)
 
-        check = self.checkDownload({'html': re.compile("html")})
-        if check == "html":
-            self.error(_("Downloaded file is an html page"))
-
 
 getInfo = create_getInfo(SpeedyshareCom)
-- 
cgit v1.2.3


From 031d86706aa13270793e31c21ad3f386ca62752b Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@gmail.com>
Date: Sat, 24 Jan 2015 03:50:33 +0100
Subject: Spare code improvements

---
 module/plugins/hoster/SpeedyshareCom.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py
index 0acdb7647..f21b0a3a7 100644
--- a/module/plugins/hoster/SpeedyshareCom.py
+++ b/module/plugins/hoster/SpeedyshareCom.py
@@ -13,7 +13,7 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class SpeedyshareCom(SimpleHoster):
     __name__    = "SpeedyshareCom"
     __type__    = "hoster"
-    __version__ = "0.04"
+    __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
 
@@ -38,10 +38,7 @@ class SpeedyshareCom(SimpleHoster):
     def handleFree(self, pyfile):
         m = re.search(self.LINK_FREE_PATTERN, self.html)
         if m is None:
-            self.error(_("Download link not found"))
-
-        dl_link = urljoin("http://www.speedyshare.com", m.group(1))
-        self.download(dl_link, disposition=True)
+            self.link = m.group(1)
 
 
 getInfo = create_getInfo(SpeedyshareCom)
-- 
cgit v1.2.3


From 7d90803262ccbb4fc5296a4dc3ce30fe98f55631 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Wed, 25 Mar 2015 23:10:07 +0100
Subject: __config__ cosmetics

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

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

diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py
index f21b0a3a7..1649abbe6 100644
--- a/module/plugins/hoster/SpeedyshareCom.py
+++ b/module/plugins/hoster/SpeedyshareCom.py
@@ -16,6 +16,7 @@ class SpeedyshareCom(SimpleHoster):
     __version__ = "0.05"
 
     __pattern__ = r'https?://(?:www\.)?(speedyshare\.com|speedy\.sh)/\w+'
+    __config__  = [("use_premium", "bool", "Use premium account if available", True)]
 
     __description__ = """Speedyshare.com hoster plugin"""
     __license__     = "GPLv3"
-- 
cgit v1.2.3


From 1ef93e913238275f7657d496ba3d2e7eeb5a30a2 Mon Sep 17 00:00:00 2001
From: Walter Purcaro <vuolter@users.noreply.github.com>
Date: Fri, 1 May 2015 01:06:01 +0200
Subject: Use 'import' instead 'from'

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

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

diff --git a/module/plugins/hoster/SpeedyshareCom.py b/module/plugins/hoster/SpeedyshareCom.py
index 1649abbe6..91788b2c8 100644
--- a/module/plugins/hoster/SpeedyshareCom.py
+++ b/module/plugins/hoster/SpeedyshareCom.py
@@ -4,8 +4,7 @@
 # http://speedy.sh/ep2qY/Zapp-Brannigan.jpg
 
 import re
-
-from urlparse import urljoin
+import urlparse
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
-- 
cgit v1.2.3