Commit cd830aab authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

always call post_upload_treatment on upload

parent d81ae94e
Loading
Loading
Loading
Loading
+2 −11
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ def handle_uploaded_file(
    uploaded_file: File,
    project: models.Project,
    force_file_name=None,
    defer_post_treatment: bool = False,
) -> int:
    upload_hash = hash_upload(uploaded_file)
    destination_file = models.hash_to_local_path(upload_hash)
@@ -290,16 +289,6 @@ def handle_uploaded_file(
            )
        except IntegrityError:
            raise ConcurrencyError()

        if defer_post_treatment:
            post_upload_treatment(file.pk)
        else:
            set_exif_metas(file)
            make_iiif(file)
            make_ocr(file)
            file.post_treated = True
            file.save()

    # file is respawned ?
    if file.deleted_at:
        file.deleted_at = None
@@ -308,6 +297,8 @@ def handle_uploaded_file(
    # to the filesystem.
    file.dump_infos_to_fs()
    logger.info("Added from upload: {} ({})".format(file.title, file.id))
    # always re-run post treatment, in a separate task
    post_upload_treatment(file.pk)
    return file.id


+0 −1
Original line number Diff line number Diff line
@@ -317,7 +317,6 @@ def upload_partial(request: HttpRequest) -> HttpResponse:
                            File(f),
                            project,
                            force_file_name=file_name,
                            defer_post_treatment=True,
                        )
                        f.close()
                        _silent_rmdir(partials_dir)