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 + module/web/ajax/urls.py | 6 +- module/web/ajax/views.py | 44 ++++++++- module/web/media/default/css/default.css | 15 ++- module/web/media/default/img/progress-bar-back.gif | Bin 10819 -> 0 bytes module/web/media/default/img/progress-bar.gif | Bin 10819 -> 0 bytes module/web/media/default/img/progressbar.gif | Bin 120 -> 0 bytes module/web/media/default/img/progressbg_black.gif | Bin 1626 -> 0 bytes module/web/media/default/img/progressbg_green.gif | Bin 1308 -> 0 bytes module/web/media/default/img/progressbg_orange.gif | Bin 1308 -> 0 bytes module/web/media/default/img/progressbg_red.gif | Bin 1308 -> 0 bytes module/web/media/default/img/progressbg_yellow.gif | Bin 1308 -> 0 bytes module/web/pyload/views.py | 4 +- module/web/templates/default/base.html | 8 +- module/web/templates/default/home.html | 4 +- module/web/templates/default/queue.html | 106 +++++++++++++++++++-- module/web/templates/default/window.html | 2 +- 17 files changed, 165 insertions(+), 25 deletions(-) delete mode 100644 module/web/media/default/img/progress-bar-back.gif delete mode 100644 module/web/media/default/img/progress-bar.gif delete mode 100644 module/web/media/default/img/progressbar.gif delete mode 100644 module/web/media/default/img/progressbg_black.gif delete mode 100644 module/web/media/default/img/progressbg_green.gif delete mode 100644 module/web/media/default/img/progressbg_orange.gif delete mode 100644 module/web/media/default/img/progressbg_red.gif delete mode 100644 module/web/media/default/img/progressbg_yellow.gif 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 diff --git a/module/web/ajax/urls.py b/module/web/ajax/urls.py index 7d63ef5a6..d50e7121e 100644 --- a/module/web/ajax/urls.py +++ b/module/web/ajax/urls.py @@ -12,7 +12,7 @@ urlpatterns = patterns('ajax', # Uncomment the next line to enable the admin: (r'^add_package$', 'views.add_package'), - (r'^remove_link/(\d+)$', 'views.remove_link'), + (r'^abort_link/(\d+)$', 'views.abort_link'), (r'^status$', 'views.status'), (r'^links$', 'views.links'), #currently active links (r'^queue$', 'views.queue'), @@ -22,4 +22,8 @@ urlpatterns = patterns('ajax', (r'^packages$', 'views.packages'), (r'^package/(\d+)$', 'views.package'), (r'^link/(\d+)$', 'views.link'), + (r'^remove_package/(\d+)$', 'views.remove_package'), + (r'^restart_package/(\d+)$', 'views.restart_package'), + (r'^remove_link/(\d+)$', 'views.remove_link'), + (r'^restart_link/(\d+)$', 'views.restart_link'), ) \ No newline at end of file diff --git a/module/web/ajax/views.py b/module/web/ajax/views.py index 4f136cef9..4d9762ab4 100644 --- a/module/web/ajax/views.py +++ b/module/web/ajax/views.py @@ -39,16 +39,15 @@ def add_package(request): name = request.POST['add_name'] - if name == None or name == "": - return HttpResponseServerError() - links = request.POST['add_links'].replace(" ","\n").split("\n") try: f = request.FILES['add_file'] - print f + + if name == None or name == "": + name = f.name + fpath = join(settings.DL_ROOT, f.name) - print fpath destination = open(fpath, 'wb') for chunk in f.chunks(): destination.write(chunk) @@ -57,6 +56,9 @@ def add_package(request): except: pass + if name == None or name == "": + return HttpResponseServerError() + links = filter(lambda x: x != "", links) settings.PYLOAD.add_package(name, links) @@ -160,3 +162,35 @@ def link(request, id): except: return HttpResponseServerError() + +@permission('pyload.can_add_dl') +def remove_package(request, id): + try: + settings.PYLOAD.del_packages([int(id)]) + return JsonResponse("sucess") + except: + return HttpResponseServerError() + +@permission('pyload.can_add_dl') +def restart_package(request, id): + try: + settings.PYLOAD.restart_package(int(id)) + return JsonResponse("sucess") + except: + return HttpResponseServerError() + +@permission('pyload.can_add_dl') +def restart_link(request, id): + try: + settings.PYLOAD.restart_file(int(id)) + return JsonResponse("sucess") + except: + return HttpResponseServerError() + +@permission('pyload.can_add_dl') +def abort_link(request, id): + try: + settings.PYLOAD.stop_download("link", int(id)) + return JsonResponse("sucess") + except: + return HttpResponseServerError() \ No newline at end of file diff --git a/module/web/media/default/css/default.css b/module/web/media/default/css/default.css index d7756e314..3c4762012 100644 --- a/module/web/media/default/css/default.css +++ b/module/web/media/default/css/default.css @@ -1466,7 +1466,7 @@ div.codearea pre span.Preprc { padding-right: 8px; } .package { - margin-bottom: 20px; + margin-bottom: 10px; } .packagename { background: url(/media/default/img/folder.png) no-repeat; @@ -1495,3 +1495,16 @@ div.codearea pre span.Preprc { height: 5px; } + +.queue { + border: none +} + +.queue tr td { + border: none +} + +.header, .header th{ + text-align: left; + font-weight: normal; +} \ No newline at end of file diff --git a/module/web/media/default/img/progress-bar-back.gif b/module/web/media/default/img/progress-bar-back.gif deleted file mode 100644 index 0c8f68211..000000000 Binary files a/module/web/media/default/img/progress-bar-back.gif and /dev/null differ diff --git a/module/web/media/default/img/progress-bar.gif b/module/web/media/default/img/progress-bar.gif deleted file mode 100644 index 746f77175..000000000 Binary files a/module/web/media/default/img/progress-bar.gif and /dev/null differ diff --git a/module/web/media/default/img/progressbar.gif b/module/web/media/default/img/progressbar.gif deleted file mode 100644 index abe588c15..000000000 Binary files a/module/web/media/default/img/progressbar.gif and /dev/null differ diff --git a/module/web/media/default/img/progressbg_black.gif b/module/web/media/default/img/progressbg_black.gif deleted file mode 100644 index 74fd1f9b3..000000000 Binary files a/module/web/media/default/img/progressbg_black.gif and /dev/null differ diff --git a/module/web/media/default/img/progressbg_green.gif b/module/web/media/default/img/progressbg_green.gif deleted file mode 100644 index f3f3bf681..000000000 Binary files a/module/web/media/default/img/progressbg_green.gif and /dev/null differ diff --git a/module/web/media/default/img/progressbg_orange.gif b/module/web/media/default/img/progressbg_orange.gif deleted file mode 100644 index 808cac7cf..000000000 Binary files a/module/web/media/default/img/progressbg_orange.gif and /dev/null differ diff --git a/module/web/media/default/img/progressbg_red.gif b/module/web/media/default/img/progressbg_red.gif deleted file mode 100644 index 54dfa135f..000000000 Binary files a/module/web/media/default/img/progressbg_red.gif and /dev/null differ diff --git a/module/web/media/default/img/progressbg_yellow.gif b/module/web/media/default/img/progressbg_yellow.gif deleted file mode 100644 index fdb0dfc98..000000000 Binary files a/module/web/media/default/img/progressbg_yellow.gif and /dev/null differ diff --git a/module/web/pyload/views.py b/module/web/pyload/views.py index 994075001..d72dca56c 100644 --- a/module/web/pyload/views.py +++ b/module/web/pyload/views.py @@ -111,7 +111,7 @@ def downloads(request): return render_to_response(join(settings.TEMPLATE, 'downloads.html'), RequestContext(request, {'files': data}, [status_proc])) @login_required -@permission('pyload.user.can_download') +@permission('pyload.can_download') @check_server def download(request, path): path = path.split("/") @@ -143,7 +143,7 @@ def download(request, path): return HttpResponseNotFound("File not Found.") @login_required -@permission('pyload.user.can_see_logs') +@permission('pyload.can_see_logs') @check_server def logs(request, page=0): diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 692a951bc..2a2490088 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -36,7 +36,7 @@ document.addEvent("domready", function(){ }); var jsonStatus = new Request.JSON({ - url: "json/status", + url: "/json/status", onSuccess: LoadJsonToContent, secure: false, async: true, @@ -46,17 +46,17 @@ document.addEvent("domready", function(){ }) $('action_play').addEvent('click', function(){ - new Request({method: 'get', url: 'json/unpause'}).send(); + new Request({method: 'get', url: '/json/unpause'}).send(); }); $('action_cancel').addEvent('click', function(){ - new Request({method: 'get', url: 'json/cancel'}).send(); + new Request({method: 'get', url: '/json/cancel'}).send(); }); $('action_stop').addEvent('click', function(){ - new Request({method: 'get', url: 'json/pause'}).send(); + new Request({method: 'get', url: '/json/pause'}).send(); }); jsonStatus.startTimer(); diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index 4d499f6fe..ab2135800 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -168,7 +168,7 @@ var LinkEntry = new Class({ this.fadeBar = new Fx.Tween(this.elements.pgbTr); this.elements.remove.addEvent('click', function(){ - new Request({method: 'get', url: 'json/remove_link/'+this.id}).send(); + new Request({method: 'get', url: '/json/abort_link/'+this.id}).send(); }.bind(this)); }, @@ -222,7 +222,7 @@ Active Downloads - + diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index 7c78ac45b..aa21390a0 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -1,5 +1,76 @@ {% extends 'default/base.html' %} +{% block head %} + +{% endblock %} + {% block title %}Queue - {{block.super}} {% endblock %} {% block menu %} @@ -11,17 +82,34 @@ {% block content %} {% for package in content %} -
{{ package.package_name }}    
-
+
+
+ {{ package.package_name }} +    + +    + +
+ +
{% endfor %}
-
+

Add Package

Paste your links or upload a container.