Dev Testing + AutoGen Activation
This commit is contained in:
@@ -32,6 +32,13 @@ type autogenManifestEntry struct {
|
||||
RowID int `json:"row_id,omitempty"`
|
||||
}
|
||||
|
||||
type ProducedAutogenManifest struct {
|
||||
ID string
|
||||
AssetName string
|
||||
OutputPath string
|
||||
Payload []byte
|
||||
}
|
||||
|
||||
func applyAutogenConsumers(p *project.Project, collected []nativeCollectedDataset, progress func(string)) ([]nativeCollectedDataset, error) {
|
||||
if len(p.Config.Autogen.Consumers) == 0 {
|
||||
return collected, nil
|
||||
@@ -152,6 +159,10 @@ func resolveAutogenLocalOverrideRoot(p *project.Project, consumer project.Autoge
|
||||
|
||||
func scanLocalAutogenEntries(overrideRoot string, consumer project.AutogenConsumerConfig) ([]autogenManifestEntry, error) {
|
||||
scanRoot := filepath.Join(overrideRoot, consumer.Root)
|
||||
return scanConfiguredAutogenEntries(scanRoot, consumer.Include, consumer.Derive)
|
||||
}
|
||||
|
||||
func scanConfiguredAutogenEntries(scanRoot string, include []string, derive project.AutogenDeriveConfig) ([]autogenManifestEntry, error) {
|
||||
info, err := os.Stat(scanRoot)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
@@ -176,10 +187,10 @@ func scanLocalAutogenEntries(overrideRoot string, consumer project.AutogenConsum
|
||||
return err
|
||||
}
|
||||
rel = filepath.ToSlash(rel)
|
||||
if !matchesAutogenInclude(rel, consumer.Include) {
|
||||
if !matchesAutogenInclude(rel, include) {
|
||||
return nil
|
||||
}
|
||||
entry, ok := deriveAutogenManifestEntry(rel, consumer.Derive)
|
||||
entry, ok := deriveAutogenManifestEntry(rel, derive)
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
@@ -196,6 +207,61 @@ func scanLocalAutogenEntries(overrideRoot string, consumer project.AutogenConsum
|
||||
return entries, nil
|
||||
}
|
||||
|
||||
func ProduceAutogenManifests(p *project.Project) ([]ProducedAutogenManifest, error) {
|
||||
if len(p.Config.Autogen.Producers) == 0 {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
assetsRoot := strings.TrimSpace(p.AssetsDir())
|
||||
if assetsRoot == "" {
|
||||
return nil, fmt.Errorf("autogen producers require paths.assets to be configured")
|
||||
}
|
||||
info, err := os.Stat(assetsRoot)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("stat assets root %s: %w", assetsRoot, err)
|
||||
}
|
||||
if !info.IsDir() {
|
||||
return nil, fmt.Errorf("assets root %s is not a directory", assetsRoot)
|
||||
}
|
||||
|
||||
repo, ref := autogenManifestSourceMetadata(p.Root)
|
||||
results := make([]ProducedAutogenManifest, 0, len(p.Config.Autogen.Producers))
|
||||
for _, producer := range p.Config.Autogen.Producers {
|
||||
scanRoot := filepath.Join(assetsRoot, producer.Root)
|
||||
entries, err := scanConfiguredAutogenEntries(scanRoot, producer.Include, producer.Derive)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("scan autogen producer %s: %w", producer.ID, err)
|
||||
}
|
||||
if len(entries) == 0 {
|
||||
return nil, fmt.Errorf("autogen producer %s discovered no matching entries under %s", producer.ID, scanRoot)
|
||||
}
|
||||
payload, err := formatAutogenManifest(p.Root, producer, repo, ref, entries)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("format autogen producer %s manifest: %w", producer.ID, err)
|
||||
}
|
||||
payload = append(payload, '\n')
|
||||
results = append(results, ProducedAutogenManifest{
|
||||
ID: producer.ID,
|
||||
AssetName: producer.Manifest.AssetName,
|
||||
OutputPath: filepath.Join(p.BuildDir(), producer.Manifest.AssetName),
|
||||
Payload: payload,
|
||||
})
|
||||
}
|
||||
return results, nil
|
||||
}
|
||||
|
||||
func autogenManifestSourceMetadata(root string) (repo string, ref string) {
|
||||
if remote, err := gitOutput(root, "remote", "get-url", "origin"); err == nil {
|
||||
if spec, ok := parseRepoSpec(strings.TrimSpace(remote)); ok {
|
||||
repo = spec.Owner + "/" + spec.Repo
|
||||
}
|
||||
}
|
||||
if head, err := gitOutput(root, "rev-parse", "HEAD"); err == nil {
|
||||
ref = strings.TrimSpace(head)
|
||||
}
|
||||
return repo, ref
|
||||
}
|
||||
|
||||
func matchesAutogenInclude(rel string, include []string) bool {
|
||||
rel = filepath.ToSlash(rel)
|
||||
for _, pattern := range include {
|
||||
|
||||
@@ -9189,6 +9189,118 @@ func TestBuildNativeWithReleasedPartsManifest(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildNativeWithReleasedHeadVisualeffectsManifest(t *testing.T) {
|
||||
root := t.TempDir()
|
||||
projRoot := filepath.Join(root, "project")
|
||||
mkdirAll(t, filepath.Join(projRoot, "src"))
|
||||
mkdirAll(t, filepath.Join(projRoot, "assets"))
|
||||
mkdirAll(t, filepath.Join(projRoot, "build"))
|
||||
mkdirAll(t, filepath.Join(projRoot, "topdata", "data", "visualeffects"))
|
||||
writeFile(t, filepath.Join(projRoot, "topdata", "base_dialog.json"), "{}\n")
|
||||
writeFile(t, filepath.Join(projRoot, "topdata", "data", "visualeffects", "base.json"), `{
|
||||
"output": "visualeffects.2da",
|
||||
"columns": ["Label", "Type_FD", "OrientWithGround", "Imp_HeadCon_Node", "OrientWithObject"],
|
||||
"rows": [
|
||||
{"key": "visualeffects:existing", "id": 17, "Label": "EXISTING", "Type_FD": "F", "OrientWithGround": "0", "Imp_HeadCon_Node": "****", "OrientWithObject": "0"}
|
||||
]
|
||||
}`+"\n")
|
||||
writeFile(t, filepath.Join(projRoot, "topdata", "data", "visualeffects", "lock.json"), `{
|
||||
"visualeffects:existing": 17
|
||||
}`+"\n")
|
||||
mkdirAll(t, filepath.Join(projRoot, "reference"))
|
||||
writeFile(t, filepath.Join(projRoot, "reference", "build.py"), "print('ok')\n")
|
||||
|
||||
manifestJSON := `{
|
||||
"id": "head_visualeffects",
|
||||
"repo": "ShadowsOverWestgate/sow-assets",
|
||||
"ref": "test-manifest",
|
||||
"generated_at": "2026-04-25T00:00:00Z",
|
||||
"entries": [
|
||||
{
|
||||
"group": "head_accessories",
|
||||
"model_stem": "hfx_bandana",
|
||||
"source": "head_accessories/hfx_bandana.mdl"
|
||||
},
|
||||
{
|
||||
"group": "head_features",
|
||||
"model_stem": "hfx_hair_bangs",
|
||||
"source": "head_features/hair/hfx_hair_bangs.mdl"
|
||||
}
|
||||
]
|
||||
}` + "\n"
|
||||
|
||||
var server *httptest.Server
|
||||
server = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
switch r.URL.Path {
|
||||
case "/api/v1/repos/ShadowsOverWestgate/sow-assets/releases/tags/head-vfx-manifest-current":
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_, _ = w.Write([]byte(`{"assets":[{"name":"sow-head-vfx-manifest.json","browser_download_url":"` + server.URL + `/downloads/sow-head-vfx-manifest.json"}]}`))
|
||||
case "/downloads/sow-head-vfx-manifest.json":
|
||||
w.Header().Set("Content-Type", "application/json")
|
||||
_, _ = w.Write([]byte(manifestJSON))
|
||||
default:
|
||||
http.NotFound(w, r)
|
||||
}
|
||||
}))
|
||||
defer server.Close()
|
||||
|
||||
runGitTest(t, "", "init", "-b", "main", projRoot)
|
||||
runGitTest(t, projRoot, "remote", "add", "origin", server.URL+"/ShadowsOverWestgate/sow-module.git")
|
||||
|
||||
proj := &project.Project{
|
||||
Root: projRoot,
|
||||
Config: project.Config{
|
||||
Module: project.ModuleConfig{Name: "Test", ResRef: "test"},
|
||||
Paths: project.PathConfig{Source: "src", Assets: "assets", Build: "build"},
|
||||
TopData: project.TopDataConfig{
|
||||
Source: "topdata",
|
||||
Build: "build/topdata",
|
||||
},
|
||||
Autogen: project.AutogenConfig{
|
||||
Consumers: []project.AutogenConsumerConfig{
|
||||
{
|
||||
ID: "head_visualeffects",
|
||||
Producer: "head_visualeffects",
|
||||
Dataset: "visualeffects",
|
||||
Mode: "head_visualeffects",
|
||||
Root: "vfxs",
|
||||
Include: []string{"head_accessories/**/*.mdl", "head_features/**/*.mdl"},
|
||||
Derive: project.AutogenDeriveConfig{
|
||||
Kind: "model_stem",
|
||||
GroupFrom: "first_path_segment",
|
||||
},
|
||||
Manifest: project.AutogenManifestConfig{
|
||||
ReleaseTag: "head-vfx-manifest-current",
|
||||
AssetName: "sow-head-vfx-manifest.json",
|
||||
CacheName: "sow-head-vfx-manifest.json",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
result, err := BuildNative(proj, nil)
|
||||
if err != nil {
|
||||
t.Fatalf("BuildNative failed: %v", err)
|
||||
}
|
||||
|
||||
visualeffectsBytes, err := os.ReadFile(filepath.Join(result.Output2DADir, "visualeffects.2da"))
|
||||
if err != nil {
|
||||
t.Fatalf("read visualeffects.2da: %v", err)
|
||||
}
|
||||
text := string(visualeffectsBytes)
|
||||
for _, want := range []string{
|
||||
"0\theadaccessory_BANDANA\tD\t0\thfx_bandana\t1",
|
||||
"1\theadfeature_HAIR_BANGS\tD\t0\thfx_hair_bangs\t1",
|
||||
"17\tEXISTING\tF\t0\t****\t0",
|
||||
} {
|
||||
if !strings.Contains(text, want) {
|
||||
t.Fatalf("expected visualeffects output to contain %q, got:\n%s", want, text)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildNativeRejectsGitRepoTopDataAssetsOverride(t *testing.T) {
|
||||
root := testProjectRoot(t)
|
||||
mkdirAll(t, filepath.Join(root, "topdata", "data", "parts"))
|
||||
|
||||
Reference in New Issue
Block a user