Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-11-26 22:40:33 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Support Single BIN CUE Files (#1127)

Browse Source 
In CUE files `FILE` is a stateful, global declaration that applies to
all following `TRACK`s. `sotn-disk` was treating `FILE` declarations as
`TRACK` delimiters which would result in incorrect parsing of CUE files
with a single `FILE`, but multiple tracks.

Now when reading a `FILE` declaration, the path is stored and processing
continues. A `TRACK` declaration will use the previously defined path,
and if a previous track had been started, append that previous track to
the list.

This also builds `sotn-disk` using the local repository instead of
pulling the latest commit from GitHub. The target depends on `sotn-disk`
sources and will rebuild as necessary (or with `make
~/go/bin/sotn-disk`).

As an aside,
[pull/232](https://github.com/Xeeynamo/sotn-decomp/pull/232) ran into
this same error, but fixes in a slightly different way that leaves side
effects that may make supporting things like `INDEX` (for extracting the
placeholder audio, for example) more error prone in the future.

Co-authored-by: Jonathan Hohle <jon@ttkb.co>
This commit is contained in:
Jonathan Hohle 2024-05-14 11:59:56 -07:00 committed by GitHub
parent 11dac7d321
commit 20a1fb6998
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -105,6 +105,8 @@ define link
-T $(CONFIG_DIR)/undefined_funcs_auto.$(VERSION).$(1).txt
endef
SOTNDISK_SOURCES := $(shell find tools/sotn-disk -name '*.go')
.PHONY: build
all: build check
@ -421,8 +423,8 @@ $(GO):
curl -L -o go1.19.7.linux-amd64.tar.gz https://go.dev/dl/go1.19.7.linux-amd64.tar.gz
tar -C $(HOME) -xzf go1.19.7.linux-amd64.tar.gz
rm go1.19.7.linux-amd64.tar.gz
$(SOTNDISK): $(GO)
$(GO) install github.com/xeeynamo/sotn-decomp/tools/sotn-disk@latest
$(SOTNDISK): $(GO) $(SOTNDISK_SOURCES)
cd tools/sotn-disk; $(GO) install
$(BUILD_DIR)/%.s.o: %.s
$(AS) $(AS_FLAGS) -o $@ $<

15
tools/sotn-disk/cue.go
View File

@ -35,7 +35,7 @@ func performCueAction(cuePath string, action imageAction) error {
case "MODE2/2352":
mode = iso9660.TrackMode2_2352
default:
return fmt.Errorf("unrecognized TRACK mode '%s'", mode)
return fmt.Errorf("unrecognized TRACK mode '%s'", mainTrack.mode)
}
baseDir, _ := path.Split(cuePath)
@ -75,6 +75,7 @@ func parseTracks(cuePath string) ([]cueTrack, error) {
lines := strings.Split(string(content), "\n")
tracks := make([]cueTrack, 0)
var file = ""
var track *cueTrack = nil
for _, line := range lines {
tokens := tokenizeCueLine(line)
@ -84,6 +85,11 @@ func parseTracks(cuePath string) ([]cueTrack, error) {
switch tokens[0] {
case "FILE":
if len(tokens) < 3 {
return nil, fmt.Errorf("cue line '%s' invalid", line)
}
file = tokens[1]
case "TRACK":
if len(tokens) < 3 {
return nil, fmt.Errorf("cue line '%s' invalid", line)
}
@ -92,12 +98,7 @@ func parseTracks(cuePath string) ([]cueTrack, error) {
}
track = &cueTrack{}
track.file = tokens[1]
case "TRACK":
if len(tokens) < 3 {
return nil, fmt.Errorf("cue line '%s' invalid", line)
}
track.file = file
track.id = tokens[1]
track.mode = tokens[2]
}