summaryrefslogtreecommitdiffstats
path: root/module/plugins/hoster/HellshareCz.py
diff options
context:
space:
mode:
Diffstat (limited to 'module/plugins/hoster/HellshareCz.py')
-rw-r--r--module/plugins/hoster/HellshareCz.py40
1 files changed, 17 insertions, 23 deletions
diff --git a/module/plugins/hoster/HellshareCz.py b/module/plugins/hoster/HellshareCz.py
index d2f5c8e40..cc8341f8e 100644
--- a/module/plugins/hoster/HellshareCz.py
+++ b/module/plugins/hoster/HellshareCz.py
@@ -18,35 +18,28 @@
import re
import datetime
-from module.plugins.internal.SimpleHoster import SimpleHoster, parseFileInfo
+from math import ceil
+from module.plugins.internal.SimpleHoster import SimpleHoster, create_getInfo
from module.network.RequestFactory import getURL
-def getInfo(urls):
- result = []
-
- for url in urls:
- file_info = parseFileInfo(HellshareCz, url, getURL(url, decode=True))
- result.append(file_info)
-
- yield result
-
class HellshareCz(SimpleHoster):
__name__ = "HellshareCz"
__type__ = "hoster"
- __pattern__ = r"http://(?:.*\.)*hellshare\.(?:cz|com|sk|hu)/[^?]*/(\d+).*"
- __version__ = "0.74"
+ __pattern__ = r"(http://(?:.*\.)*hellshare\.(?:cz|com|sk|hu)/[^?]*/\d+).*"
+ __version__ = "0.76"
__description__ = """Hellshare.cz"""
__author_name__ = ("zoidberg")
FREE_URL_PATTERN = r'<form[^>]*action="(http://free\d*\.helldata[^"]*)"'
PREMIUM_URL_PATTERN = r"launchFullDownload\('([^']*)'\);"
- FILE_NAME_PATTERN = r'<h1 id="filename">([^<]+)</h1>'
- FILE_SIZE_PATTERN = r'<td><span>Size</span></td>\s*<th><span>([0-9.]*)&nbsp;(kB|KB|MB|GB)</span></th>'
+ FILE_NAME_PATTERN = r'<h1 id="filename">(?P<N>[^<]+)</h1>'
+ FILE_SIZE_PATTERN = r'<td><span>Size</span></td>\s*<th><span>(?P<S>[0-9.]*)&nbsp;(?P<U>[kKMG])i?B</span></th>'
FILE_OFFLINE_PATTERN = r'<h1>File not found.</h1>'
CAPTCHA_PATTERN = r'<img class="left" id="captcha-img"src="([^"]*)" />'
#FILE_CREDITS_PATTERN = r'<strong class="filesize">(\d+) MB</strong>'
CREDIT_LEFT_PATTERN = r'<p>After downloading this file you will have (\d+) MB for future downloads.'
DOWNLOAD_AGAIN_PATTERN = r'<p>This file you downloaded already and re-download is for free. </p>'
+ SHOW_WINDOW_PATTERN = r'<a href="([^?]+/(\d+)/\?do=(fileDownloadButton|relatedFileDownloadButton-\2)-showDownloadWindow)"'
def setup(self):
self.resumeDownload = self.multiDL = True if self.account else False
@@ -56,16 +49,15 @@ class HellshareCz(SimpleHoster):
if self.account:
self.account.relogin(self.user)
- pyfile.url = re.search(r'([^?]*)', pyfile.url).group(1)
+ pyfile.url = re.search(self.__pattern__, pyfile.url).group(1)
self.html = self.load(pyfile.url, decode = True)
self.getFileInfo()
-
- if "do=relatedFileDownloadButton" in self.html:
- found = re.search(self.__pattern__, self.pyfile.url)
- show_window = "relatedFileDownloadButton-%s-showDownloadWindow" % found.group(1)
- else:
- show_window = "fileDownloadButton-showDownloadWindow"
- self.html = self.load(pyfile.url, get = {"do" : show_window}, decode=True)
+
+ found = re.search(self.SHOW_WINDOW_PATTERN, self.html)
+ if not found: self.parseError('SHOW WINDOW')
+ url = found.group(1)
+ self.logDebug("SHOW WINDOW: " + url)
+ self.html = self.load("http://download.hellshare.com" + url, decode=True)
if self.account:
self.handlePremium()
@@ -128,4 +120,6 @@ class HellshareCz(SimpleHoster):
self.download(download_url)
info = self.account.getAccountInfo(self.user, True)
- self.logInfo("User %s has %i credits left" % (self.user, info["trafficleft"] / 1024)) \ No newline at end of file
+ self.logInfo("User %s has %i credits left" % (self.user, info["trafficleft"] / 1024))
+
+getInfo = create_getInfo(HellshareCz) \ No newline at end of file