Self hosted FLOSS fitness/workout, nutrition and weight tracker
Delete video file when entry was edited
Roland Geiderea37597f3466
diff --git a/wger/exercises/models/video.py b/wger/exercises/models/video.pyindex d6b919097..3141b125e 100644--- a/wger/exercises/models/video.py+++ b/wger/exercises/models/video.py@@ -144,16 +144,3 @@ class ExerciseVideo(AbstractLicenseModel, models.Model):self.codec_long = stream['codec_long_name']super(ExerciseVideo, self).save(*args, **kwargs)---@receiver(models.signals.post_delete, sender=ExerciseVideo)-def auto_delete_file_on_delete(sender, instance: ExerciseVideo, **kwargs):- """- Deletes file from filesystem- when corresponding `MediaFile` object is deleted.- """- if instance.video:-- path = pathlib.Path(instance.video.path)- if path.exists():- path.unlink()diff --git a/wger/exercises/signals.py b/wger/exercises/signals.pyindex f24493249..5b37ea664 100644--- a/wger/exercises/signals.py+++ b/wger/exercises/signals.py@@ -15,6 +15,8 @@# You should have received a copy of the GNU Affero General Public License# Django+import pathlib+from django.db.models.signals import (post_delete,pre_save,@@ -27,7 +29,10 @@ from easy_thumbnails.signal_handlers import generate_aliasesfrom easy_thumbnails.signals import saved_file# wger-from wger.exercises.models import ExerciseImage+from wger.exercises.models import (+ ExerciseVideo,+ ExerciseImage+)@receiver(post_delete, sender=ExerciseImage)@@ -44,8 +49,8 @@ def delete_exercise_image_on_delete(sender, instance, **kwargs):@receiver(pre_save, sender=ExerciseImage)def delete_exercise_image_on_update(sender, instance, **kwargs):"""- Delete the corresponding image from the filesystem when the an ExerciseImage- object was changed+ Delete the corresponding image from the filesystem when the ExerciseImage+ object was edited"""if not instance.pk:return False@@ -64,3 +69,35 @@ def delete_exercise_image_on_update(sender, instance, **kwargs):# Generate thumbnails when uploading a new imagesaved_file.connect(generate_aliases)+++@receiver(post_delete, sender=ExerciseVideo)+def auto_delete_video_on_delete(sender, instance: ExerciseVideo, **kwargs):+ """+ Deletes file from filesystem when corresponding ExerciseVideo object is deleted+ """+ if instance.video:++ path = pathlib.Path(instance.video.path)+ if path.exists():+ path.unlink()+++@receiver(pre_save, sender=ExerciseVideo)+def delete_exercise_video_on_update(sender, instance: ExerciseVideo, **kwargs):+ """+ Deletes file from filesystem when corresponding ExerciseVideo object was edited+ """+ if not instance.pk:+ return False++ try:+ old_file = ExerciseVideo.objects.get(pk=instance.pk).video+ except ExerciseVideo.DoesNotExist:+ return False++ new_file = instance.video+ if old_file != new_file:+ path = pathlib.Path(old_file.path)+ if path.is_file():+ path.unlink()diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex 46554b483..872d17f7e 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -159,7 +159,7 @@ $(document).ready(function() {<a href="{% url 'exercise:video:delete' exercise.pk video.pk %}" class="wger-modal-dialog btn btn-link"><span class="{% fa_class 'trash' %}"></span></a>- <a href="{% url 'exercise:video:edit' video.pk %}" class="btn btn-link">+ <a href="{% url 'exercise:video:edit' exercise.pk video.pk %}" class="btn btn-link"><span class="{% fa_class 'edit' %}"></span></a>{% endif %}diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex eae0afd4f..1114bbbb2 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -101,7 +101,7 @@ patterns_videos = [name='add',),path(- '<int:pk>/edit',+ '<int:exercise_pk>/<int:pk>/edit',videos.ExerciseVideoEditView.as_view(),name='edit',),diff --git a/wger/exercises/views/videos.py b/wger/exercises/views/videos.pyindex 86a69e11d..8039ae9a1 100644--- a/wger/exercises/views/videos.py+++ b/wger/exercises/views/videos.py@@ -73,7 +73,7 @@ class ExerciseVideoEditView(form_class = ExerciseVideoFormdef get_success_url(self):- return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise_base.id})+ return reverse('exercise:exercise:view', kwargs={'id': self.kwargs['exercise_pk']})# Send some additional data to the templatedef get_context_data(self, **kwargs):