diff --git a/bazarr/config.py b/bazarr/config.py index ca61871e0..6028bc56c 100644 --- a/bazarr/config.py +++ b/bazarr/config.py @@ -11,7 +11,7 @@ defaults = { 'general': { 'ip': '0.0.0.0', 'port': '6767', - 'base_url': '/', + 'base_url': '', 'path_mappings': '[]', 'debug': 'False', 'branch': 'master', diff --git a/bazarr/main.py b/bazarr/main.py index ba4cb7afc..5994d92de 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -45,7 +45,6 @@ from six import text_type, PY2 from datetime import timedelta from get_languages import load_language_in_db, language_from_alpha3, language_from_alpha2, alpha2_from_alpha3 from flask import Flask, make_response, request, redirect, abort, render_template, Response, session, flash, url_for, send_file -from flask_cors import CORS from get_providers import get_providers, get_providers_auth, list_throttled_providers from get_series import * @@ -65,13 +64,31 @@ from subliminal_patch.core import SUBTITLE_EXTENSIONS from flask_debugtoolbar import DebugToolbarExtension from functools import wraps + +class PrefixMiddleware(object): + + def __init__(self, app, prefix=''): + self.app = app + self.prefix = prefix + + def __call__(self, environ, start_response): + + if environ['PATH_INFO'].startswith(self.prefix): + environ['PATH_INFO'] = environ['PATH_INFO'][len(self.prefix):] + environ['SCRIPT_NAME'] = self.prefix + return self.app(environ, start_response) + else: + start_response('404', [('Content-Type', 'text/plain')]) + return ["This url does not belong to the app.".encode()] + # Flask Setup app = Flask(__name__, template_folder=os.path.join(os.path.dirname(__file__), '..', 'views'), static_folder=os.path.join(os.path.dirname(__file__), '..', 'static')) +app.wsgi_app = PrefixMiddleware(app.wsgi_app, prefix=base_url) -app.config["APPLICATION_ROOT"] = base_url app.config["SECRET_KEY"] = 'test' + if args.dev: app.config["DEBUG"] = True # Flask-Debuger @@ -91,8 +108,6 @@ app.register_blueprint(api_bp) from SSE import event_stream -# Add Cors -CORS(app) # Check and install update on startup when running on Windows from installer if args.release_update: @@ -532,9 +547,9 @@ def image_proxy_movies(url): @login_required def redirect_root(): if settings.general.getboolean('use_sonarr'): - return redirect('/series') + return redirect(url_for('series')) elif settings.general.getboolean('use_radarr'): - return redirect('/movies') + return redirect(url_for('movies')) elif not settings.general.enabled_providers: return redirect('/wizard') else: diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/app.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/app.scssc index 549bf2534..62a38ff2f 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/app.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/app.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/bazarr.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/bazarr.scssc index 6e70615ed..bee23e84e 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/bazarr.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/bazarr.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/dark.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/dark.scssc index 1c41349c8..439f24db0 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/dark.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/dark.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/grid.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/grid.scssc index dd0ef0636..9a71bb16b 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/grid.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/grid.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/material.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/material.scssc index 2c7302693..3e1c38fee 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/material.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/material.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/pages.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/pages.scssc index 5031ba4b0..9d9bfe0a6 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/pages.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/pages.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/responsive.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/responsive.scssc index 6e415994e..8072e43bf 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/responsive.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/responsive.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/sidebar.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/sidebar.scssc index dd2f70d7a..0220e8f5d 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/sidebar.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/sidebar.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/style.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/style.scssc index 35a006ca6..63758215d 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/style.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/style.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/variable.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/variable.scssc index 70d093ce0..04e198ced 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/variable.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/variable.scssc differ diff --git a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/widgets.scssc b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/widgets.scssc index 83312db6c..7cc4b2e71 100644 Binary files a/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/widgets.scssc and b/static/scss/.sass-cache/83ad27ea35c32a09450f13abc5033dc8a90a16b9/widgets.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_animated.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_animated.scssc new file mode 100644 index 000000000..74adc4fa4 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_animated.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_bordered-pulled.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_bordered-pulled.scssc new file mode 100644 index 000000000..31f30612b Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_bordered-pulled.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_core.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_core.scssc new file mode 100644 index 000000000..a94c014c6 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_core.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_fixed-width.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_fixed-width.scssc new file mode 100644 index 000000000..53acb324b Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_fixed-width.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_icons.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_icons.scssc new file mode 100644 index 000000000..12189a905 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_icons.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_larger.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_larger.scssc new file mode 100644 index 000000000..536fe6af7 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_larger.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_list.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_list.scssc new file mode 100644 index 000000000..d0e3a5e38 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_list.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_mixins.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_mixins.scssc new file mode 100644 index 000000000..3028804b9 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_mixins.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_rotated-flipped.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_rotated-flipped.scssc new file mode 100644 index 000000000..7d59da07e Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_rotated-flipped.scssc differ diff --git a/static/scss/icons/font-awesome_old/scss/.sass-cache/e21748d07f87b43d781d83461db5ac1169057247/_screen-reader.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_screen-reader.scssc similarity index 54% rename from static/scss/icons/font-awesome_old/scss/.sass-cache/e21748d07f87b43d781d83461db5ac1169057247/_screen-reader.scssc rename to static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_screen-reader.scssc index 063843620..818c00310 100644 Binary files a/static/scss/icons/font-awesome_old/scss/.sass-cache/e21748d07f87b43d781d83461db5ac1169057247/_screen-reader.scssc and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_screen-reader.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_stacked.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_stacked.scssc new file mode 100644 index 000000000..3472dfe25 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_stacked.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_variables.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_variables.scssc new file mode 100644 index 000000000..6fc352c93 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/_variables.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-brands.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-brands.scssc new file mode 100644 index 000000000..23fbef47e Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-brands.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-regular.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-regular.scssc new file mode 100644 index 000000000..cab043fcf Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-regular.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-solid.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-solid.scssc new file mode 100644 index 000000000..9849677cb Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fa-solid.scssc differ diff --git a/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fontawesome.scssc b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fontawesome.scssc new file mode 100644 index 000000000..af0180ed2 Binary files /dev/null and b/static/scss/icons/font-awesome/scss/.sass-cache/4a1d08add1e8c2c555ddd73b05db224bf2d14751/fontawesome.scssc differ