diff --git a/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt b/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt index 0acb02d370..330265a0fd 100644 --- a/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt +++ b/app/src/main/java/com/droiddeck/launcher/frontend/DependencyDetector.kt @@ -76,7 +76,7 @@ object DependencyDetector { fun consider(f: File, isDir: Boolean, insideRedist: Boolean) { val name = f.name.lowercase(Locale.US) - val path = f.path.replace('\\', '/').lowercase(Locale.US) + val path = relativeReason(gameDir, f).lowercase(Locale.US) val kind = if (insideRedist || isDir || name.endsWith(".exe") || name.endsWith(".msi") || name.endsWith(".cab")) Kind.BUNDLED else Kind.SHIPPED for (comp in classify(path, name, isDir)) { diff --git a/app/src/test/java/com/droiddeck/launcher/frontend/DependencyDetectorTest.kt b/app/src/test/java/com/droiddeck/launcher/frontend/DependencyDetectorTest.kt new file mode 100644 index 0000000000..b3d6acd582 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/frontend/DependencyDetectorTest.kt @@ -0,0 +1,18 @@ +package com.droiddeck.launcher.frontend + +import java.io.File +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.rules.TemporaryFolder + +class DependencyDetectorTest { + @get:Rule val tmp = TemporaryFolder() + + @Test fun foldersAboveTheGameDoNotChangeWhatIsFound() { + val folder = File(tmp.newFolder("Games 2005", "agility"), "Game") + File(folder, "_CommonRedist/vcredist/2013").mkdirs() + File(folder, "_CommonRedist/vcredist/2013/vcredist_x64.exe").writeText("x") + assertEquals(listOf("vcredist2013"), DependencyDetector.detect(folder).map { it.componentName }) + } +}