From ea6d722fa8b4786c6ddb1428b6d404f7af9f485c Mon Sep 17 00:00:00 2001 From: EnumDev Date: Fri, 26 Sep 2025 10:23:51 +0300 Subject: [PATCH] Fix IDE warnings --- src/bpmlib/general.go | 10 +++++----- src/bpmlib/installed_packages.go | 10 +++------- src/bpmlib/packages.go | 10 +--------- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/src/bpmlib/general.go b/src/bpmlib/general.go index d5e301a..d7cb128 100644 --- a/src/bpmlib/general.go +++ b/src/bpmlib/general.go @@ -164,14 +164,14 @@ func InstallPackages(rootDir string, forceInstallationReason InstallationReason, if rootDir != "/" { sourcePackages := make([]string, 0) for _, action := range operation.Actions { - switch action.(type) { + switch action := action.(type) { case *InstallPackageAction: - if action.(*InstallPackageAction).BpmPackage.PkgInfo.Type == "source" { - sourcePackages = append(sourcePackages, action.(*InstallPackageAction).BpmPackage.PkgInfo.Name) + if action.BpmPackage.PkgInfo.Type == "source" { + sourcePackages = append(sourcePackages, action.BpmPackage.PkgInfo.Name) } case *FetchPackageAction: - if action.(*FetchPackageAction).DatabaseEntry.Info.Type == "source" { - sourcePackages = append(sourcePackages, action.(*FetchPackageAction).DatabaseEntry.Info.Name) + if action.DatabaseEntry.Info.Type == "source" { + sourcePackages = append(sourcePackages, action.DatabaseEntry.Info.Name) } } } diff --git a/src/bpmlib/installed_packages.go b/src/bpmlib/installed_packages.go index dc295f1..8c22171 100644 --- a/src/bpmlib/installed_packages.go +++ b/src/bpmlib/installed_packages.go @@ -1,7 +1,6 @@ package bpmlib import ( - "errors" "fmt" "os" "path" @@ -169,14 +168,11 @@ func GetAllPackageFiles(rootDir string, excludePackages ...string) (map[string][ } bpmpkg := GetPackage(pkgName, rootDir) if bpmpkg == nil { - return nil, errors.New(fmt.Sprintf("could not get BPM package (%s)", pkgName)) + return nil, fmt.Errorf("could not get BPM package (%s)", pkgName) } for _, entry := range bpmpkg.PkgFiles { - if _, ok := ret[entry.Path]; ok { - ret[entry.Path] = append(ret[entry.Path], bpmpkg) - } else { - ret[entry.Path] = []*BPMPackage{bpmpkg} - } + ret[entry.Path] = append(ret[entry.Path], bpmpkg) + } } diff --git a/src/bpmlib/packages.go b/src/bpmlib/packages.go index 9d87e6d..9e4c5cb 100644 --- a/src/bpmlib/packages.go +++ b/src/bpmlib/packages.go @@ -178,10 +178,10 @@ func ReadPackage(filename string) (*BPMPackage, error) { } file, err := os.Open(filename) - defer file.Close() if err != nil { return nil, err } + defer file.Close() tr := tar.NewReader(file) for { @@ -304,14 +304,6 @@ func ReadPackageScripts(filename string) (map[string]string, error) { return ret, nil } -type packageOperation uint8 - -const ( - packageOperationInstall packageOperation = 0 - packageOperationUpdate = 1 - packageOperationRemove = 2 -) - func executePackageScript(pkg, rootDir string, verbose bool, packageScript string) error { var bpmpkg *BPMPackage var err error