summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar BlackSmith <git@blackserver.cz> 2014-04-18 15:48:34 +0200
committerGravatar Stefano <l.stickell@yahoo.it> 2014-04-21 17:23:08 +0200
commit29c90ce58445c1b4c7837da492340925451deeac (patch)
treebbb7fa343267c0e850e00a2416eddbfad429f98b
parentFix some container __pattern__ (diff)
downloadpyload-29c90ce58445c1b4c7837da492340925451deeac.tar.xz
Czshare renamed to Sdilej
Merges #584 (cherry picked from commit dc66f2c638c3c87e699d2a8344f53f9bbe8b36c8)
-rw-r--r--pyload/plugins/accounts/CzshareCom.py9
-rw-r--r--pyload/plugins/crypter/CzshareComFolder.py6
-rw-r--r--pyload/plugins/hoster/CzshareCom.py14
3 files changed, 14 insertions, 15 deletions
diff --git a/pyload/plugins/accounts/CzshareCom.py b/pyload/plugins/accounts/CzshareCom.py
index fc0b98793..bdd2000c9 100644
--- a/pyload/plugins/accounts/CzshareCom.py
+++ b/pyload/plugins/accounts/CzshareCom.py
@@ -25,16 +25,16 @@ from module.plugins.Account import Account
class CzshareCom(Account):
__name__ = "CzshareCom"
- __version__ = "0.13"
+ __version__ = "0.14"
__type__ = "account"
- __description__ = """Czshare.com account plugin"""
+ __description__ = """Czshare.com account plugin, now Sdilej.cz"""
__author_name__ = ("zoidberg", "stickell")
__author_mail__ = ("zoidberg@mujmail.cz", "l.stickell@yahoo.it")
CREDIT_LEFT_PATTERN = r'<tr class="active">\s*<td>([0-9 ,]+) (KiB|MiB|GiB)</td>\s*<td>([^<]*)</td>\s*</tr>'
def loadAccountInfo(self, user, req):
- html = req.load("http://czshare.com/prehled_kreditu/")
+ html = req.load("http://sdilej.cz/prehled_kreditu/")
found = re.search(self.CREDIT_LEFT_PATTERN, html)
if not found:
@@ -46,8 +46,7 @@ class CzshareCom(Account):
return {"validuntil": validuntil, "trafficleft": credits}
def login(self, user, data, req):
-
- html = req.load('https://czshare.com/index.php', post={
+ html = req.load('https://sdilej.cz/index.php', post={
"Prihlasit": "Prihlasit",
"login-password": data["password"],
"login-name": user
diff --git a/pyload/plugins/crypter/CzshareComFolder.py b/pyload/plugins/crypter/CzshareComFolder.py
index 37b83f4c3..d1ba8335c 100644
--- a/pyload/plugins/crypter/CzshareComFolder.py
+++ b/pyload/plugins/crypter/CzshareComFolder.py
@@ -7,9 +7,9 @@ from module.plugins.Crypter import Crypter
class CzshareComFolder(Crypter):
__name__ = "CzshareComFolder"
__type__ = "crypter"
- __pattern__ = r'http://(?:www\.)?czshare\.(com|cz)/folders/.*'
- __version__ = "0.1"
- __description__ = """Czshare.com folder decrypter plugin"""
+ __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/folders/.*'
+ __version__ = "0.2"
+ __description__ = """Czshare.com folder decrypter plugin, now Sdilej.cz"""
__author_name__ = "zoidberg"
__author_mail__ = "zoidberg@mujmail.cz"
diff --git a/pyload/plugins/hoster/CzshareCom.py b/pyload/plugins/hoster/CzshareCom.py
index 0cd111942..a462deaff 100644
--- a/pyload/plugins/hoster/CzshareCom.py
+++ b/pyload/plugins/hoster/CzshareCom.py
@@ -28,9 +28,9 @@ from module.utils import parseFileSize
class CzshareCom(SimpleHoster):
__name__ = "CzshareCom"
__type__ = "hoster"
- __pattern__ = r'http://(?:www\.)?czshare\.(com|cz)/(\d+/|download.php\?).*'
- __version__ = "0.93"
- __description__ = """CZshare.com hoster plugin"""
+ __pattern__ = r'http://(?:www\.)?(czshare|sdilej)\.(com|cz)/(\d+/|download.php\?).*'
+ __version__ = "0.94"
+ __description__ = """CZshare.com hoster plugin, now Sdilej.cz"""
__author_name__ = "zoidberg"
__author_mail__ = "zoidberg@mujmail.cz"
@@ -39,7 +39,7 @@ class CzshareCom(SimpleHoster):
FILE_OFFLINE_PATTERN = r'<div class="header clearfix">\s*<h2 class="red">'
FILE_SIZE_REPLACEMENTS = [(' ', '')]
- FILE_URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://czshare.com/\1/x/')]
+ FILE_URL_REPLACEMENTS = [(r'http://[^/]*/download.php\?.*?id=(\w+).*', r'http://sdilej.cz/\1/x/')]
SH_CHECK_TRAFFIC = True
FREE_URL_PATTERN = r'<a href="([^"]+)" class="page-download">[^>]*alt="([^"]+)" /></a>'
@@ -83,7 +83,7 @@ class CzshareCom(SimpleHoster):
self.resetAccount()
# download the file, destination is determined by pyLoad
- self.download("http://czshare.com/profi_down.php", post=inputs, disposition=True)
+ self.download("http://sdilej.cz/profi_down.php", post=inputs, disposition=True)
self.checkDownloadedFile()
def handleFree(self):
@@ -91,7 +91,7 @@ class CzshareCom(SimpleHoster):
found = re.search(self.FREE_URL_PATTERN, self.html)
if found is None:
raise PluginParseError('Free URL')
- parsed_url = "http://czshare.com" + found.group(1)
+ parsed_url = "http://sdilej.cz" + found.group(1)
self.logDebug("PARSED_URL:" + parsed_url)
# get download ticket and parse html
@@ -108,7 +108,7 @@ class CzshareCom(SimpleHoster):
raise PluginParseError('Form')
# get and decrypt captcha
- captcha_url = 'http://czshare.com/captcha.php'
+ captcha_url = 'http://sdilej.cz/captcha.php'
for _ in xrange(5):
inputs['captchastring2'] = self.decryptCaptcha(captcha_url)
self.html = self.load(parsed_url, cookies=True, post=inputs, decode=True)