From b94a3d2ae441992ac200abf446b16f04419e994e Mon Sep 17 00:00:00 2001
From: nyx <nyx@noreply.localhost>
Date: Sat, 1 Feb 2025 15:51:58 -0600
Subject: [PATCH] A few pylint fixes

---
 src/imag/__init__.py | 10 +++-------
 src/imag/routing.py  |  1 +
 src/imag/util.py     |  3 +--
 src/imag/views.py    |  4 +++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/imag/__init__.py b/src/imag/__init__.py
index 513ed88..1f2051b 100644
--- a/src/imag/__init__.py
+++ b/src/imag/__init__.py
@@ -9,7 +9,9 @@ from os import makedirs
 import flask
 from werkzeug.middleware.proxy_fix import ProxyFix
 
-from . import const
+from . import const, models
+from .api import api
+from .views import views
 
 __version__: str = "3.1.2-nyx"
 
@@ -28,9 +30,6 @@ def create_app(db: str = "sqlite:///imag.db") -> t.Tuple[flask.Flask, t.Optional
     app.config["PREFERRED_URL_SCHEME"] = "https"
 
     app.config["SECRET_KEY"] = secrets.SystemRandom().randbytes(1024 * 16)
-
-    from . import models
-
     models.limiter.init_app(app)
     models.db.init_app(app)
 
@@ -77,9 +76,6 @@ def create_app(db: str = "sqlite:///imag.db") -> t.Tuple[flask.Flask, t.Optional
 
         return response
 
-    from .api import api
-    from .views import views
-
     app.register_blueprint(api, url_prefix="/api/")
     app.register_blueprint(views, url_prefix="/")
 
diff --git a/src/imag/routing.py b/src/imag/routing.py
index 72f1848..8f8b877 100644
--- a/src/imag/routing.py
+++ b/src/imag/routing.py
@@ -10,6 +10,7 @@ from .util import make_api
 
 
 class Bp(Blueprint):
+    """app routing helper"""
     def get(self, rule: str, **kwargs: Any) -> Any:
         """wrapper for GET"""
         return self.route(rule=rule, methods=("GET",), **kwargs)
diff --git a/src/imag/util.py b/src/imag/util.py
index f1089c0..45769a3 100644
--- a/src/imag/util.py
+++ b/src/imag/util.py
@@ -48,8 +48,7 @@ def with_access(
 
             if access and (access.access_level.value >= access_level.value):  # type: ignore
                 return fn(*args, **kwargs)  # type: ignore
-            else:
-                flask.abort(403)
+            flask.abort(403)
 
         return decorator
 
diff --git a/src/imag/views.py b/src/imag/views.py
index 68bb38a..33a7359 100644
--- a/src/imag/views.py
+++ b/src/imag/views.py
@@ -82,8 +82,10 @@ def image(iid: int) -> flask.Response:
         with open(os.path.join(const.IMAGE_DIR, str(iid)), "rb") as fp:
             file: bytes = fp.read()
             return flask.Response(file, mimetype=magic.from_buffer(file, mime=True))  # type: ignore
-    except Exception:
+    except FileNotFoundError:
         flask.abort(404)
+    except Exception:
+        flask.abort(500)
 
 
 @views.post("/edit/<int:iid>")