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/HellshareCz.py | 37 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

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

diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py
index 4b44cc335..47b981dd7 100644
--- a/module/plugins/hoster/HellshareCz.py
+++ b/module/plugins/hoster/HellshareCz.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import re
+from urlparse import urljoin
 
 from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 
@@ -8,41 +8,34 @@ from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
 class HellshareCz(SimpleHoster):
     __name__    = "HellshareCz"
     __type__    = "hoster"
-    __version__ = "0.83"
+    __version__ = "0.84"
 
-    __pattern__ = r'(http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+)'
+    __pattern__ = r'http://(?:www\.)?hellshare\.(?:cz|com|sk|hu|pl)/[^?]*/\d+'
 
     __description__ = """Hellshare.cz hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("zoidberg", "zoidberg@mujmail.cz")]
 
 
-    NAME_PATTERN = r'<h1 id="filename"[^>]*>(?P<N>[^<]+)</h1>'
-    SIZE_PATTERN = r'<strong id="FileSize_master">(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
+    CHECK_TRAFFIC = True
+    LOGIN_ACCOUNT = True
+
+    NAME_PATTERN    = r'<h1 id="filename"[^>]*>(?P<N>[^<]+)</h1>'
+    SIZE_PATTERN    = r'<strong id="FileSize_master">(?P<S>[\d.,]+)&nbsp;(?P<U>[\w^_]+)</strong>'
     OFFLINE_PATTERN = r'<h1>File not found.</h1>'
-    SHOW_WINDOW_PATTERN = r'<a href="([^?]+/(\d+)/\?do=(fileDownloadButton|relatedFileDownloadButton-\2)-showDownloadWindow)"'
+
+    LINK_FREE_PATTERN = LINK_PREMIUM_PATTERN = r'<a href="([^?]+/(\d+)/\?do=(fileDownloadButton|relatedFileDownloadButton-\2)-showDownloadWindow)"'
 
 
     def setup(self):
-        self.resumeDownload = self.multiDL = True if self.account else False
+        self.resumeDownload = self.multiDL = bool(self.account)
         self.chunkLimit = 1
 
 
-    def process(self, pyfile):
-        if not self.account:
-            self.fail(_("User not logged in"))
-        pyfile.url = re.match(self.__pattern__, pyfile.url).group(1)
-        self.html = self.load(pyfile.url, decode=True)
-        self.getFileInfo()
-        if not self.checkTrafficLeft():
-            self.fail(_("Not enough traffic left for user ") + self.user)
-
-        m = re.search(self.SHOW_WINDOW_PATTERN, self.html)
-        if m is None:
-            self.error(_("SHOW_WINDOW_PATTERN not found"))
-
-        self.url = "http://www.hellshare.com" + m.group(1)
-        self.download(self.url)
+    def downloadLink(self, link):
+        if link and isinstance(link, basestring):
+            self.correctCaptcha()
+            self.download(urljoin("http://www.hellshare.com/", link), disposition=True)
 
 
 getInfo = create_getInfo(HellshareCz)
-- 
cgit v1.2.3