diff options
| -rw-r--r-- | pyload/plugins/Crypter.py | 3 | ||||
| -rw-r--r-- | pyload/plugins/Hoster.py | 20 | ||||
| -rw-r--r-- | pyload/threads/InfoThread.py | 4 |
3 files changed, 6 insertions, 21 deletions
diff --git a/pyload/plugins/Crypter.py b/pyload/plugins/Crypter.py index 2175b5f94..2a65a9da2 100644 --- a/pyload/plugins/Crypter.py +++ b/pyload/plugins/Crypter.py @@ -5,8 +5,7 @@ from pyload.utils import to_list, has_method, uniqify from pyload.utils.fs import exists, remove, fs_encode from pyload.utils.packagetools import parseNames -from Base import Base, Fail, Retry, Abort - +from Base import Base, Retry class Package: """ Container that indicates that a new package should be created """ diff --git a/pyload/plugins/Hoster.py b/pyload/plugins/Hoster.py index 4d96c5730..c95b00009 100644 --- a/pyload/plugins/Hoster.py +++ b/pyload/plugins/Hoster.py @@ -1,22 +1,5 @@ # -*- coding: utf-8 -*- -""" - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, see <http://www.gnu.org/licenses/>. - - @author: RaNaN, spoob, mkaay -""" - import os from time import time @@ -65,7 +48,8 @@ class Hoster(Base): pass def __init__(self, pyfile): - Base.__init__(self, pyfile.m.core, pyfile.owner) + # TODO: pyfile.owner, but it's not correct yet + Base.__init__(self, pyfile.m.core) self.wantReconnect = False #: enables simultaneous processing of multiple downloads diff --git a/pyload/threads/InfoThread.py b/pyload/threads/InfoThread.py index b62596ad3..8aa5e2d24 100644 --- a/pyload/threads/InfoThread.py +++ b/pyload/threads/InfoThread.py @@ -65,7 +65,9 @@ class InfoThread(DecrypterThread): self.log.debug("Deprecated .getInfo() method on module level, use staticmethod instead") self.fetchForPlugin(plugin, urls, cb) - self.oc.done = True + if self.oc: + self.oc.done = True + self.names.clear() self.m.timestamp = time() + 5 * 60 |