diff options
| author |  godofdream <soilfiction@gmail.com>
| 2012-08-06 23:21:04 +0200 |
|---|---|---|
| committer | godofdream <soilfiction@gmail.com>
| 2012-08-06 23:21:04 +0200 |
| commit | e048e22c3377ae19b6a5e2f9a59c4a12c2da7816 (patch) | |
| tree | 8e5b795d0c3dd05ffe5022ea5fd360fca92cb4b1 | |
| parent | Added DdlStorage-folder support - closed #609, #573 (diff) | |
| download | pyload-e048e22c3377ae19b6a5e2f9a59c4a12c2da7816.tar.xz | |
| -rw-r--r-- | module/plugins/crypter/SerienjunkiesOrg.py | 7 | ||||
| -rw-r--r-- | module/plugins/hoster/ShareonlineBiz.py | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/module/plugins/crypter/SerienjunkiesOrg.py b/module/plugins/crypter/SerienjunkiesOrg.py index ebcb5cebc..dfe34ff6e 100644 --- a/module/plugins/crypter/SerienjunkiesOrg.py +++ b/module/plugins/crypter/SerienjunkiesOrg.py @@ -11,7 +11,7 @@ class SerienjunkiesOrg(Crypter): __name__ = "SerienjunkiesOrg" __type__ = "container" __pattern__ = r"http://.*?(serienjunkies.org|dokujunkies.org)/.*?" - __version__ = "0.35" + __version__ = "0.36" __config__ = [ ("changeNameSJ", "Packagename;Show;Season;Format;Episode", "Take SJ.org name", "Show"), ("changeNameDJ", "Packagename;Show;Format;Episode", "Take DJ.org name", "Show"), @@ -157,7 +157,10 @@ class SerienjunkiesOrg(Crypter): if re.search("#hasName", url) or ((self.getConfig("changeNameSJ") == "Packagename") and (self.getConfig("changeNameDJ") == "Packagename")): self.core.files.addLinks(links, self.pyfile.package().id) else: - eName = h1.text + if h1.text[2] == "_": + eName = h1.text[3:] + else: + eName = h1.text self.packages.append((eName, links, eName)) diff --git a/module/plugins/hoster/ShareonlineBiz.py b/module/plugins/hoster/ShareonlineBiz.py index 187ee062d..b94389008 100644 --- a/module/plugins/hoster/ShareonlineBiz.py +++ b/module/plugins/hoster/ShareonlineBiz.py @@ -43,7 +43,7 @@ class ShareonlineBiz(Hoster): __name__ = "ShareonlineBiz" __type__ = "hoster" __pattern__ = r"http://[\w\.]*?(share\-online\.biz|egoshare\.com)/(download.php\?id\=|dl/)[\w]+" - __version__ = "0.30" + __version__ = "0.31" __description__ = """Shareonline.biz Download Hoster""" __author_name__ = ("spoob", "mkaay", "zoidberg") __author_mail__ = ("spoob@pyload.org", "mkaay@mkaay.de", "zoidberg@mujmail.cz") @@ -69,8 +69,9 @@ class ShareonlineBiz(Hoster): check = self.checkDownload({"invalid" : re.compile("<strong>(This download ticket is.*?)</strong>"), "error" : re.compile("(Es ist ein unbekannter Fehler aufgetreten|An unknown error has occurred)"), - "cookie" : re.compile(r"<span class='udl'>Ihr Browser</span> verfügt leider nicht über einen gültigen <span class='udl'>Sitzungs Cookie</span>")}) - if check in ("invalid", "error", "cookie"): + "cookie" : re.compile(r"<span class='udl'>Ihr Browser</span> verfügt leider nicht über einen gültigen <span class='udl'>Sitzungs Cookie</span>"), + "login" : re.compile(r"<title>Share-Online"),}) + if check in ("invalid", "error", "cookie", "login"): self.logError(self.lastCheck.group(1)) if self.premium: self.account.getAccountInfo(self.user, True) |