The fifth revision (#52)

Author: habedi

.github/workflows/lints.yml

@@ -22,6 +22,16 @@ jobs:
         with:
           go-version: stable
 
+      - name: Cache Go Modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Install Dependencies
         run: |
           make install-deps

.github/workflows/tests.yml

@@ -27,6 +27,16 @@ jobs:
         with:
           go-version: ${{ matrix.go-version }}
 
+      - name: Cache Go Modules
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: Install Dependencies
         run: |
           sudo apt-get update

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+default_stages: [ pre-push ]
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
@@ -16,18 +17,17 @@ repos:
         entry: make format
         language: system
         pass_filenames: false
-        types: [ go ]
+        types: [ 'go' ]
 
       - id: lint
         name: Check code style
         entry: make lint
         language: system
         pass_filenames: false
-        types: [ go ]
+        types: [ 'go' ]
 
       - id: test
         name: Run tests
         entry: make test
         language: system
         pass_filenames: false
-        stages: [ pre-push ]

CONTRIBUTING.md

@@ -34,6 +34,7 @@ sudo apt-get install -y golang-go make
 ```
 
 - Use the `make install-deps` command to install the development dependencies.
+- Use the `make setup-hooks` command to set up Git hooks for pre-commit checks.
 
 ### Code Style
 

Makefile

@@ -77,7 +77,7 @@ run: build ## Build and run the binary
 .PHONY: clean
 clean: ## Remove artifacts and temporary files
 	$(ECHO) "Cleaning up..."
-	@$(GO) clean -cache -testcache -modcache
+	@$(GO) clean #-cache -testcache -modcache
 	@find . -type f -name '*.got.*' -delete
 	@find . -type f -name '*.out' -delete
 	@find . -type f -name '*.snap' -delete
@@ -100,7 +100,7 @@ install-snap: ## Install Snap (for Debian-based systems)
 install-deps: ## Install development dependencies (for Debian-based systems)
 	$(ECHO) "Installing dependencies..."
 	@sudo apt-get install -y make libgl1-mesa-dev libx11-dev xorg-dev \
-	libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev pkg-config
+	libxcursor-dev libxrandr-dev libxinerama-dev libxi-dev pkg-config libasound2-dev
 	@$(MAKE) install-snap
 	@sudo snap install go --classic
 	@sudo snap install golangci-lint --classic
@@ -139,15 +139,17 @@ release-macos: ## Build release binary for macOS (v14 and newer; arm64)
 	echo "Build complete: $(BINARY)"
 
 .PHONY: setup-hooks
-setup-hooks: ## Set up pre-commit hooks
-	@echo "Setting up pre-commit hooks..."
+setup-hooks: ## Install Git hooks (pre-commit and pre-push)
+	@echo "Setting up Git hooks..."
 	@if ! command -v pre-commit &> /dev/null; then \
 	   echo "pre-commit not found. Please install it using 'pip install pre-commit'"; \
 	   exit 1; \
 	fi
-	@pre-commit install --install-hooks
+	@pre-commit install --hook-type pre-commit
+	@pre-commit install --hook-type pre-push
+	@pre-commit install-hooks
 
 .PHONY: test-hooks
-test-hooks: ## Test pre-commit hooks on all files
-	@echo "Testing pre-commit hooks..."
-	@pre-commit run --all-files
+test-hooks: ## Test Git hooks on all files
+	@echo "Testing Git hooks..."
+	@pre-commit run --all-files --show-diff-on-failure

client/catalogue.go

@@ -44,6 +44,15 @@ func RefreshCatalogue(
 	totalGames := float64(len(gameIDs))
 
 	workerFunc := func(ctx context.Context, id int) error {
+		// Defer the counter increment to guarantee it runs even if a fetch fails.
+		defer func() {
+			count := processedCount.Add(1)
+			if progressCb != nil {
+				progress := float64(count) / totalGames
+				progressCb(progress)
+			}
+		}()
+
 		url := fmt.Sprintf("https://embed.gog.com/account/gameDetails/%d.json", id)
 		details, raw, fetchErr := FetchGameData(token.AccessToken, url)
 		if fetchErr != nil {
@@ -56,11 +65,6 @@ func RefreshCatalogue(
 			}
 		}
 
-		count := processedCount.Add(1)
-		if progressCb != nil {
-			progress := float64(count) / totalGames
-			progressCb(progress)
-		}
 		return nil
 	}