Refactor AURPKGBUILDRepos and Fix Localization Command in Makefile (#…

…2313) * optimize mutex usage and logging in AURPKGBUILDRepos function * fix localization script Fix localization script Makefile by adding missing semicolon and --no-translator flag
Jguer · Nov 20, 2023 · 0771ded · 0771ded
1 parent 8f98ab3
commit 0771ded
Show file tree

Hide file tree

Showing 24 changed files with 6,111 additions and 3,724 deletions.
diff --git a/Makefile b/Makefile
@@ -127,7 +127,7 @@ $(PACKAGE): $(BIN) $(RELEASE_DIR) ${MOFILES}
 locale:
 	xgotext -in . -out po
 	for lang in ${LANGS}; do \
-		test -f po/$$lang.po || msginit -l po/$$lang.po -i po/${POTFILE} -o po/$$lang.po \
+		test -f po/$$lang.po || msginit --no-translator -l po/$$lang.po -i po/${POTFILE} -o po/$$lang.po; \
 		msgmerge -U po/$$lang.po po/${POTFILE}; \
 		touch po/$$lang.po; \
 	done

diff --git a/pkg/download/aur.go b/pkg/download/aur.go
@@ -63,30 +63,34 @@ func AURPKGBUILDRepos(
 
 	for _, target := range targets {
 		sem <- 1
-
 		wg.Add(1)
 
 		go func(target string) {
-			newClone, err := AURPKGBUILDRepo(ctx, cmdBuilder, aurURL, target, dest, force)
+			defer func() {
+				<-sem
+				wg.Done()
+			}()
 
-			progress := 0
+			newClone, err := AURPKGBUILDRepo(ctx, cmdBuilder, aurURL, target, dest, force)
 
+			mux.Lock()
+			progress := len(cloned)
 			if err != nil {
 				errs.Add(err)
-			} else {
-				mux.Lock()
-				cloned[target] = newClone
-				progress = len(cloned)
 				mux.Unlock()
+				logger.OperationInfoln(
+					gotext.Get("(%d/%d) Failed to download PKGBUILD: %s",
+						progress, len(targets), text.Cyan(target)))
+				return
 			}
 
+			cloned[target] = newClone
+			progress = len(cloned)
+			mux.Unlock()
+
 			logger.OperationInfoln(
 				gotext.Get("(%d/%d) Downloaded PKGBUILD: %s",
 					progress, len(targets), text.Cyan(target)))
-
-			<-sem
-
-			wg.Done()
 		}(target)
 	}