Code refactoring

Author: andyone

cli/cli.go

@@ -228,10 +228,11 @@ var repoNamePattern = `[0-9a-zA-Z_\-]+`
 // configs contains repositories configs
 var configs map[string]*knf.Config
 
-// isCanceled is a flag for marking that user want to cancel app execution
+// isCanceled is an atomic flag indicating the user canceled execution (SIGINT/SIGTERM)
 var isCanceled atomic.Bool
 
-// isCancelProtected is a flag for marking current execution from canceling
+// isCancelProtected is an atomic flag indicating critical sections that should not
+// be interrupted
 var isCancelProtected atomic.Bool
 
 // rawOutput is raw output flag
@@ -548,7 +549,7 @@ func sigHandler() {
 		shutdown(EC_ERROR)
 	}
 
-	isCanceled.CompareAndSwap(false, true)
+	isCanceled.Store(true)
 }
 
 // shutdown cleans temporary data and exits from CLI

cli/cmd_resign.go

@@ -119,8 +119,10 @@ func resignRepoPackages(ctx *context, key *sign.Key, r *repo.SubRepository) bool
 	pb := progress.New(int64(len(files)), "Re-signing")
 	pb.Start()
 
+	isCancelProtected.Store(true)
+	defer isCancelProtected.Store(false)
+
 	for _, file := range files {
-		isCancelProtected.Store(true)
 
 		filePath := r.GetFullPackagePath(file)
 		fileName := path.Base(filePath)
@@ -148,8 +150,6 @@ func resignRepoPackages(ctx *context, key *sign.Key, r *repo.SubRepository) bool
 			pb.Finish()
 			return false
 		}
-
-		isCancelProtected.Store(false)
 	}
 
 	pb.Finish()

cli/common.go

@@ -254,6 +254,7 @@ func warmUpCache(r *repo.Repository) {
 	}
 
 	isCancelProtected.Store(true)
+	defer isCancelProtected.Store(false)
 
 	if warmupTesting {
 		fmtc.If(!rawOutput && !options.GetB(OPT_PAGER)).TPrintf("{s-}Warming up testing repository cache (it can take a while)…{!}")
@@ -271,8 +272,6 @@ func warmUpCache(r *repo.Repository) {
 	}
 
 	fmtc.If(!rawOutput && !options.GetB(OPT_PAGER)).TPrintf("")
-
-	isCancelProtected.Store(false)
 }
 
 // checkForLock check for lock file