diff options
| -rw-r--r-- | Core.py | 6 | ||||
| -rw-r--r-- | Plugins/UploadedTo.py | 2 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rw-r--r-- | module/Py_Load_File.py | 4 | ||||
| -rw-r--r-- | module/download_thread.py | 12 |
5 files changed, 13 insertions, 13 deletions
@@ -226,8 +226,8 @@ class Core(object): for pyfile in self.thread_list.py_load_files: if pyfile.status.type == 'downloading': - print "Speed" ,pyfile.status.getSpeed() - print "ETA" , pyfile.status.getETA() + print "Speed" ,pyfile.status.get_speed() + print "ETA" , pyfile.status.get_ETA() try: fn = pyfile.status.filename @@ -245,8 +245,8 @@ class Core(object): def start(self): """ starts the machine """ + self._get_links(self.link_file) while True: - self._get_links(self.link_file) self.thread_list.status() self._test_print_status() sleep(1) diff --git a/Plugins/UploadedTo.py b/Plugins/UploadedTo.py index 0d00c8aa6..b0b2d1c66 100644 --- a/Plugins/UploadedTo.py +++ b/Plugins/UploadedTo.py @@ -38,7 +38,7 @@ class UploadedTo(Plugin): def download_html(self): url = self.parent.url - self.html = req.load(url) + self.html = self.req.load(url) try: wait_minutes = re.search(r"Or wait (\d+) minutes", self.html).group(1) @@ -1,7 +1,7 @@ [general] downloadFolder: Downloads linkFile: links.txt -useReconnect: True +useReconnect: False reconnectMethod: ./reconnect.sh [updates] searchUpdates: True diff --git a/module/Py_Load_File.py b/module/Py_Load_File.py index 4a15cd990..4eee82f91 100644 --- a/module/Py_Load_File.py +++ b/module/Py_Load_File.py @@ -6,10 +6,10 @@ class PyLoadFile: def __init__(self, parent, plugin, url): self.parent = parent self.id = None - pluginClass = getattr(plugin, plugin.__name__) + pluginClass = getattr(plugin, plugin.__name__) self.plugin = pluginClass(self) self.url = url - self.filename = "filename" + self.filename = "filename" self.download_folder = "" self.status = Status(self) diff --git a/module/download_thread.py b/module/download_thread.py index f6f43a295..171969c64 100644 --- a/module/download_thread.py +++ b/module/download_thread.py @@ -60,12 +60,12 @@ class Status(object): def set_status_queue(self, queue): self.status_queue = queue - def getETA(): - return self.pyfile.plugin.req.getETA() - def getSpeed(): - return self.pyfile.plugin.req.getSpeed() - def kBleft(): - return self.pyfile.plugins.req.kBleft() + def get_ETA(self): + return self.pyfile.plugin.req.get_ETA() + def get_speed(self): + return self.pyfile.plugin.req.get_speed() + def kB_left(): + return self.pyfile.plugins.req.kB_left() class Download_Thread(threading.Thread): |