fix: handle disc identification edge cases

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v6
       with:
-        go-version: '1.24.x'
+        go-version: '1.26.4'
 
     - name: Build gameid
       env:

archive/archive.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/archive_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/detect.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/detect_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/errors.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/errors_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/path.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/path_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/rar.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -60,7 +60,7 @@ func (ra *RARArchive) List() ([]FileInfo, error) {
 		return nil, fmt.Errorf("create RAR reader: %w", err)
 	}
 
-	var files []FileInfo //nolint:prealloc // RAR file count unknown until full scan
+	var files []FileInfo
 	for {
 		header, err := reader.Next()
 		if errors.Is(err, io.EOF) {

archive/sevenzip.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

archive/zip.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

blockdevice_unix.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/bitstream.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/chd.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/chd_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -1070,7 +1070,9 @@ func TestNeoGeoCDCHD(t *testing.T) {
 		codecName := "?"
 		if int(entry.CompType) < len(header.Compressors) {
 			tag := header.Compressors[entry.CompType]
-			codecName = string([]byte{byte(tag >> 24), byte(tag >> 16), byte(tag >> 8), byte(tag)})
+			codecName = string([]byte{
+				byte(tag >> 24 & 0xFF), byte(tag >> 16 & 0xFF), byte(tag >> 8 & 0xFF), byte(tag & 0xFF),
+			})
 		}
 		t.Logf("Hunk %d: CompType=%d (%s), CompLength=%d, Offset=%d",
 			idx, entry.CompType, codecName, entry.CompLength, entry.Offset)

chd/codec.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -112,10 +112,10 @@ func codecTagToString(tag uint32) string {
 		return "none"
 	}
 	tagBytes := []byte{
-		byte(tag >> 24),
-		byte(tag >> 16),
-		byte(tag >> 8),
-		byte(tag),
+		byte(tag >> 24 & 0xFF),
+		byte(tag >> 16 & 0xFF),
+		byte(tag >> 8 & 0xFF),
+		byte(tag & 0xFF),
 	}
 	return string(tagBytes)
 }

chd/codec_flac.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -76,8 +76,8 @@ func writeFLACFrameSamples(audioFrame *frame.Frame, dst []byte, offset int) int
 		for ch := range numChannels {
 			sample := audioFrame.Subframes[ch].Samples[i]
 			if offset+2 <= len(dst) {
-				dst[offset] = byte(sample >> 8)
-				dst[offset+1] = byte(sample)
+				dst[offset] = byte(sample >> 8 & 0xFF)
+				dst[offset+1] = byte(sample & 0xFF)
 				offset += 2
 			}
 		}
@@ -198,18 +198,18 @@ func buildFLACHeader(sampleRate uint32, numChannels uint8, blockSize uint16) []b
 	copy(header, flacHeaderTemplate)
 
 	// Patch block sizes at offsets 0x08 and 0x0A (big-endian 16-bit)
-	header[0x08] = byte(blockSize >> 8)
-	header[0x09] = byte(blockSize)
-	header[0x0A] = byte(blockSize >> 8)
-	header[0x0B] = byte(blockSize)
+	header[0x08] = byte(blockSize >> 8 & 0xFF)
+	header[0x09] = byte(blockSize & 0xFF)
+	header[0x0A] = byte(blockSize >> 8 & 0xFF)
+	header[0x0B] = byte(blockSize & 0xFF)
 
 	// Patch sample rate, channels, bits at offset 0x12 (big-endian 24-bit)
 	// Format: (sample_rate << 4) | ((num_channels - 1) << 1) | (bits_per_sample - 1 >> 4)
 	// For 16-bit audio: bits_per_sample = 16, so (16-1) >> 4 = 0
 	val := (sampleRate << 4) | (uint32(numChannels-1) << 1)
-	header[0x12] = byte(val >> 16)
-	header[0x13] = byte(val >> 8)
-	header[0x14] = byte(val)
+	header[0x12] = byte(val >> 16 & 0xFF)
+	header[0x13] = byte(val >> 8 & 0xFF)
+	header[0x14] = byte(val & 0xFF)
 
 	return header
 }

chd/codec_lzma.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -142,7 +142,6 @@ func (*cdLZMACodec) DecompressCD(dst, src []byte, destLen, frames int) (int, err
 	// Extract compressed base length
 	var compLenBase int
 	if compLenBytes > 2 {
-		//nolint:gosec // G602: bounds checked via headerBytes = eccBytes + compLenBytes check above
 		compLenBase = int(src[eccBytes])<<16 | int(src[eccBytes+1])<<8 | int(src[eccBytes+2])
 	} else {
 		compLenBase = int(binary.BigEndian.Uint16(src[eccBytes : eccBytes+2]))

chd/codec_zlib.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -87,7 +87,6 @@ func (*cdZlibCodec) DecompressCD(dst, src []byte, destLen, frames int) (int, err
 	// Extract compressed base length
 	var compLenBase int
 	if compLenBytes > 2 {
-		//nolint:gosec // G602: bounds checked via headerBytes = eccBytes + compLenBytes check above
 		compLenBase = int(src[eccBytes])<<16 | int(src[eccBytes+1])<<8 | int(src[eccBytes+2])
 	} else {
 		compLenBase = int(binary.BigEndian.Uint16(src[eccBytes : eccBytes+2]))

chd/codec_zstd.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/errors.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/header.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/hunk.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

chd/metadata.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

cmd/dbgen/main.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

cmd/gameid/main.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

console.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

console_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

database.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

database_test.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.

gameid.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2025 Niema Moshiri and The Zaparoo Project.
+// Copyright (c) 2026 Niema Moshiri and The Zaparoo Project.
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 // This file is part of go-gameid.
@@ -22,6 +22,7 @@
 package gameid
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"strings"
@@ -137,12 +138,11 @@ func IdentifyWithConsole(path string, console Console, db *GameDatabase) (*Resul
 		return identifyFromDirectory(path, console, dbInterface)
 	}
 
-	// Check if this identifier needs the file path (disc-based games)
-	if pid, ok := id.(pathIdentifier); ok {
-		result, pathErr := pid.IdentifyFromPath(path, dbInterface)
-		if pathErr != nil {
-			return nil, fmt.Errorf("identify from path: %w", pathErr)
-		}
+	result, handled, pathErr := identifyFromPathIfSupported(id, path, dbInterface)
+	if pathErr != nil {
+		return nil, pathErr
+	}
+	if handled {
 		return result, nil
 	}
 
@@ -165,6 +165,28 @@ func IdentifyWithConsole(path string, console Console, db *GameDatabase) (*Resul
 	return result, nil
 }
 
+func identifyFromPathIfSupported(
+	ident identifier.Identifier,
+	path string,
+	database identifier.Database,
+) (result *Result, handled bool, err error) {
+	pid, ok := ident.(pathIdentifier)
+	if !ok {
+		return nil, false, nil
+	}
+
+	result, err = pid.IdentifyFromPath(path, database)
+	if err == nil {
+		return result, true, nil
+	}
+
+	var notSupported identifier.NotSupportedError
+	if errors.As(err, &notSupported) {
+		return nil, false, nil
+	}
+	return nil, false, fmt.Errorf("identify from path: %w", err)
+}
+
 // identifyFromDirectory identifies a game from a mounted disc directory.
 func identifyFromDirectory(path string, console Console, database identifier.Database) (*Result, error) {
 	id, ok := identifiers[console]
@@ -281,14 +303,15 @@ func IsCartridgeBased(console Console) bool {
 //
 //nolint:revive // Line length acceptable for function signature with ignored parameter
 func identifyFromBlockDevice(path string, _ Console, ident identifier.Identifier, database identifier.Database) (*Result, error) {
-	// For disc-based consoles, use IdentifyFromPath which handles block devices
-	if pid, ok := ident.(pathIdentifier); ok {
-		result, err := pid.IdentifyFromPath(path, database)
-		if err != nil {
-			return nil, fmt.Errorf("identify from path: %w", err)
-		}
+	// For disc-based consoles, use IdentifyFromPath which handles block devices.
+	result, handled, pathErr := identifyFromPathIfSupported(ident, path, database)
+	if pathErr != nil {
+		return nil, pathErr
+	}
+	if handled {
 		return result, nil
 	}
+	// Fall through to raw block device reading when path identification is unsupported.
 
 	// Open block device directly
 	blockDev, err := os.Open(path) //nolint:gosec // Path from user input is expected for block device
@@ -302,11 +325,11 @@ func identifyFromBlockDevice(path string, _ Console, ident identifier.Identifier
 	// Most identifiers only need the first few KB
 	size := int64(700 * 1024 * 1024) // 700MB typical CD size
 
-	result, err := ident.Identify(blockDev, size, database)
+	identified, err := ident.Identify(blockDev, size, database)
 	if err != nil {
 		return nil, fmt.Errorf("identify: %w", err)
 	}
-	return result, nil
+	return identified, nil
 }
 
 // identifyFromArchive identifies a game file inside an archive.