niklas/opl-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use propper logger

Browse Source
This commit is contained in:
Niklas Kapelle
2026-01-09 17:44:45 +01:00
parent 42a1080981
commit d3c277eb7f
5 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
internal/art.go
View File

@@ -3,6 +3,7 @@ package oplcli
import (
"fmt"
"io"
"log/slog"
"net/http"
"os"
"path"
@@ -38,12 +39,21 @@ func getArtUrlForGameFromGithub(gameID string) artUrls {
}
}
func downloadArtForGame(gameID string, targetDir string) error {
func downloadArtForGame(gameID string, targetDir string) {
urls := getArtUrlForGameFromGithub(gameID)
dl := func(url, kind string) (bool, error) {
return downloadFile(url, path.Join(targetDir, fmt.Sprintf("%s_%s.png", gameID, kind)))
totalDownloads := 0
dl := func(url, kind string) {
file := path.Join(targetDir, fmt.Sprintf("%s_%s.png", gameID, kind))
found, err := downloadFile(url, file)
if err != nil {
slog.Warn("Failed to download art file", "gameID", gameID, "url", url)
}
if found {
slog.Debug("Downloaded art file", "gameID", gameID, "kind", kind, "target", file)
totalDownloads++
}
}
dl(urls.cover, "COV")
@@ -54,7 +64,11 @@ func downloadArtForGame(gameID string, targetDir string) error {
dl(urls.screenshot2, "SRC2")
dl(urls.spine, "LAB")
return nil
if totalDownloads == 0 {
slog.Error("No art files found", "gameID", gameID)
} else {
slog.Info("Finished downloading art files", "gameID", gameID, "total", totalDownloads)
}
}
func downloadFile(url, target string) (bool, error) {

4
internal/cfg.go
View File

@@ -3,6 +3,7 @@ package oplcli
import (
"fmt"
"io"
"log/slog"
"net/http"
"os"
"path"
@@ -23,18 +24,21 @@ func downloadCfgForGame(gameID string, output string, mode FileMode) error {
file, err := openFileBasedOnMode(filePath, mode)
if err != nil {
slog.Error("Failed to open cfg file", "file", filePath, "gameID", gameID, "err", err)
return err
}
defer file.Close()
resp, err := http.Get(url)
if err != nil {
slog.Error("Failed to download cfg file", "file", filePath, "gameID", gameID, "err", err)
return err
}
defer resp.Body.Close()
_, err = io.Copy(file, resp.Body)
if err != nil {
slog.Error("Failed to write cfg file", "file", filePath, "gameID", gameID, "err", err)
return err
}

8
internal/gamefile.go
View File

@@ -2,6 +2,7 @@ package oplcli
import (
"fmt"
"log/slog"
"os"
"path/filepath"
"regexp"
@@ -11,7 +12,8 @@ import (
func scanGameFileForID(filename string) (string, error) {
file, err := os.Open(filename)
if err != nil {
return "", fmt.Errorf("failed to open file: %w", err)
slog.Error("Failed to open file", "file", filename, "err", err)
return "", err
}
defer file.Close()
@@ -20,11 +22,13 @@ func scanGameFileForID(filename string) (string, error) {
n, err := file.Read(buffer)
if err != nil && n == 0 {
return "", fmt.Errorf("failed to read file: %w", err)
slog.Error("Failed to read file", "file", file, "err", err)
return "", err
}
id, found := scanBufferForID(buffer[:n])
if !found {
slog.Error("No PS2 ID found in the file", "file", file)
return "", fmt.Errorf("no PS2 game ID found in file")
}

6
internal/gamelist.go
View File

@@ -3,6 +3,7 @@ package oplcli
import (
"bufio"
"fmt"
"log/slog"
"os"
"strings"
)
@@ -16,15 +17,16 @@ func loadGamelist(filepath string) (map[string]string, error) {
gameList := make(map[string]string)
lineNum := 0
scanner := bufio.NewScanner(file)
for scanner.Scan() {
line := scanner.Text()
lineNum++
substrings := strings.SplitN(line, " ", 2)
if len(substrings) != 2 {
// TODO: something in the gamelist file is not formatted right
fmt.Printf("Malformed: %s\n", line)
slog.Warn("Line in gamelist is malformed", "line", lineNum)
continue
}

38
internal/oplcli.go
View File

@@ -1,7 +1,7 @@
package oplcli
import (
"fmt"
"log/slog"
"os"
)
@@ -12,67 +12,67 @@ type Config struct {
func Scan(files []string, config Config) {
gameList, err := loadGamelist(config.GameListLocation)
if err != nil {
fmt.Printf("Failed to load game list: %v", err)
slog.Error("Failed to load game list", "file", config.GameListLocation)
os.Exit(1)
}
for _, file := range files {
fmt.Printf("Scanning file: %s\n", file)
slog.Info("Scanning file", "file", file)
gameID, err := scanGameFileForID(file)
if err != nil {
fmt.Printf("Failed to scan game file: %s", err)
slog.Error("Failed to scan game file", "file", file)
os.Exit(1)
}
fmt.Printf("Found game ID: %s\n", gameID)
slog.Info("Found game ID", "id", gameID)
gameName := gameList[gameID]
fmt.Printf("Found game name: %s\n", gameName)
slog.Info("Found game name", "name", gameName)
}
}
func Rename(files []string, config Config) {
gameList, err := loadGamelist(config.GameListLocation)
if err != nil {
fmt.Printf("Failed to load game list: %v", err)
slog.Error("Failed to load game list", "file", config.GameListLocation)
os.Exit(1)
}
for _, file := range files {
fmt.Printf("Scanning file: %s\n", file)
slog.Info("Scanning file", "file", file)
gameID, err := scanGameFileForID(file)
if err != nil {
fmt.Printf("Failed to scan game file: %s", err)
slog.Error("Failed to scan game file", "file", file)
os.Exit(1)
}
fmt.Printf("Found game ID: %s\n", gameID)
slog.Info("Found game ID", "id", gameID)
gameName := gameList[gameID]
fmt.Printf("Found game name: %s\n", gameName)
slog.Info("Found game name", "name", gameName)
newPath, err := renameGameFile(file, gameName)
if err != nil {
fmt.Printf("Failed to rename file: %v", err)
slog.Error("Failed to reanme file", "file", file, "gameName", gameName, "err", err)
os.Exit(1)
}
fmt.Printf("Renamed %s to %s", file, newPath)
slog.Info("Renamed file", "file", file, "to", newPath)
}
}
func DownloadGameArt(files []string, output string, config Config) {
for _, file := range files {
fmt.Printf("Scanning file: %s\n", file)
slog.Info("Scanning file", "file", file)
gameID, err := scanGameFileForID(file)
if err != nil {
fmt.Printf("Failed to scan game file: %s", err)
slog.Error("Failed to scan game file", "file", file)
os.Exit(1)
}
fmt.Printf("Found game ID: %s\n", gameID)
slog.Info("Found game ID", "id", gameID)
downloadArtForGame(gameID, output)
}
@@ -80,15 +80,15 @@ func DownloadGameArt(files []string, output string, config Config) {
func DownloadCfg(files []string, output string, mode FileMode, config Config) {
for _, file := range files {
fmt.Printf("Scanning file: %s\n", file)
slog.Info("Scanning file", "file", file)
gameID, err := scanGameFileForID(file)
if err != nil {
fmt.Printf("Failed to scan game file: %s", err)
slog.Error("Failed to scan game file", "file", file)
os.Exit(1)
}
fmt.Printf("Found game ID: %s\n", gameID)
slog.Info("Found game ID", "id", gameID)
downloadCfgForGame(gameID, output, mode)
}