From fa2b0249061fc50e3bae9d61805c20fe843c82ac Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@163.com>
Date: Sun, 20 Oct 2024 18:21:06 +0800
Subject: [PATCH] fix: delete spider issue

---
 core/controllers/spider_v2.go | 59 ++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/core/controllers/spider_v2.go b/core/controllers/spider_v2.go
index 0bb5ac23..d4a84b3f 100644
--- a/core/controllers/spider_v2.go
+++ b/core/controllers/spider_v2.go
@@ -2,6 +2,11 @@ package controllers
 
 import (
 	"errors"
+	"math"
+	"os"
+	"path/filepath"
+	"sync"
+
 	"github.com/apex/log"
 	"github.com/crawlab-team/crawlab/core/fs"
 	"github.com/crawlab-team/crawlab/core/interfaces"
@@ -17,10 +22,6 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	mongo2 "go.mongodb.org/mongo-driver/mongo"
-	"math"
-	"os"
-	"path/filepath"
-	"sync"
 )
 
 func GetSpiderById(c *gin.Context) {
@@ -334,6 +335,13 @@ func DeleteSpiderById(c *gin.Context) {
 		return
 	}
 
+	// spider
+	s, err := service.NewModelServiceV2[models2.SpiderV2]().GetById(id)
+	if err != nil {
+		HandleErrorInternalServerError(c, err)
+		return
+	}
+
 	if err := mongo.RunTransaction(func(context mongo2.SessionContext) (err error) {
 		// delete spider
 		err = service.NewModelServiceV2[models2.SpiderV2]().DeleteById(id)
@@ -396,34 +404,21 @@ func DeleteSpiderById(c *gin.Context) {
 		return
 	}
 
-	go func() {
-		// spider
-		s, err := service.NewModelServiceV2[models2.SpiderV2]().GetById(id)
-		if err != nil {
-			log.Errorf("failed to get spider: %s", err.Error())
-			trace.PrintError(err)
-			return
-		}
-
-		// skip spider with git
-		if !s.GitId.IsZero() {
-			return
-		}
-
-		// delete spider directory
-		fsSvc, err := getSpiderFsSvcById(id)
-		if err != nil {
-			log.Errorf("failed to get spider fs service: %s", err.Error())
-			trace.PrintError(err)
-			return
-		}
-		err = fsSvc.Delete(".")
-		if err != nil {
-			log.Errorf("failed to delete spider directory: %s", err.Error())
-			trace.PrintError(err)
-			return
-		}
-	}()
+	if !s.GitId.IsZero() {
+		go func() {
+			// delete spider directory
+			fsSvc, err := getSpiderFsSvcById(id)
+			if err != nil {
+				log.Errorf("failed to get spider fs service: %s", err.Error())
+				return
+			}
+			err = fsSvc.Delete(".")
+			if err != nil {
+				log.Errorf("failed to delete spider directory: %s", err.Error())
+				return
+			}
+		}()
+	}
 
 	HandleSuccess(c)
 }