Assets are listed from relative asset dir

PurpleKingdomGames · Sep 22, 2023 · 80fd6bb · 80fd6bb
1 parent e40e801
commit 80fd6bb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/indigo-plugin/indigo-plugin/src/indigoplugin/IndigoAssets.scala b/indigo-plugin/indigo-plugin/src/indigoplugin/IndigoAssets.scala
@@ -73,7 +73,7 @@ final case class IndigoAssets(
   def listAssetFiles(baseDirectory: os.Path): List[os.RelPath] =
     filesToCopy(baseDirectory)
       .filterNot(os.isDir)
-      .map(_.relativeTo(baseDirectory))
+      .map(_.relativeTo(baseDirectory / gameAssetsDirectory / os.RelPath.up))
   def listAssetFiles: List[os.RelPath] =
     listAssetFiles(os.pwd)
 

diff --git a/indigo-plugin/indigo-plugin/test/src/indigoplugin/core/AcceptanceTests.scala b/indigo-plugin/indigo-plugin/test/src/indigoplugin/core/AcceptanceTests.scala
@@ -71,6 +71,23 @@ class AcceptanceTests extends munit.FunSuite {
     assert(clue(expected).forall(clue(actual).contains))
   }
 
+  test("List all asset files as relative paths - sub dir") {
+    val actual: List[os.RelPath] =
+      indigoAssets
+        .withAssetDirectory(sourceDir / "mixed")
+        .listAssetFiles
+
+    val expected: List[os.RelPath] =
+      List(
+        os.RelPath.rel / "mixed" / "ignored-file.txt",
+        os.RelPath.rel / "mixed" / "also-taken.txt",
+        os.RelPath.rel / "mixed" / "taken.txt"
+      )
+
+    assertEquals(actual.length, expected.length)
+    assert(clue(expected).forall(clue(actual).contains))
+  }
+
   test("Copy assets and assert expected output files") {
     val baseDirectory = os.pwd