Reorganize structure

xypwn · Apr 27, 2024 · bc147e2 · bc147e2
1 parent fbf07c2
commit bc147e2
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 49,075 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -18,6 +18,7 @@ jobs:
         goos: linux
         goarch: amd64
         ldflags: -s -w
+        project_path: "./cmd/filediver-cli"
         binary_name: "filediver"
         asset_name: "filediver-linux-amd64"
         extra_files: LICENSE README.md
@@ -36,6 +37,7 @@ jobs:
         goos: windows
         goarch: amd64
         ldflags: -s -w
+        project_path: "./cmd/filediver-cli"
         binary_name: "filediver"
         asset_name: "filediver-windows-amd64"
         extra_files: LICENSE README.md ffmpeg.exe
diff --git a/README.md b/README.md
@@ -82,6 +82,10 @@ This app builds on a lot of work from other people. This includes:
 
 Some useful discussion on the topic of HD2 resource extraction: https://reshax.com/topic/507-helldivers-2-model-extraction-help/
 
+## Hacking
+- Install [Go](https://go.dev/dl/)
+- `go run ./cmd/filediver-cli`
+
 ## License
 Copyright (c) Darwin Schuppan
 

diff --git a/main.go → cmd/filediver-cli/main.go b/main.go → cmd/filediver-cli/main.go
@@ -14,12 +14,10 @@ import (
 
 	"github.com/xypwn/filediver/app"
 	"github.com/xypwn/filediver/exec"
+	"github.com/xypwn/filediver/hashes"
 	"github.com/xypwn/filediver/stingray"
 )
 
-//go:embed hashes.txt
-var knownHashesStr string
-
 func main() {
 	prt := app.NewPrinter(
 		supportscolor.Stderr().SupportsColor,
@@ -102,7 +100,7 @@ extractor config:
 	}
 
 	if *knownHashesPath == "" {
-		a.AddHashesFromString(knownHashesStr)
+		a.AddHashesFromString(hashes.Hashes)
 	} else {
 		if err := a.AddHashesFromFile(*knownHashesPath); err != nil {
 			prt.Fatalf("%v", err)

diff --git a/hash_tool/README.md → cmd/hash-tool/README.md b/hash_tool/README.md → cmd/hash-tool/README.md
diff --git a/hash_tool/main.go → cmd/hash-tool/main.go b/hash_tool/main.go → cmd/hash-tool/main.go
diff --git a/wordlist_10k_plus.txt → cmd/hash-tool/wordlist_10k_plus.txt b/wordlist_10k_plus.txt → cmd/hash-tool/wordlist_10k_plus.txt
diff --git a/wordlist_material_texture_small.txt → ...-tool/wordlist_material_texture_small.txt b/wordlist_material_texture_small.txt → ...-tool/wordlist_material_texture_small.txt