diff --git a/files/models/media.py b/files/models/media.py index 0e101a21..e7824cc4 100644 --- a/files/models/media.py +++ b/files/models/media.py @@ -410,11 +410,11 @@ class Media(models.Model): self.media_type = "image" elif kind == "pdf": self.media_type = "pdf" - - if self.media_type in ["audio", "image", "pdf"]: + if self.media_type in ["image", "pdf"]: self.encoding_status = "success" else: ret = helpers.media_file_info(self.media_file.path) + if ret.get("fail"): self.media_type = "" self.encoding_status = "fail" diff --git a/files/tasks.py b/files/tasks.py index 586075ae..c6ea9ac2 100644 --- a/files/tasks.py +++ b/files/tasks.py @@ -980,10 +980,10 @@ def post_trim_action(friendly_token): produce_sprite_from_video.delay(friendly_token) create_hls.delay(friendly_token) - vt_request = VideoTrimRequest.objects.filter(media=media, status="running").first() - if vt_request: - vt_request.status = "success" - vt_request.save(update_fields=["status"]) + vt_request = VideoTrimRequest.objects.filter(media=media, status="running").first() + if vt_request: + vt_request.status = "success" + vt_request.save(update_fields=["status"]) return True @@ -1003,7 +1003,6 @@ def video_trim_task(self, trim_request_id): timestamps_encodings = get_trim_timestamps(trim_request.media.trim_video_path, trim_request.timestamps) timestamps_original = get_trim_timestamps(trim_request.media.media_file.path, trim_request.timestamps) - if not timestamps_encodings: trim_request.status = "fail" trim_request.save(update_fields=["status"]) diff --git a/files/views/pages.py b/files/views/pages.py index de2c8838..acd6487b 100644 --- a/files/views/pages.py +++ b/files/views/pages.py @@ -430,7 +430,7 @@ def edit_video(request): return HttpResponseRedirect("/") if media.media_type not in ["video", "audio"]: - messages.add_message(request, messages.INFO, "Media is not video") + messages.add_message(request, messages.INFO, "Media is not video or audio") return HttpResponseRedirect(media.get_absolute_url()) if not settings.ALLOW_VIDEO_TRIMMER: