ФУНКЦИИ - МЕЖПРОЕКТНАЯ КОММУНИКАЦИЯ: blob-дедупликация файлов

plane-src/apps/api/plane/bgtasks/copy_s3_object.py

@@ -17,6 +17,7 @@ from plane.utils.exception_logger import log_exception
 from plane.settings.storage import S3Storage
 from celery import shared_task
 from plane.utils.url import normalize_url_path
+from plane.utils.file_dedup import attach_existing_blob_to_file_asset, confirm_uploaded_file_asset
 
 
 def get_entity_id_field(entity_type, entity_id):
@@ -108,15 +109,16 @@ def copy_assets(entity, entity_identifier, project_id, asset_ids, user_id):
             storage_metadata=original_asset.storage_metadata,
             **get_entity_id_field(original_asset.entity_type, entity_identifier),
         )
-        storage.copy_object(original_asset.asset, destination_key)
+        if not attach_existing_blob_to_file_asset(original_asset, duplicated_asset):
+            storage.copy_object(original_asset.asset, destination_key)
+            confirm_uploaded_file_asset(duplicated_asset)
+
         duplicated_assets.append(
             {
                 "new_asset_id": str(duplicated_asset.id),
                 "old_asset_id": str(original_asset.id),
             }
         )
-    if duplicated_assets:
-        FileAsset.objects.filter(pk__in=[item["new_asset_id"] for item in duplicated_assets]).update(is_uploaded=True)
 
     return duplicated_assets
 

plane-src/apps/api/plane/bgtasks/file_asset_task.py

@@ -15,12 +15,16 @@ from celery import shared_task
 
 # Module imports
 from plane.db.models import FileAsset
+from plane.utils.file_dedup import release_file_asset_blob
 
 
 @shared_task
 def delete_unuploaded_file_asset():
     """This task deletes unuploaded file assets older than a certain number of days."""
-    FileAsset.objects.filter(
+    stale_assets = FileAsset.objects.filter(
         Q(created_at__lt=timezone.now() - timedelta(days=int(os.environ.get("UNUPLOADED_ASSET_DELETE_DAYS", "7"))))
         & Q(is_uploaded=False)
-    ).delete()
+    )
+    for asset in stale_assets.iterator():
+        release_file_asset_blob(asset, delete_untracked_object=True)
+        asset.delete()