diff options
| -rw-r--r-- | config | 4 | ||||
| -rw-r--r-- | module/plugins/LinkList.py | 10 | ||||
| -rw-r--r-- | module/plugins/RapidshareCom.py | 8 | ||||
| -rwxr-xr-x | pyLoadCore.py | 2 |
4 files changed, 13 insertions, 11 deletions
@@ -10,11 +10,11 @@ cert = ssl.crt key = ssl.key [webinterface] -activated = True +activated = False port = 8080 template = default local = True -ssl = None #ONLY SPECIFY IF PYLOAD NOT RUN ON YOUR LOCALHOST +ssl = None #ONLY SPECIFY IF PYLOAD NOT RUN ON YOUR LOCALHOST username = None adress = None port = None diff --git a/module/plugins/LinkList.py b/module/plugins/LinkList.py index 092e3ef10..210451af9 100644 --- a/module/plugins/LinkList.py +++ b/module/plugins/LinkList.py @@ -35,10 +35,10 @@ class LinkList(Plugin): tmpLinks.append(link.replace("\n", "")) txt.close() - if not self.parent.core.config['general']['debug_mode']: - txt = open(linkList, 'w') - txt.write("") - txt.close() - #may delete read txt file? + #~ if not self.parent.core.config['general']['debug_mode']: + #~ txt = open(linkList, 'w') + #~ txt.write("") + #~ txt.close() + #~ #may delete read txt file? self.links = tmpLinks diff --git a/module/plugins/RapidshareCom.py b/module/plugins/RapidshareCom.py index ee1d84a75..c4e1f8ef9 100644 --- a/module/plugins/RapidshareCom.py +++ b/module/plugins/RapidshareCom.py @@ -115,8 +115,8 @@ class RapidshareCom(Plugin): if premkbleft < int(self.api_data["size"][0:-3]): self.logger.info("Rapidshare: Not enough traffic left") self.config["premium"] = False - - self.props["premkbleft"] = premkbleft + else: + self.props["premkbleft"] = premkbleft def download_html(self): """ gets the url from self.parent.url saves html in self.html and parses @@ -133,7 +133,9 @@ class RapidshareCom(Plugin): self.html_old = time() if re.search(r"is already downloading", self.html[1]) != None: - self.time_plus_wait = time() + 10 * 60 + self.logger.info("Rapidshare: Already downloading, wait 30 minutes") + self.time_plus_wait = time() + 10 * 30 + return False self.no_slots = False try: wait_minutes = re.search(r"Or try again in about (\d+) minute", self.html[1]).group(1) diff --git a/pyLoadCore.py b/pyLoadCore.py index c5be49c1a..371c0d8fb 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -153,7 +153,7 @@ class Core(object): self.server_methods.check_update() self.init_server() - #~ self.init_webserver() # start webinterface like cli, gui etc + self.init_webserver() # start webinterface like cli, gui etc self.logger.info(_("Downloadtime: %s") % self.server_methods.is_time_download()) # debug only |