From 4df2b77fdf42046fe19bd371be7c7255986b5980 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Tue, 6 Mar 2012 13:36:39 +0100 Subject: renamed hooks to addons, new filemanager and database, many new api methods you will loose ALL your LINKS, webinterface will NOT work --- module/web/webinterface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/web/webinterface.py') diff --git a/module/web/webinterface.py b/module/web/webinterface.py index ec8b2e56c..56043063e 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -30,7 +30,7 @@ PYLOAD_DIR = abspath(join(PROJECT_DIR, "..", "..")) sys.path.append(PYLOAD_DIR) from module import InitHomeDir -from module.utils import decode, formatSize +from module.utils import decode, format_size import bottle from bottle import run, app @@ -92,7 +92,7 @@ env.filters["path_make_relative"] = path_make_relative env.filters["path_make_absolute"] = path_make_absolute env.filters["decode"] = decode env.filters["type"] = lambda x: str(type(x)) -env.filters["formatsize"] = formatSize +env.filters["formatsize"] = format_size env.filters["getitem"] = lambda x, y: x.__getitem__(y) if PREFIX: env.filters["url"] = lambda x: x -- cgit v1.2.3 From a8f763fb85756f69899f7b3b71c01bb01461ee3c Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 10 Aug 2012 22:12:10 +0200 Subject: beginning new pyload web-ui from scratch --- module/web/webinterface.py | 1 - 1 file changed, 1 deletion(-) (limited to 'module/web/webinterface.py') diff --git a/module/web/webinterface.py b/module/web/webinterface.py index 56043063e..d06ba0234 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -121,7 +121,6 @@ if PREFIX: web = PrefixMiddleware(web, prefix=PREFIX) import pyload_app -import json_app import cnl_app import api_app -- cgit v1.2.3 From 7bc7de7332670f692eda576787e671c2eba0e5bb Mon Sep 17 00:00:00 2001 From: godofdream Date: Fri, 17 Aug 2012 01:29:03 +0200 Subject: added division into default template and mobile template, added Base site --- module/web/webinterface.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'module/web/webinterface.py') diff --git a/module/web/webinterface.py b/module/web/webinterface.py index d06ba0234..1bff21dbc 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -58,6 +58,7 @@ from module.common.JsEngine import JsEngine JS = JsEngine() TEMPLATE = config.get('webinterface', 'template') +TEMPLATE_MOBILE = config.get('webinterface', 'template_mobile') DL_ROOT = config.get('general', 'download_folder') LOG_ROOT = config.get('log', 'log_folder') PREFIX = config.get('webinterface', 'prefix') @@ -77,6 +78,7 @@ if not exists(cache): bcc = FileSystemBytecodeCache(cache, '%s.cache') loader = PrefixLoader({ "default": FileSystemLoader(join(PROJECT_DIR, "templates", "default")), + "default_mobile": FileSystemLoader(join(PROJECT_DIR, "templates", "default_mobile")), 'js': FileSystemLoader(join(PROJECT_DIR, 'media', 'js')) }) -- cgit v1.2.3 From 89e803a1e8364a3d32dcdb2ff445959723b974b1 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Fri, 17 Aug 2012 16:25:49 +0200 Subject: completed renaming --- module/web/webinterface.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'module/web/webinterface.py') diff --git a/module/web/webinterface.py b/module/web/webinterface.py index 1bff21dbc..76d58e0e4 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -58,7 +58,6 @@ from module.common.JsEngine import JsEngine JS = JsEngine() TEMPLATE = config.get('webinterface', 'template') -TEMPLATE_MOBILE = config.get('webinterface', 'template_mobile') DL_ROOT = config.get('general', 'download_folder') LOG_ROOT = config.get('log', 'log_folder') PREFIX = config.get('webinterface', 'prefix') @@ -78,7 +77,7 @@ if not exists(cache): bcc = FileSystemBytecodeCache(cache, '%s.cache') loader = PrefixLoader({ "default": FileSystemLoader(join(PROJECT_DIR, "templates", "default")), - "default_mobile": FileSystemLoader(join(PROJECT_DIR, "templates", "default_mobile")), + "mobile": FileSystemLoader(join(PROJECT_DIR, "templates", "mobile")), 'js': FileSystemLoader(join(PROJECT_DIR, 'media', 'js')) }) -- cgit v1.2.3 From 1a55cb6a2eb8784253410b2e93510b5bcebf7f41 Mon Sep 17 00:00:00 2001 From: RaNaN Date: Mon, 10 Sep 2012 15:12:55 +0200 Subject: userApi for plugins --- module/web/webinterface.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/web/webinterface.py') diff --git a/module/web/webinterface.py b/module/web/webinterface.py index 76d58e0e4..75907a0a8 100644 --- a/module/web/webinterface.py +++ b/module/web/webinterface.py @@ -133,14 +133,14 @@ def run_lightweight(host="0.0.0.0", port="8000"): run(app=web, host=host, port=port, quiet=True, server="bjoern") -def run_threaded(host="0.0.0.0", port="8000", theads=3, cert="", key=""): +def run_threaded(host="0.0.0.0", port="8000", threads=3, cert="", key=""): from wsgiserver import CherryPyWSGIServer if cert and key: CherryPyWSGIServer.ssl_certificate = cert CherryPyWSGIServer.ssl_private_key = key - CherryPyWSGIServer.numthreads = theads + CherryPyWSGIServer.numthreads = threads from utils import CherryPyWSGI -- cgit v1.2.3