Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add a UUID to exercise images
Roland Geider4abd6469401f
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex c712d126c..31a931e7e 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -61,6 +61,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):class Meta:model = ExerciseImagefields = ['id',+ 'uuid','exercise','image','is_main',diff --git a/wger/exercises/management/commands/download-exercise-images.py b/wger/exercises/management/commands/download-exercise-images.pyindex 2e706fdc0..f81b9ec65 100644--- a/wger/exercises/management/commands/download-exercise-images.py+++ b/wger/exercises/management/commands/download-exercise-images.py@@ -94,9 +94,7 @@ class Command(BaseCommand):exercise_id = exercise_json['id']self.stdout.write('')- self.stdout.write("*** Processing {0} (ID: {1}, UUID: {2})".format(exercise_name,- exercise_id,- exercise_uuid))+ self.stdout.write(f"*** {exercise_name} (ID: {exercise_id}, UUID: {exercise_uuid})")try:exercise = Exercise.objects.get(uuid=exercise_uuid)@@ -112,6 +110,7 @@ class Command(BaseCommand):for image_json in images['results']:image_id = image_json['id']+ image_uuid = image_json['uuid']result = requests.get(THUMBNAIL_API.format(remote_url, image_id),headers=headers).json()@@ -119,18 +118,23 @@ class Command(BaseCommand):self.stdout.write(' Fetching image {0} - {1}'.format(image_id, image_name))try:- image = ExerciseImage.objects.get(pk=image_id)+ image = ExerciseImage.objects.get(uuid=image_uuid)self.stdout.write(' --> Image already present locally, skipping...')continueexcept ExerciseImage.DoesNotExist:self.stdout.write(' --> Image not found in local DB, creating now...')image = ExerciseImage()- image.pk = image_id+ image.uuid = image_uuid- # Save the downloaded image, see link for details+ # Save the downloaded image# http://stackoverflow.com/questions/1308386/programmatically-saving-image-to-retrieved_image = requests.get(remote_url + result['original'], headers=headers)- img_temp = NamedTemporaryFile(delete=True)++ # Temporary files on windows don't support the delete attribute+ if os.name == 'nt':+ img_temp = NamedTemporaryFile()+ else:+ img_temp = NamedTemporaryFile(delete=True)img_temp.write(retrieved_image.content)img_temp.flush()diff --git a/wger/exercises/migrations/0012_auto_20210327_1219.py b/wger/exercises/migrations/0012_auto_20210327_1219.pynew file mode 100644index 000000000..de1dba97d--- /dev/null+++ b/wger/exercises/migrations/0012_auto_20210327_1219.py@@ -0,0 +1,29 @@+# Generated by Django 3.1.7 on 2021-03-27 11:19++from django.db import migrations, models+import uuid+++def generate_uuids(apps, schema_editor):+ """Generate new UUIDs for each exercise image"""++ ExcerciseImage = apps.get_model("exercises", "ExerciseImage")+ for exercise in ExcerciseImage.objects.all():+ exercise.uuid = uuid.uuid4()+ exercise.save()+++class Migration(migrations.Migration):++ dependencies = [+ ('exercises', '0011_auto_20201214_0033'),+ ]++ operations = [+ migrations.AddField(+ model_name='exerciseimage',+ name='uuid',+ field=models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID'),+ ),+ migrations.RunPython(generate_uuids),+ ]diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 886e90326..d6e5d4ff8 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -448,6 +448,11 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)objects = SubmissionManager()"""Custom manager"""+ uuid = models.UUIDField(default=uuid.uuid4,+ editable=False,+ verbose_name='UUID')+ """Globally unique ID, to identify the image across installations"""+exercise = models.ForeignKey(ExerciseBase,verbose_name=_('Exercise'),on_delete=models.CASCADE)