diff options
| author |  Jeix <devnull@localhost>
| 2011-12-24 11:25:04 +0100 |
|---|---|---|
| committer | Jeix <devnull@localhost>
| 2011-12-24 11:25:04 +0100 |
| commit | 9da54933b2bcf58fb0d2342942815ce9e333a400 (patch) | |
| tree | ebeeb7c7e572b7193c2fb736e2adcf91b5b38624 /module | |
| parent | merge hotfixes in (diff) | |
| download | pyload-9da54933b2bcf58fb0d2342942815ce9e333a400.tar.xz | |
ShareOnline Premium, OronCom updates
Diffstat (limited to 'module')
| -rw-r--r-- | module/PluginThread.py | 4 | ||||
| -rw-r--r-- | module/plugins/accounts/ShareonlineBiz.py | 5 | ||||
| -rwxr-xr-x | module/plugins/hoster/OronCom.py | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/module/PluginThread.py b/module/PluginThread.py index 984b88e16..2acd04e53 100644 --- a/module/PluginThread.py +++ b/module/PluginThread.py @@ -134,9 +134,9 @@ class PluginThread(Thread): except Exception, e: dump += "<ERROR WHILE PRINTING VALUE> " + str(e) + "\n" - if pyfile.pluginname in self.m.core.config.plugin: + if pyfile.pluginname in self.m.core.config.values.keys(): dump += "\n\nCONFIG: \n\n" - dump += pformat(self.m.core.config.values) + "\n" + dump += pformat(self.m.core.config.values[pyfile.pluginname]) + "\n" return dump diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 967142204..4ecd7e1c2 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -23,14 +23,15 @@ import re class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" - __version__ = "0.2" + __version__ = "0.3" __type__ = "account" __description__ = """share-online.biz account plugin""" __author_name__ = ("mkaay") __author_mail__ = ("mkaay@mkaay.de") def getUserAPI(self, user, req): - src = req.load("http://api.share-online.biz/account.php?username=%s&password=%s&act=userDetails" % (user, self.accounts[user]["password"])) + data = self.getAccountData(user) + src = req.load("http://api.share-online.biz/account.php?username=%s&password=%s&act=userDetails" % (user, data["password"])) info = {} for line in src.splitlines(): key, value = line.split("=") diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py index e3e157a6d..0be840d76 100755 --- a/module/plugins/hoster/OronCom.py +++ b/module/plugins/hoster/OronCom.py @@ -33,12 +33,12 @@ class OronCom(Hoster): __name__ = "OronCom" __type__ = "hoster" __pattern__ = r"http://(?:www.)?oron.com/" - __version__ = "0.12" + __version__ = "0.13" __description__ = "File Hoster: Oron.com" __author_name__ = ("chrox", "DHMH") __author_mail__ = ("chrox@pyload.org", "DHMH@pyload.org") - FILE_INFO_PATTERN = r'Dateiname: <b class="f_arial f_14px">(.*)</b> <br>Größe: ([0-9,.]+) (Kb|Mb|Gb)' + FILE_INFO_PATTERN = r'(?:Filename|Dateiname): <b class="f_arial f_14px">(.*?)</b>\s*<br>\s*(?:Größe|File size): ([0-9,\.]+) (Kb|Mb|Gb)' def init(self): self.resumeDownload = self.multiDL = True if self.account else False |