wger: no-gifs patch + guinicorn
This commit is contained in:
parent
6c33d36fc5
commit
ff3ea0735c
3 changed files with 45 additions and 4 deletions
|
@ -95,6 +95,7 @@ let
|
||||||
|
|
||||||
WGER_SETTINGS[k] = v
|
WGER_SETTINGS[k] = v
|
||||||
'';
|
'';
|
||||||
|
settingsFileDir = pkgs.writeTextDir "settings.py" (builtins.readFile settingsFile);
|
||||||
in {
|
in {
|
||||||
|
|
||||||
# main service
|
# main service
|
||||||
|
@ -103,13 +104,20 @@ in {
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
after = [ "networking.target" ];
|
after = [ "networking.target" ];
|
||||||
|
|
||||||
script = ''
|
script = let
|
||||||
|
pythonEnv = pkgs.python3.withPackages (ps: with ps; [
|
||||||
|
gunicorn
|
||||||
|
(pkgs.python3Packages.callPackage ./wgerpkg/default.nix {})
|
||||||
|
]);
|
||||||
|
in ''
|
||||||
# initial setup
|
# initial setup
|
||||||
${wgerpkgs}/bin/wger migrate-db -s ${settingsFile} || true
|
${wgerpkgs}/bin/wger migrate-db -s ${settingsFile} || true
|
||||||
${wgerpkgs}/bin/wger load-fixtures -s ${settingsFile} || true
|
# TODO: fix at some point
|
||||||
|
# ${wgerpkgs}/bin/wger load-fixtures -s ${settingsFile} || true
|
||||||
|
|
||||||
# run server
|
# run server
|
||||||
${wgerpkgs}/bin/wger start -s ${settingsFile}
|
# ${wgerpkgs}/bin/wger start -s ${settingsFile}
|
||||||
|
PYTHONPATH="${pythonEnv}/${pkgs.python3.sitePackages}:${settingsFileDir}" ${pythonEnv}/bin/gunicorn wger.wsgi:application --reload --bind 127.0.0.1:${builtins.toString port}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
let
|
let
|
||||||
frontend = callPackage ./frontend.nix {};
|
frontend = callPackage ./frontend.nix {};
|
||||||
in python3.pkgs.buildPythonApplication rec {
|
in python3.pkgs.buildPythonPackage rec {
|
||||||
pname = "wger";
|
pname = "wger";
|
||||||
version = "unstable-2024-12-01";
|
version = "unstable-2024-12-01";
|
||||||
pyproject = true;
|
pyproject = true;
|
||||||
|
@ -28,6 +28,7 @@ in python3.pkgs.buildPythonApplication rec {
|
||||||
./patches/pyproject.patch
|
./patches/pyproject.patch
|
||||||
./patches/tasks.patch
|
./patches/tasks.patch
|
||||||
./patches/manage.patch
|
./patches/manage.patch
|
||||||
|
./patches/exercises-no-gifs.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
# dependencies = with python3.pkgs; [
|
# dependencies = with python3.pkgs; [
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
|
||||||
|
index d6387bb2b..86bca386b 100644
|
||||||
|
--- a/wger/exercises/api/views.py
|
||||||
|
+++ b/wger/exercises/api/views.py
|
||||||
|
@@ -374,12 +374,13 @@ def search(request):
|
||||||
|
image = image_obj.image.url
|
||||||
|
t = get_thumbnailer(image_obj.image)
|
||||||
|
thumbnail = None
|
||||||
|
- try:
|
||||||
|
- thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
|
||||||
|
- except InvalidImageFormatError as e:
|
||||||
|
- logger.info(f'InvalidImageFormatError while processing a thumbnail: {e}')
|
||||||
|
- except OSError as e:
|
||||||
|
- logger.info(f'OSError while processing a thumbnail: {e}')
|
||||||
|
+ if not image.lower().endswith(".gif"):
|
||||||
|
+ try:
|
||||||
|
+ thumbnail = t.get_thumbnail(aliases.get('micro_cropped')).url
|
||||||
|
+ except InvalidImageFormatError as e:
|
||||||
|
+ logger.info(f'InvalidImageFormatError while processing a thumbnail: {e}')
|
||||||
|
+ except OSError as e:
|
||||||
|
+ logger.info(f'OSError while processing a thumbnail: {e}')
|
||||||
|
|
||||||
|
result_json = {
|
||||||
|
'value': translation.name,
|
||||||
|
@@ -393,6 +394,7 @@ def search(request):
|
||||||
|
},
|
||||||
|
}
|
||||||
|
results.append(result_json)
|
||||||
|
+
|
||||||
|
response['suggestions'] = results
|
||||||
|
return Response(response)
|
||||||
|
|
Loading…
Reference in a new issue