diff options
| author |  mkaay <mkaay@mkaay.de>
| 2009-11-30 22:00:04 +0100 |
|---|---|---|
| committer | mkaay <mkaay@mkaay.de>
| 2009-11-30 22:00:04 +0100 |
| commit | b3c1f830aaba0c22de22693e6b8cd81fe392f21a (patch) | |
| tree | a48c2e278cb1a0b48182e665a0d5bb5652fb4ff3 /module | |
| parent | WIP: package system second draft - unstable (diff) | |
| download | pyload-b3c1f830aaba0c22de22693e6b8cd81fe392f21a.tar.xz | |
fixed file_list
Diffstat (limited to 'module')
| -rw-r--r-- | module/file_list.py | 8 | ||||
| -rw-r--r-- | module/plugins/RapidshareCom.py | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/module/file_list.py b/module/file_list.py index 585c58ddf..f66567e0f 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -62,11 +62,11 @@ class File_List(object): collector = [] for n, pd in enumerate(obj["packages"]): p = PyLoadPackage() - pd.get(p) + pd.get(p, self) packages.append(p) for pd in obj["queue"]: p = PyLoadPackage() - pd.get(p) + pd.get(p, self) queue.append(p) for fd in obj["collector"]: f = PyLoadFile("", self) @@ -437,10 +437,10 @@ class PyLoadPackageData(): fdata.set(pyfile) self.files.append(fdata) - def get(self, pypack): + def get(self, pypack, fl): pypack.data = self.data for fdata in self.files: - pyfile = PyLoadFile() + pyfile = PyLoadFile(fdata.url, fl) fdata.get(pyfile) pyfile.package = pypack pypack.files.append(pyfile) diff --git a/module/plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py index 275fa761c..29e9a7c1f 100644 --- a/module/plugins/RapidshareCom.py +++ b/module/plugins/RapidshareCom.py @@ -6,6 +6,7 @@ from time import time from module.Plugin import Plugin import hashlib +import logging class RapidshareCom(Plugin): @@ -26,6 +27,7 @@ class RapidshareCom(Plugin): self.time_plus_wait = None #time() + wait in seconds self.want_reconnect = False self.no_slots = True + self.logger = logging.getLogger("log") self.read_config() if self.config['premium']: self.multi_dl = True @@ -141,7 +143,7 @@ class RapidshareCom(Plugin): except: if re.search(r"(Currently a lot of users|There are no more download slots)", self.html[1], re.I) != None: self.time_plus_wait = time() + 130 - self.parent.parent.logger.info("Rapidshare: No free slots!") + self.logger.info("Rapidshare: No free slots!") self.no_slots = True return True self.no_slots = False |