mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/gamepaddb: refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2022-07-29 12:17:55 +09:00
parent bacb630c5b
commit 3eeb401d22
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/gamepaddb/gamepaddb.go
View File

@ -26,7 +26,6 @@ import (
"bufio"
"bytes"
"fmt"
"io"
"runtime"
"strconv"
"strings"
@ -513,7 +512,7 @@ func Update(mappingData []byte) error {
defer mappingsM.Unlock()
buf := bytes.NewBuffer(mappingData)
r := bufio.NewReader(buf)
s := bufio.NewScanner(buf)
type parsedLine struct {
id string
@ -523,15 +522,12 @@ func Update(mappingData []byte) error {
}
var lines []parsedLine
for {
line, err := r.ReadString('\n')
if err != nil && err != io.EOF {
for s.Scan() {
line := s.Text()
id, name, buttons, axes, err := parseLine(line, currentPlatform)
if err != nil {
return err
}
id, name, buttons, axes, err1 := parseLine(line, currentPlatform)
if err1 != nil {
return err1
}
if id != "" {
lines = append(lines, parsedLine{
id: id,
@ -540,9 +536,10 @@ func Update(mappingData []byte) error {
axes: axes,
})
}
if err == io.EOF {
break
}
}
if err := s.Err(); err != nil {
return err
}
for _, l := range lines {