Merge pull request #304 from furlongm/logo

fix logo handling

openvpn_monitor/app.py

@@ -21,7 +21,7 @@
 import secrets
 import sys
 from datetime import datetime
-from flask import Flask, request, render_template
+from flask import Flask, request, render_template, send_file, current_app
 from flask_wtf import CSRFProtect
 from humanize import naturalsize
 from pprint import pformat
@@ -167,6 +167,23 @@ def inject_settings():
             datetime_format=datetime_format,
         )
 
+    @app.route('/images/logo', methods=['GET'])
+    def get_logo():
+        logo = settings.get('logo')
+        if logo.startswith('http'):
+            logging.info(f'Using `{logo}` for logo (http link)')
+            return logo
+        logo_file = os.path.join('/etc/openvpn-monitor', logo)
+        if os.path.isfile(logo_file) and os.access(logo_file, os.R_OK):
+            logging.info(f'Using `{logo_file}` for logo')
+            return send_file(logo_file)
+        logo_file = os.path.join(cwd, 'static/images', logo)
+        if os.path.isfile(logo_file) and os.access(logo_file, os.R_OK):
+            static_logo = f'images/{logo}'
+            logging.info(f'Using `{logo_file}` for logo (static)')
+            return current_app.send_static_file(static_logo)
+        logging.error(f'Logo defined but image not found, skipping')
+
     @app.route('/', methods=['GET', 'POST'])
     def handle_root():
         vpn_data = VPNDataCollector(loaded_vpns, geoip_db.gi)

openvpn_monitor/templates/navbar.html

@@ -23,10 +23,8 @@
       {% if maps %}<li><a href="#map_canvas">Map View</a></li>{% endif %}
     </ul>
       {% if logo %}
-        {% set logo_path = 'images/' + logo %}
         <a href="#" class="pull-right">
-          <img alt="Logo" style="max-height:46px; padding-top:3px;"
-          src={% if logo.startswith('http') %}"{{ logo }}"{% else %}"{{ url_for('static', filename=logo_path) }}"{% endif %}>
+          <img alt="Logo" style="max-height:46px; padding-top:3px;" src="images/logo">
         </a>
       {% endif %}
     </div>