From c521e6445bc8e6b91440813b90d1fdedd76c9721 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 19 Dec 2009 15:25:50 +0100 Subject: real reconnect fix ;-) --- pyLoadCore.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'pyLoadCore.py') diff --git a/pyLoadCore.py b/pyLoadCore.py index 946df9915..7b7e2754d 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -306,22 +306,11 @@ class Core(object): #~ self.webserver = WebServer(self) #~ if self.config['webinterface']['activated']: #~ self.webserver.start() - - - def is_download_time(self): - start = self.core.config['downloadTime']['start'].split(":") - end = self.core.config['downloadTime']['end'].split(":") - return self.core.compare_time(start, end) - - def is_reconnect_time(self): - start = self.core.config['reconnectTime']['start'].split(":") - end = self.core.config['reconnectTime']['end'].split(":") - return self.compare_time(start, end) - #################################### ########## XMLRPC Methods ########## #################################### + class ServerMethods(): def __init__(self, core): self.core = core @@ -483,6 +472,16 @@ class ServerMethods(): # self.core.file_list.move(id, 1) # self.core.file_list.save() + def is_time_download(self): + start = self.core.config['downloadTime']['start'].split(":") + end = self.core.config['downloadTime']['end'].split(":") + return self.core.compare_time(start, end) + + def is_time_reconnect(self): + start = self.core.config['reconnectTime']['start'].split(":") + end = self.core.config['reconnectTime']['end'].split(":") + return self.compare_time(start, end) + if __name__ == "__main__": pyload_core = Core() try: -- cgit v1.2.3