From 69b83475a898b511d4e26544f2d0b4a09940c3ea Mon Sep 17 00:00:00 2001 From: Yves Fischer Date: Mon, 18 Jan 2016 19:44:34 +0100 Subject: remove superflous asset controller function. if http-authentication is directed do an redirect to same page without authentication. --- mediabrowser/__init__.py | 4 ---- mediabrowser/templates/listdir.html | 8 ++++---- mediabrowser/templates/watch.html | 23 ++++++++++++++++------- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/mediabrowser/__init__.py b/mediabrowser/__init__.py index 824d7d8..28241b4 100644 --- a/mediabrowser/__init__.py +++ b/mediabrowser/__init__.py @@ -148,10 +148,6 @@ def build(root_directory, cache): process = ffmpeg.thumbnail(ospath, 852, 480) return process.stdout - @blueprint.route('/assets/') - def assets(filename): - return blueprint.send_static_file(filename) - @blueprint.route('//stream/_') def stream(ss, t, path): path = os.path.normpath(path) diff --git a/mediabrowser/templates/listdir.html b/mediabrowser/templates/listdir.html index 024822d..27cfdc8 100644 --- a/mediabrowser/templates/listdir.html +++ b/mediabrowser/templates/listdir.html @@ -2,12 +2,12 @@ Directory Browser - {{ path }} - + {% if path != '.' %}
- + Parent Directory @@ -18,7 +18,7 @@ {% if file['type'] == 'file' %}
@@ -29,7 +29,7 @@ {% if file['type'] == 'directory' %}
- + {{ file['filename'] }} diff --git a/mediabrowser/templates/watch.html b/mediabrowser/templates/watch.html index 808e372..db7ab6e 100644 --- a/mediabrowser/templates/watch.html +++ b/mediabrowser/templates/watch.html @@ -2,8 +2,8 @@ Watch - {{ filename }} - - + + @@ -11,21 +11,21 @@