Merge pull request #227 from will2z/releases

fix: import failed with the incomplete CAR file
filswan · May 9, 2023 · 46ea9ab · 46ea9ab
2 parents a668465 + a56b7a5
commit 46ea9ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/service/aria2.go b/service/aria2.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"fmt"
-	"github.com/google/uuid"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -18,6 +17,7 @@ import (
 	"github.com/filswan/go-swan-lib/logs"
 	libmodel "github.com/filswan/go-swan-lib/model"
 	"github.com/filswan/go-swan-lib/utils"
+	"github.com/google/uuid"
 )
 
 type Aria2Service struct {
@@ -255,15 +255,15 @@ func (aria2Service *Aria2Service) StartDownload4Deal(deal *libmodel.OfflineDeal,
 	for _, dir := range aria2Service.CandidateDirs {
 		outDir = strings.TrimSuffix(dir, "/")
 		filePath = outDir + "/" + outFilename
-		if IsExist(filePath) {
+		if IsDownloadFinish(filePath) {
 			UpdateDealInfoAndLog(deal, DEAL_STATUS_IMPORT_READY, &filePath, outFilename+", the car file already exists, skip downloading it")
 			return
 		}
 	}
 
 	outDir = strings.TrimSuffix(aria2Service.DownloadDir, "/")
 	filePath = outDir + "/" + outFilename
-	if IsExist(filePath) {
+	if IsDownloadFinish(filePath) {
 		UpdateDealInfoAndLog(deal, DEAL_STATUS_IMPORT_READY, &filePath, outFilename+", the car file already exists, skip downloading it")
 		return
 	}

diff --git a/service/lotus.go b/service/lotus.go
@@ -3,9 +3,6 @@ package service
 import (
 	"context"
 	"fmt"
-	"github.com/filswan/go-swan-lib/client/boost"
-	"github.com/filswan/go-swan-lib/model"
-	"github.com/google/uuid"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -16,10 +13,13 @@ import (
 	"sync"
 	"time"
 
+	"github.com/filswan/go-swan-lib/client/boost"
 	"github.com/filswan/go-swan-lib/client/lotus"
 	"github.com/filswan/go-swan-lib/client/swan"
 	"github.com/filswan/go-swan-lib/logs"
+	"github.com/filswan/go-swan-lib/model"
 	"github.com/filswan/go-swan-lib/utils"
+	"github.com/google/uuid"
 )
 
 type LotusService struct {
@@ -225,6 +225,10 @@ func IsExist(filePath string) bool {
 	return err == nil || os.IsExist(err)
 }
 
+func IsDownloadFinish(filePath string) bool {
+	return IsExist(filePath) && !IsExist(filePath+".aria2")
+}
+
 func DeleteDownloadedFiles(filePath string) {
 	aria2AutoDeleteCarFile := config.GetConfig().Aria2.Aria2AutoDeleteCarFile
 	if aria2AutoDeleteCarFile {