From cda057e979cbdc8022687e1810b876b371c8c11f Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 13 Jan 2012 10:58:51 +0100 Subject: fix info page, removed icons --- icons/abort.png | Bin 2569 -> 0 bytes icons/add_small.png | Bin 3356 -> 0 bytes icons/clipboard.png | Bin 1344 -> 0 bytes icons/close.png | Bin 2569 -> 0 bytes icons/edit_small.png | Bin 570 -> 0 bytes icons/logo-gui.png | Bin 8093 -> 0 bytes icons/logo.png | Bin 8172 -> 0 bytes icons/pull_small.png | Bin 614 -> 0 bytes icons/push_small.png | Bin 618 -> 0 bytes icons/pyload-gui.ico | Bin 51122 -> 0 bytes icons/pyload.ico | Bin 7206 -> 0 bytes icons/pyload2.ico | Bin 9662 -> 0 bytes icons/refresh1_small.png | Bin 3474 -> 0 bytes icons/refresh_small.png | Bin 821 -> 0 bytes icons/remove_small.png | Bin 287 -> 0 bytes icons/toolbar_add.png | Bin 932 -> 0 bytes icons/toolbar_pause.png | Bin 943 -> 0 bytes icons/toolbar_remove.png | Bin 496 -> 0 bytes icons/toolbar_start.png | Bin 1504 -> 0 bytes icons/toolbar_stop.png | Bin 523 -> 0 bytes module/Api.py | 5 +++-- module/utils/__init__.py | 10 +--------- module/web/pyload_app.py | 12 ++++++------ pavement.py | 12 ++++++++---- paver-minilib.zip | Bin 23090 -> 22 bytes 25 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 icons/abort.png delete mode 100644 icons/add_small.png delete mode 100644 icons/clipboard.png delete mode 100644 icons/close.png delete mode 100644 icons/edit_small.png delete mode 100644 icons/logo-gui.png delete mode 100644 icons/logo.png delete mode 100644 icons/pull_small.png delete mode 100644 icons/push_small.png delete mode 100644 icons/pyload-gui.ico delete mode 100644 icons/pyload.ico delete mode 100644 icons/pyload2.ico delete mode 100644 icons/refresh1_small.png delete mode 100644 icons/refresh_small.png delete mode 100644 icons/remove_small.png delete mode 100644 icons/toolbar_add.png delete mode 100644 icons/toolbar_pause.png delete mode 100644 icons/toolbar_remove.png delete mode 100644 icons/toolbar_start.png delete mode 100644 icons/toolbar_stop.png diff --git a/icons/abort.png b/icons/abort.png deleted file mode 100644 index 66170aae7..000000000 Binary files a/icons/abort.png and /dev/null differ diff --git a/icons/add_small.png b/icons/add_small.png deleted file mode 100644 index 4dc88b09b..000000000 Binary files a/icons/add_small.png and /dev/null differ diff --git a/icons/clipboard.png b/icons/clipboard.png deleted file mode 100644 index 9ba608eba..000000000 Binary files a/icons/clipboard.png and /dev/null differ diff --git a/icons/close.png b/icons/close.png deleted file mode 100644 index 66170aae7..000000000 Binary files a/icons/close.png and /dev/null differ diff --git a/icons/edit_small.png b/icons/edit_small.png deleted file mode 100644 index eb76e21b4..000000000 Binary files a/icons/edit_small.png and /dev/null differ diff --git a/icons/logo-gui.png b/icons/logo-gui.png deleted file mode 100644 index 5994b274d..000000000 Binary files a/icons/logo-gui.png and /dev/null differ diff --git a/icons/logo.png b/icons/logo.png deleted file mode 100644 index 72a95b740..000000000 Binary files a/icons/logo.png and /dev/null differ diff --git a/icons/pull_small.png b/icons/pull_small.png deleted file mode 100644 index 432ad321f..000000000 Binary files a/icons/pull_small.png and /dev/null differ diff --git a/icons/push_small.png b/icons/push_small.png deleted file mode 100644 index 701fc69e3..000000000 Binary files a/icons/push_small.png and /dev/null differ diff --git a/icons/pyload-gui.ico b/icons/pyload-gui.ico deleted file mode 100644 index 00a1a53ff..000000000 Binary files a/icons/pyload-gui.ico and /dev/null differ diff --git a/icons/pyload.ico b/icons/pyload.ico deleted file mode 100644 index 58b1f4b89..000000000 Binary files a/icons/pyload.ico and /dev/null differ diff --git a/icons/pyload2.ico b/icons/pyload2.ico deleted file mode 100644 index c2b497986..000000000 Binary files a/icons/pyload2.ico and /dev/null differ diff --git a/icons/refresh1_small.png b/icons/refresh1_small.png deleted file mode 100644 index ce4f24efc..000000000 Binary files a/icons/refresh1_small.png and /dev/null differ diff --git a/icons/refresh_small.png b/icons/refresh_small.png deleted file mode 100644 index 1ffd18d97..000000000 Binary files a/icons/refresh_small.png and /dev/null differ diff --git a/icons/remove_small.png b/icons/remove_small.png deleted file mode 100644 index bf99763e8..000000000 Binary files a/icons/remove_small.png and /dev/null differ diff --git a/icons/toolbar_add.png b/icons/toolbar_add.png deleted file mode 100644 index 17003e9f0..000000000 Binary files a/icons/toolbar_add.png and /dev/null differ diff --git a/icons/toolbar_pause.png b/icons/toolbar_pause.png deleted file mode 100644 index b7a727b71..000000000 Binary files a/icons/toolbar_pause.png and /dev/null differ diff --git a/icons/toolbar_remove.png b/icons/toolbar_remove.png deleted file mode 100644 index 1e9c00e16..000000000 Binary files a/icons/toolbar_remove.png and /dev/null differ diff --git a/icons/toolbar_start.png b/icons/toolbar_start.png deleted file mode 100644 index 1123266e6..000000000 Binary files a/icons/toolbar_start.png and /dev/null differ diff --git a/icons/toolbar_stop.png b/icons/toolbar_stop.png deleted file mode 100644 index b388e3d72..000000000 Binary files a/icons/toolbar_stop.png and /dev/null differ diff --git a/module/Api.py b/module/Api.py index fba02d574..ac9ea7f79 100644 --- a/module/Api.py +++ b/module/Api.py @@ -25,7 +25,8 @@ from itertools import chain from PyFile import PyFile -from utils import freeSpace, compare_time, to_string +from utils import compare_time, to_string +from utils.fs import free_space from common.packagetools import parseNames from network.RequestFactory import getURL from remote import activated @@ -213,7 +214,7 @@ class Api(Iface): @permission(PERMS.STATUS) def freeSpace(self): """Available free space at download directory in bytes""" - return freeSpace(self.core.config["general"]["download_folder"]) + return free_space(self.core.config["general"]["download_folder"]) @permission(PERMS.ALL) def getServerVersion(self): diff --git a/module/utils/__init__.py b/module/utils/__init__.py index 3b0fb673a..b68928f04 100644 --- a/module/utils/__init__.py +++ b/module/utils/__init__.py @@ -66,12 +66,6 @@ def formatSize(size): def formatSpeed(speed): return formatSize(speed) + "/s" - -def freeSpace(folder): - print "Deprecated freeSpace" - return free_space(folder) - - def uniqify(seq): #by Dave Kirby """ removes duplicates from list, preserve order """ seen = set() @@ -192,6 +186,4 @@ def html_unescape(text): return re.sub("&#?\w+;", fixup, text) if __name__ == "__main__": - print freeSpace(".") - - print remove_chars("ab'cdgdsf''ds'", "'ghd") \ No newline at end of file + print remove_chars("ab'cdgdsf''ds'", "'ghd") diff --git a/module/web/pyload_app.py b/module/web/pyload_app.py index a19dce24c..dcfc3266e 100644 --- a/module/web/pyload_app.py +++ b/module/web/pyload_app.py @@ -36,7 +36,7 @@ from utils import render_to_response, parse_permissions, parse_userdata, \ from filters import relpath, unquotepath from module.utils import formatSize -from module.utils.fs import save_join, fs_encode, fs_decode, listdir +from module.utils.fs import save_join, fs_encode, fs_decode, listdir, free_space # Helper @@ -509,7 +509,7 @@ def setup(): @login_required("STATUS") @route("/info") def info(): - conf = PYLOAD.getConfigDict() + conf = PYLOAD.getConfigPointer() if hasattr(os, "uname"): extra = os.uname() @@ -520,10 +520,10 @@ def info(): "os": " ".join((os.name, sys.platform) + extra), "version": PYLOAD.getServerVersion(), "folder": abspath(PYLOAD_DIR), "config": abspath(""), - "download": abspath(conf["general"]["download_folder"]["value"]), + "download": abspath(conf["general"]["download_folder"]), "freespace": formatSize(PYLOAD.freeSpace()), - "remote": conf["remote"]["port"]["value"], - "webif": conf["webinterface"]["port"]["value"], - "language": conf["general"]["language"]["value"]} + "remote": conf["remote"]["port"], + "webif": conf["webinterface"]["port"], + "language": conf["general"]["language"]} return render_to_response("info.html", data, [pre_processor]) diff --git a/pavement.py b/pavement.py index f3e8651c5..4b5ccb883 100644 --- a/pavement.py +++ b/pavement.py @@ -3,7 +3,10 @@ from paver.easy import * from paver.setuputils import setup -from paver.doctools import cog +try: + from paver.doctools import cog +except: + cog = None import fnmatch @@ -162,7 +165,7 @@ def get_source(options): @task -@needs('clean', 'generate_setup', 'minilib', 'get_source', 'setuptools.command.sdist') +@needs('clean', 'generate_setup', 'get_source', 'setuptools.command.sdist') def sdist(): """ Build source code package with distutils """ @@ -257,7 +260,8 @@ def generate_locale(): @task def tests(): - call(["nosetests2"]) + """ Run nosetests """ + call(["tests/nosetests.sh"]) @task def virtualenv(options): @@ -278,7 +282,7 @@ def clean_env(): @task -@needs('generate_setup', 'minilib', 'get_source', 'virtualenv') +@needs('generate_setup', 'get_source', 'virtualenv') def env_install(): """Install pyLoad into the virtualenv""" venv = options.virtualenv diff --git a/paver-minilib.zip b/paver-minilib.zip index 85c0c671e..15cb0ecb3 100644 Binary files a/paver-minilib.zip and b/paver-minilib.zip differ -- cgit v1.2.3