diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/plugins/accounts/MultihostersCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/accounts/PutdriveCom.py | 4 | ||||
| -rw-r--r-- | module/plugins/accounts/ZeveraCom.py | 17 | ||||
| -rw-r--r-- | module/plugins/hoster/ZeveraCom.py | 9 |
4 files changed, 21 insertions, 13 deletions
diff --git a/module/plugins/accounts/MultihostersCom.py b/module/plugins/accounts/MultihostersCom.py index 0be64af7f..e98f17b2d 100644 --- a/module/plugins/accounts/MultihostersCom.py +++ b/module/plugins/accounts/MultihostersCom.py @@ -6,11 +6,11 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom class MultihostersCom(ZeveraCom): __name__ = "MultihostersCom" __type__ = "account" - __version__ = "0.02" + __version__ = "0.03" __description__ = """Multihosters.com account plugin""" __license__ = "GPLv3" __authors__ = [("tjeh", "tjeh@gmx.net")] - API_URL = "http://api.multihosters.com/jDownloader.ashx" + HOSTER_DOMAIN = "multihosters.com" diff --git a/module/plugins/accounts/PutdriveCom.py b/module/plugins/accounts/PutdriveCom.py index 7e7410d4e..4f2fadbcc 100644 --- a/module/plugins/accounts/PutdriveCom.py +++ b/module/plugins/accounts/PutdriveCom.py @@ -6,11 +6,11 @@ from module.plugins.accounts.ZeveraCom import ZeveraCom class PutdriveCom(ZeveraCom): __name__ = "PutdriveCom" __type__ = "account" - __version__ = "0.01" + __version__ = "0.02" __description__ = """Putdrive.com account plugin""" __license__ = "GPLv3" __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - API_URL = "http://api.putdrive.com/jDownloader.ashx" + HOSTER_DOMAIN = "putdrive.com" diff --git a/module/plugins/accounts/ZeveraCom.py b/module/plugins/accounts/ZeveraCom.py index d679f5aad..d863e4b37 100644 --- a/module/plugins/accounts/ZeveraCom.py +++ b/module/plugins/accounts/ZeveraCom.py @@ -8,7 +8,7 @@ from module.plugins.Account import Account class ZeveraCom(Account): __name__ = "ZeveraCom" __type__ = "account" - __version__ = "0.23" + __version__ = "0.24" __description__ = """Zevera.com account plugin""" __license__ = "GPLv3" @@ -16,9 +16,22 @@ class ZeveraCom(Account): ("Walter Purcaro", "vuolter@gmail.com")] - API_URL = "http://api.zevera.com/jDownloader.ashx" + HOSTER_DOMAIN = "zevera.com" + + + def __init__(self, manager, accounts): #@TODO: remove in 0.4.10 + self.init() + return super(ZeveraCom, self).__init__(manager, accounts) + def init(self): + if not self.HOSTER_DOMAIN: + self.logError(_("Missing HOSTER_DOMAIN")) + + if not self.API_URL: + self.API_URL = "http://api.%s/jDownloader.ashx" % (self.HOSTER_DOMAIN or "") + + def loadAccountInfo(self, user, req): validuntil = None trafficleft = None diff --git a/module/plugins/hoster/ZeveraCom.py b/module/plugins/hoster/ZeveraCom.py index 83ff16357..fb251142e 100644 --- a/module/plugins/hoster/ZeveraCom.py +++ b/module/plugins/hoster/ZeveraCom.py @@ -10,7 +10,7 @@ from module.plugins.internal.MultiHoster import MultiHoster, create_getInfo class ZeveraCom(MultiHoster): __name__ = "ZeveraCom" __type__ = "hoster" - __version__ = "0.26" + __version__ = "0.27" __pattern__ = r'https?://(?:www\.)zevera\.com/(getFiles\.ashx|Members/download\.ashx)\?.*ourl=.+' @@ -21,12 +21,7 @@ class ZeveraCom(MultiHoster): def handlePremium(self, pyfile): - html = self.account.api_response(self.req, cmd="checklink", olink=pyfile.url) - if "Alive" in html: - header = self.account.api_response(self.req, just_header=True, cmd="generatedownloaddirect", olink=pyfile.url) - self.link = self.directLink(header['location']) - else: - self.fail(re.search(r'Error: (.+)', html).group(1)) + return "https://%s/getFiles.ashx?ourl=%s" % (self.account.HOSTER_DOMAIN, pyfile.url) def checkFile(self): |