From 7579e0750c7bd81c916012e2842c8a96ad8fa414 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 22 Nov 2009 15:04:30 +0100 Subject: secure xmlrpc --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index c55ce5bc6..1701b801b 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -113,7 +113,7 @@ class File_List(object): output = open('links.pkl', 'wb') cPickle.dump(self.data, output, -1) - self.inform_client() + #self.inform_client() self.lock.release() -- cgit v1.2.3 From 523e2857c47cdef1da6b43523bcf7871ed9e1d63 Mon Sep 17 00:00:00 2001 From: mkaay Date: Thu, 26 Nov 2009 22:05:11 +0100 Subject: complete new file_list, cleaned up --- module/file_list.py | 379 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 244 insertions(+), 135 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 1701b801b..6e1984704 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -1,159 +1,274 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# -#Copyright (C) 2009 RaNaN -# -#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 . -# -### -LIST_VERSION = 3 +""" + 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 . + + @author: mkaay + @author: RaNaN + @version: v0.3 + @list-version: v4 +""" + +LIST_VERSION = 4 from threading import RLock from download_thread import Status import cPickle import re -from module.remote.RequestObject import RequestObject import module.Plugin +class NoSuchElementException(Exception): + pass + class File_List(object): def __init__(self, core): self.core = core - self.files = [] - self.data = {'version': LIST_VERSION, 'order': []} self.lock = RLock() - self.load() - - def new_pyfile(self, url, folder): - url = url.replace("\n", "") - pyfile = PyLoadFile(self.core, url) - pyfile.download_folder = self.core.config['general']['download_folder'] - pyfile.id = self.get_id() - pyfile.folder = folder - - return pyfile - - def append(self, url, folder=""): - if not url: - return False - #@TODO: filter non existence and invalid links - #re.compile("https?://[-a-z0-9\.]{4,}(?::\d+)?/[^#?]+(?:#\S+)?",re.IGNORECASE) - new_file = self.new_pyfile(url, folder) - self.files.append(new_file) - self.data[new_file.id] = Data(url, folder) - self.data['order'].append(int(new_file.id)) - - def extend(self, urls): - for url in urls: - self.append(url) - - def remove(self, pyfile): - if not self.core.config['general']['debug_mode']: - if pyfile in self.files: - self.files.remove(pyfile) - - self.data['order'].remove(pyfile.id) - del self.data[pyfile.id] - - def remove_id(self, pyid): - #also abort download - pyid = int(pyid) - found = False - for pyfile in self.files: - if pyfile.id == pyid: - self.files.remove(pyfile) - found = True - break - - if not found: - for pyfile in self.core.thread_list.py_downloading: - if pyfile.id == pyid: - pyfile.plugin.req.abort = True - break - return False - - self.data['order'].remove(pyid) - del self.data[pyid] - - def get_id(self): - """return a free id""" - id = 1 - while id in self.data.keys(): - id += 1 - - return id - - def move(self, id, offset=-1): - - for pyfile in self.files: - if pyfile.id == id: - index = self.files.index(pyfile) - pyfile = self.files.pop(index) - self.files.insert(index + offset, pyfile) - break - - index = self.data['order'].index(id) - pyfile = self.data['order'].pop(index) - self.data['order'].insert(index + offset, pyfile) - - def save(self): - self.lock.acquire() - - output = open('links.pkl', 'wb') - cPickle.dump(self.data, output, -1) - - #self.inform_client() + self.download_folder = self.core.config['general']['download_folder'] + self.collector = self.pyLoadCollector(self) + self.packager = self.pyLoadPackager(self) + + self.data = { + "version": LIST_VERSION, + "queue": [], + "packages": [], + "collector": [] + } - self.lock.release() - def load(self): + self.lock.acquire() try: pkl_file = open('links.pkl', 'rb') obj = cPickle.load(pkl_file) except: - obj = {'version': LIST_VERSION, 'order': []} - - if obj['version'] < LIST_VERSION: - obj = {'version': LIST_VERSION, 'order': []} - - for i in obj['order']: - self.append(obj[i].url, obj[i].folder) - - self.core.logger.info("Links loaded: " + str(int(len(obj) - 2))) - - def inform_client(self): - obj = RequestObject() - obj.command = "file_list" - obj.data = self.data + obj = False + if obj['version'] == LIST_VERSION and obj: + self.data = obj + self.lock.release() + + if len(self.data["collector"]) > 0: + self.core.logger.info("Found %s links in linkcollector" % len(self.data["collector"])) + if len(self.data["packages"]) > 0: + self.core.logger.info("Found %s unqueued packages" % len(self.data["packages"])) + if len(self.data["queue"]) > 0: + self.core.logger.info("Added %s packages to queue" % len(self.data["queue"])) + + def save(self): + self.lock.acquire() - self.core.server.push_all(obj) + output = open('links.pkl', 'wb') + cPickle.dump(self.data, output, -1) + + self.lock.release() + + def queueEmpty(self): + return (self.data["queue"] == []) + + def getDownloadList(self): + """ + for thread_list only + """ + files = [] + for pypack in self.data["queue"]: + for pyfile in pypack.files: + if pyfile.status.type == "reconnected" or pyfile.status.type == None: + files.append(pyfile) + return files + + class pyLoadCollector(): + def __init__(collector, file_list): + collector.file_list = file_list + + def _getFileFromID(collector, id): + """ + returns PyLoadFile instance and position in collector with given id + """ + for n, pyfile in enumerate(collector.file_list.data["collector"]): + if pyfile.id == id: + return (n, pyfile) + raise NoSuchElementException() + + def _getFreeID(collector): + """ + returns a free id + """ + ids = [] + for pyfile in collector.file_list.data["collector"]: + ids.append(pyfile.id) + id = 1 + while id in ids: + id += 1 + return id + + def getFile(collector, id): + """ + returns PyLoadFile instance from given id + """ + return collector._getFileFromID(id)[1] + + def popFile(collector, id): + """ + returns PyLoadFile instance given id and remove it from the collector + """ + collector.file_list.lock.acquire() + try: + n, pyfile = collector._getFileFromID(id) + del collector.file_list.data["collector"][n] + collector.file_list.lock.release() + except: + collector.file_list.lock.release() + else: + return pyfile + + def addLink(collector, url): + """ + appends a new PyLoadFile instance to the end of the collector + """ + pyfile = PyLoadFile(url) + pyfile.id = collector._getFreeID() + pyfile.download_folder = collector.file_list.download_folder + collector.file_list.lock.acquire() + collector.file_list.data["collector"].append(pyfile) + collector.file_list.lock.release() + return pyfile.id + + def removeFile(collector, id): + """ + removes PyLoadFile instance with the given id from collector + """ + collector.popFile(id) + + def replaceFile(collector, newpyfile): + """ + replaces PyLoadFile instance with the given PyLoadFile instance at the given id + """ + collector.file_list.lock.acquire() + try: + n, pyfile = collector._getFileFromID(newpyfile.id) + collector.file_list.data["collector"][n] = newpyfile + finally: + collector.file_list.lock.release() + + class pyLoadPackager(): + def __init__(packager, file_list): + packager.file_list = file_list + + def _getFreeID(packager): + """ + returns a free id + """ + ids = [] + for pypack in (packager.file_list.data["packages"] + packager.file_list.data["queue"]): + ids.append(pypack.id) + id = 1 + while id in ids: + id += 1 + return id + + def _getPackageFromID(packager, id): + """ + returns PyLoadPackage instance and position with given id + """ + for n, pypack in enumerate(packager.file_list.data["packages"]): + if pypack.id == id: + return ("packages", n, pypack) + for n, pypack in enumerate(packager.file_list.data["queue"]): + if pypack.id == id: + return ("queue", n, pypack) + raise NoSuchElementException() + + def addNewPackage(packager, package_name=None): + pypack = PyLoadPackage() + pypack.id = packager._getFreeID() + if package_name is not None: + pypack.data["package_name"] = package_name + packager.file_list.data["packages"].append(pypack) + return pypack.id + + def removePackage(packager, id): + packager.file_list.lock.acquire() + try: + key, n, pypack = packager._getPackageFromID(id) + del packager.file_list.data[key][n] + finally: + packager.file_list.lock.release() + + def pushPackage2Queue(packager, id): + packager.file_list.lock.acquire() + try: + key, n, pypack = packager._getPackageFromID(id) + if key == "packages": + del packager.file_list.data["packages"][n] + packager.file_list.data["queue"].append(pypack) + finally: + packager.file_list.lock.release() + + def pullOutPackage(packager, id): + packager.file_list.lock.acquire() + try: + key, n, pypack = packager._getPackageFromID(id) + if key == "queue": + del packager.file_list.data["queue"][n] + packager.file_list.data["packages"].append(pypack) + finally: + packager.file_list.lock.release() + + def setPackageData(packager, id, package_name=None, folder=None): + packager.file_list.lock.acquire() + try: + key, n, pypack = packager._getPackageFromID(id) + if package_name is not None: + pypack.data["package_name"] = package_name + if folder is not None: + pypack.data["folder"] = folder + packager.file_list.data[key][n] = pypack + finally: + packager.file_list.lock.release() + + def addFileToPackage(packager, id, pyfile): + key, n, pypack = packager._getPackageFromID(id) + pyfile.package = pypack + pypack.files.append(pyfile) + packager.file_list.data[key][n] = pypack + + def removeFileFromPackage(packager, id, pid): + key, n, pypack = packager._getPackageFromID(pid) + for k, pyfile in enumerate(pypack.files): + if id == pyfile.id: + del pypack.files[k] + return True + raise NoSuchElementException() -class Data(): - def __init__(self, url, folder=""): - self.url = url - self.folder = folder +class PyLoadPackage(): + def __init__(self): + self.files = [] + self.data = { + "id": None, + "package_name": "", + "folder": "" + } -class PyLoadFile: - """ represents the url or file - """ - def __init__(self, parent, url): - self.parent = parent +class PyLoadFile(): + def __init__(self, url): self.id = None self.url = url self.folder = None + self.package = None self.filename = "filename" self.download_folder = "" + self.active = False pluginName = self._get_my_plugin() if pluginName: self.modul = __import__(pluginName) @@ -163,18 +278,12 @@ class PyLoadFile: pluginClass = module.Plugin.Plugin self.plugin = pluginClass(self) self.status = Status(self) + def _get_my_plugin(self): - - """ searches the right plugin for an url - """ for plugin, plugin_pattern in self.parent.plugins_avaible.items(): if re.match(plugin_pattern, self.url) != None: return plugin def init_download(self): - if self.parent.config['proxy']['activated']: self.plugin.req.add_proxy(self.parent.config['proxy']['protocol'], self.parent.config['proxy']['adress']) - - #@TODO: check dependicies, ocr etc - -- cgit v1.2.3 From 80cd07afb67746a0279d6f194102e0d52bdbba29 Mon Sep 17 00:00:00 2001 From: mkaay Date: Fri, 27 Nov 2009 16:55:55 +0100 Subject: fixed file_list --- module/file_list.py | 124 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 113 insertions(+), 11 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 6e1984704..f3bfc0b8a 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -28,6 +28,7 @@ from download_thread import Status import cPickle import re import module.Plugin +import traceback class NoSuchElementException(Exception): pass @@ -46,6 +47,7 @@ class File_List(object): "packages": [], "collector": [] } + self.load() def load(self): self.lock.acquire() @@ -54,7 +56,26 @@ class File_List(object): obj = cPickle.load(pkl_file) except: obj = False - if obj['version'] == LIST_VERSION and obj: + traceback.print_exc() + if obj['version'] == LIST_VERSION and obj != False: + packages = [] + queue = [] + collector = [] + for n, pd in enumerate(obj["packages"]): + p = PyLoadPackage() + pd.get(p) + packages.append(p) + for pd in obj["queue"]: + p = PyLoadPackage() + pd.get(p) + queue.append(p) + for fd in obj["collector"]: + f = PyLoadFile("", self) + fd.get(f) + collector.append(f) + obj["packages"] = packages + obj["queue"] = queue + obj["collector"] = collector self.data = obj self.lock.release() @@ -67,9 +88,34 @@ class File_List(object): def save(self): self.lock.acquire() - + + pdata = { + "version": LIST_VERSION, + "queue": [], + "packages": [], + "collector": [] + } + packages = [] + queue = [] + collector = [] + for p in self.data["packages"]: + pd = PyLoadPackageData() + pd.set(p) + packages.append(pd) + for p in self.data["queue"]: + pd = PyLoadPackageData() + pd.set(p) + queue.append(pd) + for f in self.data["collector"]: + fd = PyLoadFileData() + fd.set(f) + collector.append(fd) + pdata["packages"] = packages + pdata["queue"] = queue + pdata["collector"] = collector + output = open('links.pkl', 'wb') - cPickle.dump(self.data, output, -1) + cPickle.dump(pdata, output, -1) self.lock.release() @@ -83,7 +129,7 @@ class File_List(object): files = [] for pypack in self.data["queue"]: for pyfile in pypack.files: - if pyfile.status.type == "reconnected" or pyfile.status.type == None: + if (pyfile.status.type == "reconnected" or pyfile.status.type == None) and not pyfile.active: files.append(pyfile) return files @@ -136,7 +182,7 @@ class File_List(object): """ appends a new PyLoadFile instance to the end of the collector """ - pyfile = PyLoadFile(url) + pyfile = PyLoadFile(url, collector.file_list) pyfile.id = collector._getFreeID() pyfile.download_folder = collector.file_list.download_folder collector.file_list.lock.acquire() @@ -256,15 +302,17 @@ class PyLoadPackage(): self.files = [] self.data = { "id": None, - "package_name": "", - "folder": "" + "package_name": "new_package", + "folder": None } class PyLoadFile(): - def __init__(self, url): + def __init__(self, url, file_list): self.id = None self.url = url self.folder = None + self.file_list = file_list + self.core = file_list.core self.package = None self.filename = "filename" self.download_folder = "" @@ -280,10 +328,64 @@ class PyLoadFile(): self.status = Status(self) def _get_my_plugin(self): - for plugin, plugin_pattern in self.parent.plugins_avaible.items(): + for plugin, plugin_pattern in self.core.plugins_avaible.items(): if re.match(plugin_pattern, self.url) != None: return plugin def init_download(self): - if self.parent.config['proxy']['activated']: - self.plugin.req.add_proxy(self.parent.config['proxy']['protocol'], self.parent.config['proxy']['adress']) + if self.core.config['proxy']['activated']: + self.plugin.req.add_proxy(self.core.config['proxy']['protocol'], self.core.config['proxy']['adress']) + +class PyLoadFileData(): + def __init__(self): + self.id = None + self.url = None + self.folder = None + self.pack_id = None + self.filename = None + self.status_type = None + self.status_url = None + + def set(self, pyfile): + self.id = pyfile.id + self.url = pyfile.url + self.folder = pyfile.folder + self.parsePackage(pyfile.package) + self.filename = pyfile.filename + self.status_type = pyfile.status.type + self.status_url = pyfile.status.url + self.status_filename = pyfile.status.filename + self.status_error = pyfile.status.error + + def get(self, pyfile): + pyfile.id = self.id + pyfile.url = self.url + pyfile.folder = self.folder + pyfile.filename = self.filename + pyfile.status.type = self.status_type + pyfile.status.url = self.status_url + pyfile.status.filename = self.status_filename + pyfile.status.error = self.status_error + + def parsePackage(self, pack): + if pack: + self.pack_id = pack.id + +class PyLoadPackageData(): + def __init__(self): + self.data = None + self.links = [] + + def set(self, pypack): + self.data = pypack.data + for pyfile in pypack.links: + fdata = PyLoadFileData() + fdata.set(pyfile) + self.links.append(fdata) + + def get(self, pypack): + for fdata in self.links: + pyfile = PyLoadFile() + fdata.get(pyfile) + pyfile.package = pypack + pypack.links.append(pyfile) -- cgit v1.2.3 From 7fb23f31ac129442f35d2d98a5ef3f0b387dc8e2 Mon Sep 17 00:00:00 2001 From: mkaay Date: Fri, 27 Nov 2009 23:51:44 +0100 Subject: updated xmlrpc methods --- module/file_list.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index f3bfc0b8a..1bcfb8580 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -151,6 +151,9 @@ class File_List(object): returns a free id """ ids = [] + for pypack in (packager.file_list.data["packages"] + packager.file_list.data["queue"]): + for pyf in pypack.links: + ids.append(pyf.id) for pyfile in collector.file_list.data["collector"]: ids.append(pyfile.id) id = 1 @@ -235,6 +238,20 @@ class File_List(object): return ("queue", n, pypack) raise NoSuchElementException() + def _getFileFromID(packager, id): + """ + returns PyLoadFile instance and position with given id + """ + for n, pypack in enumerate(packager.file_list.data["packages"]): + for pyfile in pypack.files: + if pyfile.id == id: + return ("packages", n, pyfile, pypack, pid) + for n, pypack in enumerate(packager.file_list.data["queue"]): + for pyfile in pypack.files: + if pyfile.id == id: + return ("queue", n, pyfile, pypack, pid) + raise NoSuchElementException() + def addNewPackage(packager, package_name=None): pypack = PyLoadPackage() pypack.id = packager._getFreeID() @@ -251,6 +268,17 @@ class File_List(object): finally: packager.file_list.lock.release() + def removeFile(packager, id): + """ + removes PyLoadFile instance with the given id from package + """ + packager.file_list.lock.acquire() + try: + key, n, pyfile, pypack, pid = self._getFileFromID() + del pypack.files[n] + finally: + packager.file_list.lock.release() + def pushPackage2Queue(packager, id): packager.file_list.lock.acquire() try: -- cgit v1.2.3 From 54b787dd2a35b51952fdcb26df51cb18a0c97060 Mon Sep 17 00:00:00 2001 From: spoob Date: Sat, 28 Nov 2009 14:17:28 +0100 Subject: cleaned and fixed --- module/file_list.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 1bcfb8580..7b886cc2c 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -28,7 +28,6 @@ from download_thread import Status import cPickle import re import module.Plugin -import traceback class NoSuchElementException(Exception): pass @@ -56,8 +55,7 @@ class File_List(object): obj = cPickle.load(pkl_file) except: obj = False - traceback.print_exc() - if obj['version'] == LIST_VERSION and obj != False: + if obj != False and obj['version'] == LIST_VERSION: packages = [] queue = [] collector = [] @@ -151,7 +149,7 @@ class File_List(object): returns a free id """ ids = [] - for pypack in (packager.file_list.data["packages"] + packager.file_list.data["queue"]): + for pypack in (collector.file_list.data["packages"] + collector.file_list.data["queue"]): for pyf in pypack.links: ids.append(pyf.id) for pyfile in collector.file_list.data["collector"]: -- cgit v1.2.3 From 8effa6e3712a11104835aa031242b39a29f291a0 Mon Sep 17 00:00:00 2001 From: spoob Date: Sun, 29 Nov 2009 15:18:18 +0100 Subject: links.pkl now in module, nicer terminal kill --- module/file_list.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 7b886cc2c..c95eefcec 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -28,6 +28,7 @@ from download_thread import Status import cPickle import re import module.Plugin +from os import sep class NoSuchElementException(Exception): pass @@ -51,7 +52,7 @@ class File_List(object): def load(self): self.lock.acquire() try: - pkl_file = open('links.pkl', 'rb') + pkl_file = open('module' + sep + 'links.pkl', 'rb') obj = cPickle.load(pkl_file) except: obj = False @@ -112,7 +113,7 @@ class File_List(object): pdata["queue"] = queue pdata["collector"] = collector - output = open('links.pkl', 'wb') + output = open('module' + sep + 'links.pkl', 'wb') cPickle.dump(pdata, output, -1) self.lock.release() -- cgit v1.2.3 From 0511d85691e8cf1c0c70045cf23e8abc6fc7cf40 Mon Sep 17 00:00:00 2001 From: mkaay Date: Mon, 30 Nov 2009 19:24:07 +0100 Subject: WIP: package system for cli --- module/file_list.py | 52 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 12 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index c95eefcec..1b9526eb8 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -132,6 +132,22 @@ class File_List(object): files.append(pyfile) return files + def getFileInfo(self, id): + try: + n, pyfile = self.collector._getFileFromID(id) + except NoSuchElementException: + key, n, pyfile, pypack, pid = self.packager._getFileFromID() + info = {} + info["id"] = pyfile.id + info["url"] = pyfile.url + info["folder"] = pyfile.folder + info["filename"] = pyfile.filename + info["status_type"] = pyfile.status.type + info["status_url"] = pyfile.status.url + info["status_filename"] = pyfile.status.filename + info["status_error"] = pyfile.status.error + return info + class pyLoadCollector(): def __init__(collector, file_list): collector.file_list = file_list @@ -151,7 +167,7 @@ class File_List(object): """ ids = [] for pypack in (collector.file_list.data["packages"] + collector.file_list.data["queue"]): - for pyf in pypack.links: + for pyf in pypack.files: ids.append(pyf.id) for pyfile in collector.file_list.data["collector"]: ids.append(pyfile.id) @@ -219,7 +235,7 @@ class File_List(object): """ ids = [] for pypack in (packager.file_list.data["packages"] + packager.file_list.data["queue"]): - ids.append(pypack.id) + ids.append(pypack.data["id"]) id = 1 while id in ids: id += 1 @@ -230,10 +246,10 @@ class File_List(object): returns PyLoadPackage instance and position with given id """ for n, pypack in enumerate(packager.file_list.data["packages"]): - if pypack.id == id: + if pypack.data["id"] == id: return ("packages", n, pypack) for n, pypack in enumerate(packager.file_list.data["queue"]): - if pypack.id == id: + if pypack.data["id"] == id: return ("queue", n, pypack) raise NoSuchElementException() @@ -253,11 +269,11 @@ class File_List(object): def addNewPackage(packager, package_name=None): pypack = PyLoadPackage() - pypack.id = packager._getFreeID() + pypack.data["id"] = packager._getFreeID() if package_name is not None: pypack.data["package_name"] = package_name packager.file_list.data["packages"].append(pypack) - return pypack.id + return pypack.data["id"] def removePackage(packager, id): packager.file_list.lock.acquire() @@ -310,6 +326,17 @@ class File_List(object): finally: packager.file_list.lock.release() + def getPackageData(packager, id): + key, n, pypack = packager._getPackageFromID(id) + return pypack.data + + def getPackageFiles(packager, id): + key, n, pypack = packager._getPackageFromID(id) + ids = [] + for pyfile in pypack: + ids.append(pyfile.id) + return ids + def addFileToPackage(packager, id, pyfile): key, n, pypack = packager._getPackageFromID(id) pyfile.package = pypack @@ -396,23 +423,24 @@ class PyLoadFileData(): def parsePackage(self, pack): if pack: - self.pack_id = pack.id + self.pack_id = pack.data["id"] class PyLoadPackageData(): def __init__(self): self.data = None - self.links = [] + self.files = [] def set(self, pypack): self.data = pypack.data - for pyfile in pypack.links: + for pyfile in pypack.files: fdata = PyLoadFileData() fdata.set(pyfile) - self.links.append(fdata) + self.files.append(fdata) def get(self, pypack): - for fdata in self.links: + pypack.data = self.data + for fdata in self.files: pyfile = PyLoadFile() fdata.get(pyfile) pyfile.package = pypack - pypack.links.append(pyfile) + pypack.files.append(pyfile) -- cgit v1.2.3 From 7caec14b0a307df9f2bd9ea6a9db6977a836145b Mon Sep 17 00:00:00 2001 From: mkaay Date: Mon, 30 Nov 2009 21:25:33 +0100 Subject: WIP: package system second draft - unstable --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 1b9526eb8..585c58ddf 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -333,7 +333,7 @@ class File_List(object): def getPackageFiles(packager, id): key, n, pypack = packager._getPackageFromID(id) ids = [] - for pyfile in pypack: + for pyfile in pypack.files: ids.append(pyfile.id) return ids -- cgit v1.2.3 From b3c1f830aaba0c22de22693e6b8cd81fe392f21a Mon Sep 17 00:00:00 2001 From: mkaay Date: Mon, 30 Nov 2009 22:00:04 +0100 Subject: fixed file_list --- module/file_list.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/file_list.py') 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) -- cgit v1.2.3 From 78f061eed59e084f001f8a0cd9c5b585f6fc0ce0 Mon Sep 17 00:00:00 2001 From: mkaay Date: Fri, 4 Dec 2009 20:01:17 +0100 Subject: fixes, minimal gui changes --- module/file_list.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index f66567e0f..2bfe37298 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -136,7 +136,7 @@ class File_List(object): try: n, pyfile = self.collector._getFileFromID(id) except NoSuchElementException: - key, n, pyfile, pypack, pid = self.packager._getFileFromID() + key, n, pyfile, pypack, pid = self.packager._getFileFromID(id) info = {} info["id"] = pyfile.id info["url"] = pyfile.url @@ -146,6 +146,7 @@ class File_List(object): info["status_url"] = pyfile.status.url info["status_filename"] = pyfile.status.filename info["status_error"] = pyfile.status.error + info["active"] = pyfile.active return info class pyLoadCollector(): @@ -260,11 +261,11 @@ class File_List(object): for n, pypack in enumerate(packager.file_list.data["packages"]): for pyfile in pypack.files: if pyfile.id == id: - return ("packages", n, pyfile, pypack, pid) + return ("packages", n, pyfile, pypack, pypack.data["id"]) for n, pypack in enumerate(packager.file_list.data["queue"]): for pyfile in pypack.files: if pyfile.id == id: - return ("queue", n, pyfile, pypack, pid) + return ("queue", n, pyfile, pypack, pypack.data["id"]) raise NoSuchElementException() def addNewPackage(packager, package_name=None): @@ -291,6 +292,8 @@ class File_List(object): try: key, n, pyfile, pypack, pid = self._getFileFromID() del pypack.files[n] + if not pypack.files: + packager.removePackage(pid) finally: packager.file_list.lock.release() @@ -343,11 +346,14 @@ class File_List(object): pypack.files.append(pyfile) packager.file_list.data[key][n] = pypack + #oooops, duplicate? def removeFileFromPackage(packager, id, pid): key, n, pypack = packager._getPackageFromID(pid) for k, pyfile in enumerate(pypack.files): if id == pyfile.id: del pypack.files[k] + if not pypack.files: + packager.removePackage(pid) return True raise NoSuchElementException() @@ -368,7 +374,7 @@ class PyLoadFile(): self.file_list = file_list self.core = file_list.core self.package = None - self.filename = "filename" + self.filename = "n/a" self.download_folder = "" self.active = False pluginName = self._get_my_plugin() @@ -380,6 +386,8 @@ class PyLoadFile(): pluginClass = module.Plugin.Plugin self.plugin = pluginClass(self) self.status = Status(self) + if self.plugin.file_exists(): + self.filename = self.plugin.get_file_name() def _get_my_plugin(self): for plugin, plugin_pattern in self.core.plugins_avaible.items(): -- cgit v1.2.3 From 13328322307cde0c9fdd62bfccbcf4a78404164b Mon Sep 17 00:00:00 2001 From: mkaay Date: Tue, 15 Dec 2009 23:09:09 +0100 Subject: incomplete: stable gui O.o, folder fix --- module/file_list.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 2bfe37298..ea4fd5767 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -203,7 +203,7 @@ class File_List(object): """ pyfile = PyLoadFile(url, collector.file_list) pyfile.id = collector._getFreeID() - pyfile.download_folder = collector.file_list.download_folder + pyfile.folder = collector.file_list.download_folder collector.file_list.lock.acquire() collector.file_list.data["collector"].append(pyfile) collector.file_list.lock.release() @@ -363,19 +363,18 @@ class PyLoadPackage(): self.data = { "id": None, "package_name": "new_package", - "folder": None + "folder": "" } class PyLoadFile(): def __init__(self, url, file_list): self.id = None self.url = url - self.folder = None + self.folder = "" self.file_list = file_list self.core = file_list.core self.package = None self.filename = "n/a" - self.download_folder = "" self.active = False pluginName = self._get_my_plugin() if pluginName: -- cgit v1.2.3 From f89a0fcfbcca01067175ba7a67c14eb95bd60d6f Mon Sep 17 00:00:00 2001 From: mkaay Date: Wed, 16 Dec 2009 17:13:46 +0100 Subject: gui server status --- module/file_list.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index ea4fd5767..ae168900b 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -132,6 +132,9 @@ class File_List(object): files.append(pyfile) return files + def countDownloads(self): + return len(self.getDownloadList()) + def getFileInfo(self, id): try: n, pyfile = self.collector._getFileFromID(id) @@ -147,6 +150,7 @@ class File_List(object): info["status_filename"] = pyfile.status.filename info["status_error"] = pyfile.status.error info["active"] = pyfile.active + info["plugin"] = pyfile.plugin.props['name'] return info class pyLoadCollector(): -- cgit v1.2.3 From 9fd8d0c20d4495319b72bd2faa7275c75a7fcacc Mon Sep 17 00:00:00 2001 From: spoob Date: Wed, 16 Dec 2009 22:28:57 +0100 Subject: Fixed Relink.us, Uploaded.to Name Bug --- module/file_list.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index ae168900b..1cd069de7 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -144,7 +144,7 @@ class File_List(object): info["id"] = pyfile.id info["url"] = pyfile.url info["folder"] = pyfile.folder - info["filename"] = pyfile.filename + info["filename"] = pyfile.status.filename info["status_type"] = pyfile.status.type info["status_url"] = pyfile.status.url info["status_filename"] = pyfile.status.filename @@ -389,8 +389,7 @@ class PyLoadFile(): pluginClass = module.Plugin.Plugin self.plugin = pluginClass(self) self.status = Status(self) - if self.plugin.file_exists(): - self.filename = self.plugin.get_file_name() + self.status.filename = self.url def _get_my_plugin(self): for plugin, plugin_pattern in self.core.plugins_avaible.items(): -- cgit v1.2.3 From 14f5966246fb22959f1d280f14683b8bf4c6c005 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 20 Dec 2009 19:51:12 +0100 Subject: fixed file removing? --- module/file_list.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 1cd069de7..efe45c044 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -195,11 +195,10 @@ class File_List(object): try: n, pyfile = collector._getFileFromID(id) del collector.file_list.data["collector"][n] - collector.file_list.lock.release() - except: - collector.file_list.lock.release() else: return pyfile + finally: + collector.file_list.lock.release() def addLink(collector, url): """ -- cgit v1.2.3 From ff9a9560fef2d4a977a994d967e2848c1b62d206 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 20 Dec 2009 20:00:40 +0100 Subject: fixed file_list, clean exit? --- module/file_list.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index efe45c044..9d4c090d1 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -195,6 +195,8 @@ class File_List(object): try: n, pyfile = collector._getFileFromID(id) del collector.file_list.data["collector"][n] + except Exception, e: + raise Exception, e else: return pyfile finally: -- cgit v1.2.3 From 77ebea73401f00f9150299317bdddaa24beddd2a Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 20 Dec 2009 23:22:46 +0100 Subject: file_list fix, webinterface termination fix AGAIN -.-' --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 9d4c090d1..67ae447bb 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -295,7 +295,7 @@ class File_List(object): """ packager.file_list.lock.acquire() try: - key, n, pyfile, pypack, pid = self._getFileFromID() + key, n, pyfile, pypack, pid = packager._getFileFromID() del pypack.files[n] if not pypack.files: packager.removePackage(pid) -- cgit v1.2.3 From a401b34f9835bd402e7cc43b6975d049984fabca Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 20 Dec 2009 23:50:36 +0100 Subject: file_list... --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 67ae447bb..1d3b1a68f 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -295,7 +295,7 @@ class File_List(object): """ packager.file_list.lock.acquire() try: - key, n, pyfile, pypack, pid = packager._getFileFromID() + key, n, pyfile, pypack, pid = packager._getFileFromID(id) del pypack.files[n] if not pypack.files: packager.removePackage(pid) -- cgit v1.2.3 From a5ff0482ede8bd7bd932482887f2f7cdae5039d9 Mon Sep 17 00:00:00 2001 From: mkaay Date: Wed, 23 Dec 2009 00:04:36 +0100 Subject: core: downloadlimit is not far away ;) gui: restart download action --- module/file_list.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 1d3b1a68f..f156e2c0d 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -350,6 +350,15 @@ class File_List(object): pyfile.package = pypack pypack.files.append(pyfile) packager.file_list.data[key][n] = pypack + + def resetFileStatus(packager, fileid): + packager.file_list.lock.acquire() + try: + key, n, pyfile, pypack, pid = packager._getFileFromID(fileid) + pyfile.init() + pyfile.status.type = None + finally: + packager.file_list.lock.release() #oooops, duplicate? def removeFileFromPackage(packager, id, pid): @@ -380,6 +389,9 @@ class PyLoadFile(): self.core = file_list.core self.package = None self.filename = "n/a" + self.init() + + def init(self): self.active = False pluginName = self._get_my_plugin() if pluginName: -- cgit v1.2.3 From ea04c11ce1fb52895449a56e862eff5448ea456a Mon Sep 17 00:00:00 2001 From: mkaay Date: Thu, 24 Dec 2009 01:28:08 +0100 Subject: downloads are now aborted correctly, gui: remove downloads, new icons --- module/file_list.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index f156e2c0d..9d7260889 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -29,6 +29,7 @@ import cPickle import re import module.Plugin from os import sep +from time import sleep class NoSuchElementException(Exception): pass @@ -285,6 +286,9 @@ class File_List(object): packager.file_list.lock.acquire() try: key, n, pypack = packager._getPackageFromID(id) + for pyfile in pypack.files: + pyfile.plugin.req.abort = True + sleep(0.1) del packager.file_list.data[key][n] finally: packager.file_list.lock.release() @@ -296,6 +300,8 @@ class File_List(object): packager.file_list.lock.acquire() try: key, n, pyfile, pypack, pid = packager._getFileFromID(id) + pyfile.plugin.req.abort = True + sleep(0.1) del pypack.files[n] if not pypack.files: packager.removePackage(pid) -- cgit v1.2.3 From 8e87787753b2e049917a5491727d285b1c5a7095 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 27 Dec 2009 00:20:21 +0100 Subject: closes #13 --- module/file_list.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 9d7260889..bb04ae898 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -401,8 +401,12 @@ class PyLoadFile(): self.active = False pluginName = self._get_my_plugin() if pluginName: - self.modul = __import__(pluginName) - pluginClass = getattr(self.modul, self.modul.__name__) + for dir in ["hoster", "decrypter", "container"]: + try: + self.modul = __import__("%s.%s" % (dir, pluginName), globals(), locals(), [pluginName], -1) + except: + pass + pluginClass = getattr(self.modul, pluginName) else: self.modul = module.Plugin pluginClass = module.Plugin.Plugin -- cgit v1.2.3 From 090c9d2abdac07025fe6d7351e376e85aabc0891 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 27 Dec 2009 22:16:51 +0100 Subject: fixed uploaded.to and netload.in, gui clipboard check --- module/file_list.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index bb04ae898..d80310cdd 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -365,6 +365,14 @@ class File_List(object): pyfile.status.type = None finally: packager.file_list.lock.release() + + def abortFile(packager, fileid): + packager.file_list.lock.acquire() + try: + key, n, pyfile, pypack, pid = packager._getFileFromID(fileid) + pyfile.plugin.req.abort = True + finally: + packager.file_list.lock.release() #oooops, duplicate? def removeFileFromPackage(packager, id, pid): -- cgit v1.2.3 From ce2a8294b5aefe4497c88f24c817084868b8b1eb Mon Sep 17 00:00:00 2001 From: mkaay Date: Mon, 28 Dec 2009 15:32:06 +0100 Subject: gui now stable --- module/file_list.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index d80310cdd..21e084483 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -127,8 +127,14 @@ class File_List(object): for thread_list only """ files = [] + for pypack in self.data["queue"] + self.data["packages"]: + for pyfile in pypack.files: + if pyfile.plugin.props['type'] == "container" and not pyfile.active: + files.append(pyfile) for pypack in self.data["queue"]: for pyfile in pypack.files: + if pyfile in files: + continue if (pyfile.status.type == "reconnected" or pyfile.status.type == None) and not pyfile.active: files.append(pyfile) return files -- cgit v1.2.3 From 035fd57b56b33463c933db15f4ee8a149ddc060f Mon Sep 17 00:00:00 2001 From: mkaay Date: Mon, 28 Dec 2009 20:03:11 +0100 Subject: tried to satisfy RaNaN --- module/file_list.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 21e084483..cc3b63006 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -160,6 +160,12 @@ class File_List(object): info["plugin"] = pyfile.plugin.props['name'] return info + def continueAborted(self): + for pypack in self.data["queue"]: + for pyfile in pypack.files: + if pyfile.status.type == "aborted": + self.packager.resetFileStatus(pyfile.id) + class pyLoadCollector(): def __init__(collector, file_list): collector.file_list = file_list -- cgit v1.2.3 From 7c28259f92c2b3c608583ff128a5ae4134d4c48f Mon Sep 17 00:00:00 2001 From: mkaay Date: Wed, 30 Dec 2009 17:33:14 +0100 Subject: moved captcha stuff, extended serienjunkies, some other stuff --- module/file_list.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index cc3b63006..8af66d5ed 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -129,7 +129,11 @@ class File_List(object): files = [] for pypack in self.data["queue"] + self.data["packages"]: for pyfile in pypack.files: - if pyfile.plugin.props['type'] == "container" and not pyfile.active: + if pyfile.status.type == None and pyfile.plugin.props['type'] == "container" and not pyfile.active: + files.append(pyfile) + for pypack in self.data["packages"]: + for pyfile in pypack.files: + if pyfile.status.type == None and pyfile.plugin.props['type'] == "container" and pyfile.plugin.decryptNow and not pyfile.active: files.append(pyfile) for pypack in self.data["queue"]: for pyfile in pypack.files: @@ -424,7 +428,7 @@ class PyLoadFile(): for dir in ["hoster", "decrypter", "container"]: try: self.modul = __import__("%s.%s" % (dir, pluginName), globals(), locals(), [pluginName], -1) - except: + except Exception, e: pass pluginClass = getattr(self.modul, pluginName) else: -- cgit v1.2.3 From 4f904bd9610795c36d9e896bdf44c263ff43f5fd Mon Sep 17 00:00:00 2001 From: mkaay Date: Fri, 1 Jan 2010 17:13:43 +0100 Subject: fixed SerienjunkiesOrg, no more segfault in gui? --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 8af66d5ed..232f2b7ea 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -127,7 +127,7 @@ class File_List(object): for thread_list only """ files = [] - for pypack in self.data["queue"] + self.data["packages"]: + for pypack in self.data["queue"]: for pyfile in pypack.files: if pyfile.status.type == None and pyfile.plugin.props['type'] == "container" and not pyfile.active: files.append(pyfile) -- cgit v1.2.3 From ae4f0dfc38c49e19ef2b290f0974df9923bf1b94 Mon Sep 17 00:00:00 2001 From: mkaay Date: Sun, 3 Jan 2010 16:21:53 +0100 Subject: SecuredIn plugin --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 232f2b7ea..e7b80f26d 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -428,7 +428,7 @@ class PyLoadFile(): for dir in ["hoster", "decrypter", "container"]: try: self.modul = __import__("%s.%s" % (dir, pluginName), globals(), locals(), [pluginName], -1) - except Exception, e: + except ImportError: pass pluginClass = getattr(self.modul, pluginName) else: -- cgit v1.2.3 From d2aa3fceb9f896343b128d40f20a0465cf69efca Mon Sep 17 00:00:00 2001 From: mkaay Date: Wed, 6 Jan 2010 22:11:24 +0100 Subject: small fixes, new hook stuff --- module/file_list.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index e7b80f26d..ef47df6d9 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -143,6 +143,13 @@ class File_List(object): files.append(pyfile) return files + def getAllFiles(self): + files = [] + for pypack in self.data["queue"] + self.data["packages"]: + for pyfile in pypack.files: + files.append(pyfile) + return files + def countDownloads(self): return len(self.getDownloadList()) -- cgit v1.2.3 From 07f280a220ab5bc5c3fb510ea00aecedfcec7564 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Wed, 20 Jan 2010 19:41:43 +0100 Subject: queue page fully functional, some fixes --- module/file_list.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index ef47df6d9..2a7ecb191 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -167,6 +167,7 @@ class File_List(object): info["status_url"] = pyfile.status.url info["status_filename"] = pyfile.status.filename info["status_error"] = pyfile.status.error + info["size"] = pyfile.status.size() info["active"] = pyfile.active info["plugin"] = pyfile.plugin.props['name'] return info -- cgit v1.2.3 From bdb3deb371bbbcb5452e97ee560b793834d1a3f3 Mon Sep 17 00:00:00 2001 From: mkaay Date: Thu, 21 Jan 2010 19:39:27 +0100 Subject: fixed link deletion --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 2a7ecb191..bbea40e23 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -326,7 +326,7 @@ class File_List(object): key, n, pyfile, pypack, pid = packager._getFileFromID(id) pyfile.plugin.req.abort = True sleep(0.1) - del pypack.files[n] + packager.removeFileFromPackage(id, pid) if not pypack.files: packager.removePackage(pid) finally: -- cgit v1.2.3 From 4eb1404eca2b795d809ee626a057a543043060cb Mon Sep 17 00:00:00 2001 From: RaNaN Date: Thu, 21 Jan 2010 22:13:21 +0100 Subject: some optimizations --- module/file_list.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index bbea40e23..2785afdb2 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -144,6 +144,7 @@ class File_List(object): return files def getAllFiles(self): + files = [] for pypack in self.data["queue"] + self.data["packages"]: for pyfile in pypack.files: -- cgit v1.2.3 From f0914124436b8f66d296ef0d3d0e0f289f5a1aa6 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 22 Jan 2010 19:21:59 +0100 Subject: some final tweaks --- module/file_list.py | 68 +++++++++++++++++------------------------------------ 1 file changed, 22 insertions(+), 46 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 2785afdb2..e87fec3dd 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -28,6 +28,7 @@ from download_thread import Status import cPickle import re import module.Plugin +from operator import concat from os import sep from time import sleep @@ -95,24 +96,10 @@ class File_List(object): "packages": [], "collector": [] } - packages = [] - queue = [] - collector = [] - for p in self.data["packages"]: - pd = PyLoadPackageData() - pd.set(p) - packages.append(pd) - for p in self.data["queue"]: - pd = PyLoadPackageData() - pd.set(p) - queue.append(pd) - for f in self.data["collector"]: - fd = PyLoadFileData() - fd.set(f) - collector.append(fd) - pdata["packages"] = packages - pdata["queue"] = queue - pdata["collector"] = collector + + pdata["packages"] = map(PyLoadPackageData().set, self.data["packages"]) + pdata["queue"] = map(PyLoadPackageData().set, self.data["queue"]) + pdata["collector"] = map(PyLoadFileData().set, self.data["collector"]) output = open('module' + sep + 'links.pkl', 'wb') cPickle.dump(pdata, output, -1) @@ -122,37 +109,26 @@ class File_List(object): def queueEmpty(self): return (self.data["queue"] == []) - def getDownloadList(self): + def getDownloadList(self, occ): """ - for thread_list only + for thread_list only, returns all elements that are suitable for downloadthread """ files = [] - for pypack in self.data["queue"]: - for pyfile in pypack.files: - if pyfile.status.type == None and pyfile.plugin.props['type'] == "container" and not pyfile.active: - files.append(pyfile) - for pypack in self.data["packages"]: - for pyfile in pypack.files: - if pyfile.status.type == None and pyfile.plugin.props['type'] == "container" and pyfile.plugin.decryptNow and not pyfile.active: - files.append(pyfile) - for pypack in self.data["queue"]: - for pyfile in pypack.files: - if pyfile in files: - continue - if (pyfile.status.type == "reconnected" or pyfile.status.type == None) and not pyfile.active: - files.append(pyfile) - return files + files += [[x for x in p.files if x.status.type == None and x.plugin.props['type'] == "container" and not x.active] for p in self.data["queue"] + self.data["packages"]] + files += [[x for x in p.files if (x.status.type == None or x.status.type == "reconnected") and not x.active and not x.modul.__name__ in occ] for p in self.data["queue"]] + + return reduce(concat, files, []) def getAllFiles(self): files = [] for pypack in self.data["queue"] + self.data["packages"]: - for pyfile in pypack.files: - files.append(pyfile) + files += pypack.files return files def countDownloads(self): - return len(self.getDownloadList()) + """ simply return len of all files in all packages(which have no type) in queue and collector""" + return len(reduce(concat, [[x for x in p.files if x.status.type == None] for p in self.data["queue"] + self.data["packages"]], [])) def getFileInfo(self, id): try: @@ -465,7 +441,7 @@ class PyLoadFileData(): self.filename = None self.status_type = None self.status_url = None - + def set(self, pyfile): self.id = pyfile.id self.url = pyfile.url @@ -476,7 +452,9 @@ class PyLoadFileData(): self.status_url = pyfile.status.url self.status_filename = pyfile.status.filename self.status_error = pyfile.status.error - + + return self + def get(self, pyfile): pyfile.id = self.id pyfile.url = self.url @@ -495,14 +473,12 @@ class PyLoadPackageData(): def __init__(self): self.data = None self.files = [] - + def set(self, pypack): self.data = pypack.data - for pyfile in pypack.files: - fdata = PyLoadFileData() - fdata.set(pyfile) - self.files.append(fdata) - + self.files = map(PyLoadFileData().set, pypack.files) + return self + def get(self, pypack, fl): pypack.data = self.data for fdata in self.files: -- cgit v1.2.3 From 768ff9cbb3c61547e757584ab6dd737159fe9b37 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 22 Jan 2010 19:37:14 +0100 Subject: file_list save fix --- module/file_list.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index e87fec3dd..4e69bfdef 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -97,9 +97,9 @@ class File_List(object): "collector": [] } - pdata["packages"] = map(PyLoadPackageData().set, self.data["packages"]) - pdata["queue"] = map(PyLoadPackageData().set, self.data["queue"]) - pdata["collector"] = map(PyLoadFileData().set, self.data["collector"]) + pdata["packages"] = [PyLoadPackageData().set(x) for x in self.data["packages"]] + pdata["queue"] = [PyLoadPackageData().set(x) for x in self.data["queue"]] + pdata["collector"] = [PyLoadFileData().set(x) for x in self.data["collector"]] output = open('module' + sep + 'links.pkl', 'wb') cPickle.dump(pdata, output, -1) @@ -476,7 +476,7 @@ class PyLoadPackageData(): def set(self, pypack): self.data = pypack.data - self.files = map(PyLoadFileData().set, pypack.files) + self.files = [PyLoadFileData().set(x) for x in pypack.files] return self def get(self, pypack, fl): -- cgit v1.2.3 From 9aa8ca3b24133bef767f0eb8508e276fa7f92ee9 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Sat, 23 Jan 2010 15:51:19 +0100 Subject: added missing icons, final improvments --- module/file_list.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 4e69bfdef..1c4c4776b 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -29,6 +29,7 @@ import cPickle import re import module.Plugin from operator import concat +from operator import attrgetter from os import sep from time import sleep @@ -150,10 +151,7 @@ class File_List(object): return info def continueAborted(self): - for pypack in self.data["queue"]: - for pyfile in pypack.files: - if pyfile.status.type == "aborted": - self.packager.resetFileStatus(pyfile.id) + [[self.packager.resetFileStatus(x.id) for x in p.files if x.status.type == "aborted"] for p in self.data["queue"]] class pyLoadCollector(): def __init__(collector, file_list): @@ -176,8 +174,7 @@ class File_List(object): for pypack in (collector.file_list.data["packages"] + collector.file_list.data["queue"]): for pyf in pypack.files: ids.append(pyf.id) - for pyfile in collector.file_list.data["collector"]: - ids.append(pyfile.id) + ids += map(attrgetter("id"), collector.file_list.data["collector"]) id = 1 while id in ids: id += 1 @@ -241,9 +238,8 @@ class File_List(object): """ returns a free id """ - ids = [] - for pypack in (packager.file_list.data["packages"] + packager.file_list.data["queue"]): - ids.append(pypack.data["id"]) + ids = [ pypack.data["id"] for pypack in packager.file_list.data["packages"] + packager.file_list.data["queue"]] + id = 1 while id in ids: id += 1 @@ -347,9 +343,8 @@ class File_List(object): def getPackageFiles(packager, id): key, n, pypack = packager._getPackageFromID(id) - ids = [] - for pyfile in pypack.files: - ids.append(pyfile.id) + ids = map(attrgetter("id"), pypack.files) + return ids def addFileToPackage(packager, id, pyfile): -- cgit v1.2.3 From 769f156ea822d4520620727dc1317224a02bdaaa Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 26 Jan 2010 21:23:16 +0100 Subject: extended script support --- module/file_list.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/file_list.py') diff --git a/module/file_list.py b/module/file_list.py index 1c4c4776b..7c68a7427 100644 --- a/module/file_list.py +++ b/module/file_list.py @@ -149,7 +149,7 @@ class File_List(object): info["active"] = pyfile.active info["plugin"] = pyfile.plugin.props['name'] return info - + def continueAborted(self): [[self.packager.resetFileStatus(x.id) for x in p.files if x.status.type == "aborted"] for p in self.data["queue"]] -- cgit v1.2.3