Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into fix/ingredient-thumbnails
Roland Geider1f7f40539f73
diff --cc wger/exercises/api/serializers.pyindex 27b8ce9e8,9971e3deb..42c0d7f71--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@@ -120,9 -142,13 +144,14 @@@ class ExerciseImageSerializer(serializeExerciseImage serializer"""+ serializer_field_mapping = {+ **serializers.ModelSerializer.serializer_field_mapping,+ models.ImageField: AbsoluteUrlImageField,+ }+author_history = serializers.ListSerializer(child=serializers.CharField(), read_only=True)exercise_uuid = serializers.ReadOnlyField(source='exercise.uuid')+ thumbnails = serializers.SerializerMethodField()class Meta:model = ExerciseImage@@@ -145,23 -170,6 +174,23 @@@'is_ai_generated',)+ def get_thumbnails(self, obj: ExerciseImage):+ if not obj.image:+ return None++ request = self.context.get('request')+ result = {}++ thumbnailer = get_thumbnailer(obj.image)+ try:+ for alias in ('small', 'medium'):+ opts = settings.THUMBNAIL_ALIASES[''][alias]+ thumb = thumbnailer.get_thumbnail(opts)- result[alias] = request.build_absolute_uri(thumb.url)++ result[alias] = make_absolute_url(thumb.url, request)+ except (InvalidImageFormatError, OSError):+ return None+ return result+class ExerciseVideoSerializer(serializers.ModelSerializer):"""diff --cc wger/nutrition/api/serializers.pyindex 10d5cebcd,8cfa02394..880371605--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@@ -30,6 -34,9 +34,10 @@@ from wger.nutrition.models importMealItem,NutritionPlan,)++from wger.utils.url import make_absolute_url+++ logger = logging.getLogger(__name__)class IngredientWeightUnitSerializer(serializers.ModelSerializer):@@@ -195,8 -202,12 +203,12 @@@ class IngredientInfoSerializer(serializthumbnailer = get_thumbnailer(obj.image.image)for alias in aliases:opts = settings.THUMBNAIL_ALIASES[''][alias]- thumb = thumbnailer.get_thumbnail(opts)- result[alias] = request.build_absolute_uri(thumb.url)+ try:+ thumb = thumbnailer.get_thumbnail(opts)+ except (EasyThumbnailsError, OSError, ValueError):+ logger.warning('Could not generate thumbnails for image %s', obj.image.pk)+ return None- result[alias] = request.build_absolute_uri(thumb.url)++ result[alias] = make_absolute_url(thumb.url, request)return result