Delete quarantined content without deleting the DB record

Fixes #197
t2bot · Sep 3, 2019 · 46c53b4 · 46c53b4
1 parent 381746d
commit 46c53b4
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/controllers/maintenance_controller/maintainance_controller.go b/controllers/maintenance_controller/maintainance_controller.go
@@ -289,11 +289,25 @@ func doPurge(media *types.Media, ctx context.Context, log *logrus.Entry) error {
 	}
 
 	metadataDb := storage.GetDatabase().GetMetadataStore(ctx, log)
-	err = metadataDb.ReserveMediaId(media.Origin, media.MediaId, "purged / deleted")
+
+	reserved, err := metadataDb.IsReserved(media.Origin, media.MediaId)
 	if err != nil {
 		return err
 	}
 
+	if !reserved {
+		err = metadataDb.ReserveMediaId(media.Origin, media.MediaId, "purged / deleted")
+		if err != nil {
+			return err
+		}
+	}
+
+	// Don't delete the media record itself if it is quarantined. If we delete it, the media
+	// becomes not-quarantined so we'll leave it and let it 404 in the datastores.
+	if media.Quarantined {
+		return nil
+	}
+
 	mediaDb := storage.GetDatabase().GetMediaStore(ctx, log)
 	err = mediaDb.Delete(media.Origin, media.MediaId)
 	if err != nil {