diff options
| author |  Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-08-02 18:37:00 +0200 |
|---|---|---|
| committer | Walter Purcaro <vuolter@users.noreply.github.com>
| 2015-08-02 18:37:00 +0200 |
| commit | d0acce3be51760fc97c6d8cf298ef37ba2f299ec (patch) | |
| tree | bb1e7491daf640ae06b86befbcbb4e6a5c986b01 /module/plugins/internal | |
| parent | Merge pull request #1665 from J-8/stable (diff) | |
| download | pyload-d0acce3be51760fc97c6d8cf298ef37ba2f299ec.tar.xz | |
Fix https://github.com/pyload/pyload/issues/1591
Diffstat (limited to 'module/plugins/internal')
| -rw-r--r-- | module/plugins/internal/SimpleCrypter.py | 28 | ||||
| -rw-r--r-- | module/plugins/internal/XFSAccount.py | 2 |
2 files changed, 14 insertions, 16 deletions
diff --git a/module/plugins/internal/SimpleCrypter.py b/module/plugins/internal/SimpleCrypter.py index f044fbb50..bcbfd6488 100644 --- a/module/plugins/internal/SimpleCrypter.py +++ b/module/plugins/internal/SimpleCrypter.py @@ -10,7 +10,7 @@ from module.utils import fixup, html_unescape class SimpleCrypter(Crypter, SimpleHoster): __name__ = "SimpleCrypter" __type__ = "crypter" - __version__ = "0.59" + __version__ = "0.60" __status__ = "testing" __pattern__ = r'^unmatchable$' @@ -57,25 +57,23 @@ class SimpleCrypter(Crypter, SimpleHoster): #@TODO: Remove in 0.4.10 - def load_account(self): - accountname = (self.__name__ + ".py").replace("Folder.py", "").replace(".py", "") + def _setup(self): + orig_name = self.__name__ + self.__name__ = (orig_name + ".py").replace("Folder.py", "").replace(".py", "") + + super(SimpleCrypter, self)._setup() - if self.req: - self.req.close() + self.__name__ = orig_name - if not self.account: - self.account = self.pyload.accountManager.getAccountPlugin(accountname) - if self.account: - if not self.user: - self.user = self.account.select()[0] + #@TODO: Remove in 0.4.10 + def load_account(self): + orig_name = self.__name__ + self.__name__ = (orig_name + ".py").replace("Folder.py", "").replace(".py", "") - if not self.user or not self.account.is_logged(self.user, relogin=True): - self.account = False + super(SimpleCrypter, self).load_account() - #: Browser instance, see `network.Browser` - self.req = self.pyload.requestFactory.getRequest(accountname, - self.user if self.account else None) + self.__name__ = orig_name def handle_direct(self, pyfile): diff --git a/module/plugins/internal/XFSAccount.py b/module/plugins/internal/XFSAccount.py index 5bf959400..0cd723bab 100644 --- a/module/plugins/internal/XFSAccount.py +++ b/module/plugins/internal/XFSAccount.py @@ -152,7 +152,7 @@ class XFSAccount(Account): def login(self, user, password, data, req): if not self.HOSTER_URL: - self.login_fail(_("Missing HOSTER_DOMAIN")) + self.login_fail(_("Missing HOSTER_URL")) if not self.LOGIN_URL: self.LOGIN_URL = urlparse.urljoin(self.HOSTER_URL, "login.html") |