diff --git a/backend/app/service/backup.go b/backend/app/service/backup.go index a884bd657..a73e49a8e 100644 --- a/backend/app/service/backup.go +++ b/backend/app/service/backup.go @@ -91,8 +91,10 @@ func (u *BackupService) SearchRecordsWithPage(search dto.RecordSearch) (int64, [ } itemPath := path.Join(records[i].FileDir, records[i].FileName) if records[i].Source == "LOCAL" { - fileInfo, _ := os.Stat(itemPath) - item.Size = fileInfo.Size() + fileInfo, err := os.Stat(itemPath) + if err == nil { + item.Size = fileInfo.Size() + } datas = append(datas, item) continue } diff --git a/backend/app/service/backup_app.go b/backend/app/service/backup_app.go index 0ba62e5a3..ce9195e10 100644 --- a/backend/app/service/backup_app.go +++ b/backend/app/service/backup_app.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "github.com/1Panel-dev/1Panel/backend/buserr" "io/fs" "os" "path" @@ -70,7 +71,7 @@ func (u *BackupService) AppRecover(req dto.CommonRecover) error { fileOp := files.NewFileOp() if !fileOp.Stat(req.File) { - return errors.New(fmt.Sprintf("%s file is not exist", req.File)) + return buserr.WithName("ErrFileNotFound", req.File) } if _, err := compose.Down(install.GetComposePath()); err != nil { return err diff --git a/backend/app/service/backup_mysql.go b/backend/app/service/backup_mysql.go index be4b409a6..4eb30915b 100644 --- a/backend/app/service/backup_mysql.go +++ b/backend/app/service/backup_mysql.go @@ -2,6 +2,7 @@ package service import ( "fmt" + "github.com/1Panel-dev/1Panel/backend/buserr" "os" "path" "path/filepath" @@ -13,7 +14,6 @@ import ( "github.com/1Panel-dev/1Panel/backend/global" "github.com/1Panel-dev/1Panel/backend/utils/files" "github.com/1Panel-dev/1Panel/backend/utils/mysql/client" - "github.com/pkg/errors" ) func (u *BackupService) MysqlBackup(req dto.CommonBackup) error { @@ -125,7 +125,7 @@ func handleMysqlRecover(req dto.CommonRecover, isRollback bool) error { isOk := false fileOp := files.NewFileOp() if !fileOp.Stat(req.File) { - return errors.New(fmt.Sprintf("%s file is not exist", req.File)) + return buserr.WithName("ErrFileNotFound", req.File) } dbInfo, err := mysqlRepo.Get(commonRepo.WithByName(req.DetailName), mysqlRepo.WithByMysqlName(req.Name)) if err != nil { diff --git a/backend/app/service/backup_redis.go b/backend/app/service/backup_redis.go index 7208d1f70..45336bc02 100644 --- a/backend/app/service/backup_redis.go +++ b/backend/app/service/backup_redis.go @@ -111,7 +111,7 @@ func handleRedisBackup(redisInfo *repo.RootInfo, backupDir, fileName string) err func handleRedisRecover(redisInfo *repo.RootInfo, recoverFile string, isRollback bool) error { fileOp := files.NewFileOp() if !fileOp.Stat(recoverFile) { - return fmt.Errorf("%s file is not exist", recoverFile) + return buserr.WithName("ErrFileNotFound", recoverFile) } appendonly, err := configGetStr(redisInfo.ContainerName, redisInfo.Password, "appendonly") diff --git a/backend/app/service/backup_website.go b/backend/app/service/backup_website.go index fadcb3423..8cbf5e5bf 100644 --- a/backend/app/service/backup_website.go +++ b/backend/app/service/backup_website.go @@ -56,7 +56,7 @@ func (u *BackupService) WebsiteBackup(req dto.CommonBackup) error { func (u *BackupService) WebsiteRecover(req dto.CommonRecover) error { fileOp := files.NewFileOp() if !fileOp.Stat(req.File) { - return errors.New(fmt.Sprintf("%s file is not exist", req.File)) + return buserr.WithName("ErrFileNotFound", req.File) } website, err := websiteRepo.GetFirst(websiteRepo.WithAlias(req.DetailName)) if err != nil {