mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-20 05:16:01 +00:00
feat: Add Soundtracks tab and music player (#2389)
This commit is contained in:
1 parent
33dbd8755f
commit
d33f4b4896
78 files changed
+5618
-64
No files matched your search
@@ -0,0 +1,43 @@
|
||||
package com.droiddeck.launcher.frontend
|
||||
|
||||
import com.droiddeck.launcher.frontend.SoundtrackCollections.Collection
|
||||
import com.droiddeck.launcher.frontend.SoundtrackCollections.TrackRef
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@Config(sdk = [33])
|
||||
class SoundtrackCollectionsTest {
|
||||
private fun ref(path: String) = TrackRef(path, path, "", "", 0)
|
||||
|
||||
@Test fun toggledAddsThenRemoves() {
|
||||
val once = SoundtrackCollections.toggled(emptyList(), ref("a"))
|
||||
assertEquals(listOf("a"), once.map { it.path })
|
||||
assertTrue(SoundtrackCollections.toggled(once, ref("a")).isEmpty())
|
||||
}
|
||||
|
||||
@Test fun mergedSkipsDuplicatesAndKeepsOrder() {
|
||||
val result = SoundtrackCollections.merged(listOf(ref("a"), ref("b")), listOf(ref("b"), ref("c"), ref("c")))
|
||||
assertEquals(listOf("a", "b", "c"), result.map { it.path })
|
||||
}
|
||||
|
||||
@Test fun cleanNameTrimsAndCollapsesSpaces() = assertEquals("My mix", SoundtrackCollections.cleanName(" My mix "))
|
||||
|
||||
@Test fun nameTakenIgnoresCaseAndExcludedId() {
|
||||
val list = listOf(Collection(2_000_000_001, "Chill", emptyList()))
|
||||
assertTrue(SoundtrackCollections.nameTaken(list, "chill"))
|
||||
assertFalse(SoundtrackCollections.nameTaken(list, "chill", except = 2_000_000_001))
|
||||
assertFalse(SoundtrackCollections.nameTaken(list, "Focus"))
|
||||
}
|
||||
|
||||
@Test fun nextIdStartsAboveFavoritesAndGrows() {
|
||||
assertEquals(SoundtrackCollections.FAVORITES_ID + 1, SoundtrackCollections.nextId(emptyList()))
|
||||
val list = listOf(Collection(2_000_000_005, "x", emptyList()))
|
||||
assertEquals(2_000_000_006, SoundtrackCollections.nextId(list))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.droiddeck.launcher.frontend
|
||||
|
||||
import java.io.File
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class SoundtrackOrderTest {
|
||||
private fun track(name: String, disc: Int, number: Int) = Soundtrack.Track(File("/music/$name"), name, disc, number, 1000L)
|
||||
|
||||
@Test fun savedOrderIsAppliedAndRenumbered() {
|
||||
val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2), track("c", 1, 3)))
|
||||
val result = SoundtrackOrder.ordered(disc, listOf("/music/c", "/music/a", "/music/b"))
|
||||
assertEquals(listOf("c", "a", "b"), result.getValue(1).map { it.title })
|
||||
assertEquals(listOf(1, 2, 3), result.getValue(1).map { it.number })
|
||||
}
|
||||
|
||||
@Test fun unknownTracksKeepTheirOrderAfterKnownOnes() {
|
||||
val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2), track("c", 1, 3)))
|
||||
val result = SoundtrackOrder.ordered(disc, listOf("/music/c"))
|
||||
assertEquals(listOf("c", "a", "b"), result.getValue(1).map { it.title })
|
||||
}
|
||||
|
||||
@Test fun discsStayApart() {
|
||||
val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2)), 2 to listOf(track("c", 2, 1), track("d", 2, 2)))
|
||||
val result = SoundtrackOrder.ordered(disc, listOf("/music/d", "/music/b", "/music/a", "/music/c"))
|
||||
assertEquals(listOf("b", "a"), result.getValue(1).map { it.title })
|
||||
assertEquals(listOf("d", "c"), result.getValue(2).map { it.title })
|
||||
}
|
||||
|
||||
@Test fun emptyOrderChangesNothing() {
|
||||
val disc = mapOf(1 to listOf(track("a", 1, 1), track("b", 1, 2)))
|
||||
assertEquals(disc, SoundtrackOrder.ordered(disc, emptyList()))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,151 @@
|
||||
package com.droiddeck.launcher.frontend
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
import java.io.File
|
||||
|
||||
class SoundtrackTest {
|
||||
private fun raw(
|
||||
folder: String, name: String, disc: Int? = null, track: Int? = null, title: String? = null, size: Long = 1000L,
|
||||
) = Soundtrack.Raw(File("/music/album/${if (folder.isEmpty()) "" else "$folder/"}$name"), folder, disc, track, title, null, 60_000L, size)
|
||||
|
||||
@Test fun titlesDropArtistAlbumAndNumber() {
|
||||
assertEquals("Once Upon a Time", Soundtrack.cleanTitle("toby fox - UNDERTALE Soundtrack - 01 Once Upon a Time.mp3"))
|
||||
assertEquals("ANOTHER HIM", Soundtrack.cleanTitle("001 ANOTHER HIM.flac"))
|
||||
assertEquals("Chapter 5 Logo", Soundtrack.cleanTitle("166 Chapter 5 Logo.mp3"))
|
||||
assertEquals("Query-", Soundtrack.cleanTitle("094 Query-.mp3"))
|
||||
assertEquals("Ruins", Soundtrack.cleanTitle("Ruins.ogg"))
|
||||
}
|
||||
|
||||
@Test fun flatAlbumIsOneDiscOrderedByNumber() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(raw("", "toby fox - X - 10 Ten.mp3"), raw("", "toby fox - X - 02 Two.mp3"), raw("", "toby fox - X - 01 One.mp3")),
|
||||
)
|
||||
assertEquals(listOf(0), disc.keys.toList())
|
||||
assertEquals(listOf("One", "Two", "Ten"), disc.getValue(0).map { it.title })
|
||||
assertEquals(listOf(1, 2, 3), disc.getValue(0).map { it.number })
|
||||
}
|
||||
|
||||
@Test fun subfoldersBecomeDiscs() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(raw("2", "041 B.mp3"), raw("1", "001 A.mp3"), raw("10", "200 C.mp3"), raw("1", "002 A2.mp3")),
|
||||
)
|
||||
assertEquals(listOf(1, 2, 3), disc.keys.toList())
|
||||
assertEquals(listOf("A", "A2"), disc.getValue(1).map { it.title })
|
||||
assertEquals(listOf("B"), disc.getValue(2).map { it.title })
|
||||
assertEquals(listOf("C"), disc.getValue(3).map { it.title })
|
||||
}
|
||||
|
||||
@Test fun losslessCopyReplacesLossyDuplicateAndKeepsItsFolder() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(
|
||||
raw("", "001 ANOTHER HIM.flac", size = 4_130_000L),
|
||||
raw("", "002 Beginning.flac", size = 4_870_000L),
|
||||
raw("1", "001 ANOTHER HIM.mp3", size = 1_940_000L),
|
||||
raw("1", "002 Beginning.mp3", size = 2_320_000L),
|
||||
raw("2", "041 Faint Glow.mp3"),
|
||||
),
|
||||
)
|
||||
assertEquals(listOf(1, 2), disc.keys.toList())
|
||||
assertEquals(listOf("flac", "flac"), disc.getValue(1).map { it.file.extension })
|
||||
assertEquals(listOf("ANOTHER HIM", "Beginning"), disc.getValue(1).map { it.title })
|
||||
assertEquals(listOf("Faint Glow"), disc.getValue(2).map { it.title })
|
||||
}
|
||||
|
||||
@Test fun tagsDecideDiscsAndFileNamesDecideOrder() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(
|
||||
raw("3+4", "088 Late.mp3", disc = 4, track = 1, title = "Old wooden rafters"),
|
||||
raw("3+4", "001 Early.mp3", disc = 3, track = 2, title = "Second"),
|
||||
raw("3+4", "002 Early.mp3", disc = 3, track = 1, title = "First"),
|
||||
),
|
||||
)
|
||||
assertEquals(listOf(3, 4), disc.keys.toList())
|
||||
assertEquals(listOf("Second", "First"), disc.getValue(3).map { it.title })
|
||||
assertEquals("Old wooden rafters", disc.getValue(4).single().title)
|
||||
}
|
||||
|
||||
@Test fun sameTagsCollapseDuplicates() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(
|
||||
raw("", "a.flac", disc = 1, track = 1, title = "Song", size = 5000L),
|
||||
raw("1", "a.mp3", disc = 1, track = 1, title = "Song", size = 900L),
|
||||
),
|
||||
)
|
||||
assertEquals(1, disc.getValue(1).size)
|
||||
assertEquals("flac", disc.getValue(1).single().file.extension)
|
||||
}
|
||||
|
||||
@Test fun renamedPunctuationStillMatchesAcrossFormats() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(
|
||||
raw("", "094 Query?.flac", size = 5000L),
|
||||
raw("3+4", "094 Query-.mp3", size = 900L),
|
||||
raw("3+4", "095 Quiz!.mp3", size = 900L),
|
||||
),
|
||||
)
|
||||
assertEquals(2, disc.getValue(0).size + disc.filterKeys { it != 0 }.values.sumOf { it.size })
|
||||
assertEquals(listOf("flac", "mp3"), disc.values.flatten().map { it.file.extension })
|
||||
}
|
||||
|
||||
@Test fun sameTitleWithDifferentNumbersStaysSeparate() {
|
||||
val disc = Soundtrack.group(listOf(raw("", "01 Fanfare.mp3"), raw("", "07 Fanfare.mp3")))
|
||||
assertEquals(2, disc.values.flatten().size)
|
||||
}
|
||||
|
||||
@Test fun folderDiscsKeepTheirFolderNameAsLabel() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(raw("3+4", "088 A.mp3", track = 1), raw("3+4", "165 B.mp3", track = 78), raw("5", "166 C.mp3", track = 1), raw("Bonus", "300 D.mp3")),
|
||||
)
|
||||
assertEquals(listOf("3+4", "5", "3"), disc.values.map { it.first().discLabel }.let { it.take(2) + disc.getValue(3).first().discLabel })
|
||||
assertEquals(listOf("A", "B"), disc.getValue(1).map { it.title })
|
||||
}
|
||||
|
||||
@Test fun tagsFromTheDroppedDuplicateFillTheKeptOne() {
|
||||
val disc = Soundtrack.group(
|
||||
listOf(
|
||||
raw("", "165 Concert for you.flac", size = 90_000L),
|
||||
raw("3+4", "165 Concert for you.mp3", track = 78, title = "Concert for you", size = 98_000L),
|
||||
raw("", "088 Flashback (Excerpt).flac", size = 4_800_000L),
|
||||
raw("3+4", "088 Flashback (Excerpt).mp3", track = 1, title = "Flashback (Excerpt)", size = 1_280_000L),
|
||||
),
|
||||
)
|
||||
val tracks = disc.values.flatten()
|
||||
assertEquals(listOf("Flashback (Excerpt)", "Concert for you"), tracks.map { it.title })
|
||||
assertEquals(listOf("flac", "flac"), tracks.map { it.file.extension })
|
||||
}
|
||||
|
||||
@Test fun emptyInputGivesNothing() {
|
||||
assertTrue(Soundtrack.group(emptyList()).isEmpty())
|
||||
}
|
||||
|
||||
@Test fun lengthFormatting() {
|
||||
assertEquals("0:48", Soundtrack.formatLength(48_000L))
|
||||
assertEquals("1:20", Soundtrack.formatLength(80_000L))
|
||||
assertEquals("4:15:37", Soundtrack.formatLength((4 * 3600 + 15 * 60 + 37) * 1000L))
|
||||
}
|
||||
|
||||
@Test fun shortcutLinksRoundTrip() {
|
||||
assertEquals(391540, SoundtrackShortcuts.parse(SoundtrackShortcuts.uri(391540)))
|
||||
assertEquals(-5, SoundtrackShortcuts.parse(SoundtrackShortcuts.uri(-5)))
|
||||
assertNull(SoundtrackShortcuts.parse("droiddeck://game/12"))
|
||||
assertNull(SoundtrackShortcuts.parse(null))
|
||||
}
|
||||
|
||||
@Test fun addedSoundtracksNeverCollideWithSteamIds() {
|
||||
assertTrue(AddedSoundtracks.idOf("/storage/emulated/0/Music/Album") < 0)
|
||||
}
|
||||
|
||||
@Test fun addedIdsStayStableWhenAnotherFolderIsRemoved() {
|
||||
assertEquals("Aa".hashCode(), "BB".hashCode())
|
||||
val first = AddedSoundtracks.Entry("/m/Aa", "A")
|
||||
val second = AddedSoundtracks.Entry("/m/BB", "B")
|
||||
val assigned = AddedSoundtracks.assignIds(listOf(first, second))
|
||||
assertTrue(assigned[0].id != assigned[1].id)
|
||||
assertTrue(assigned.all { it.id < 0 })
|
||||
val after = AddedSoundtracks.assignIds(assigned.drop(1))
|
||||
assertEquals(assigned[1].id, after[0].id)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.droiddeck.launcher.frontend
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertFalse
|
||||
import org.junit.Assert.assertTrue
|
||||
import org.junit.Test
|
||||
|
||||
class SoundtrackTracksTest {
|
||||
private class T(val title: String, val ms: Long)
|
||||
private val items = listOf(T("banana", 300), T("Apple", 100), T("cherry", 200))
|
||||
private fun sorted(s: SoundtrackTracks.Sort) = SoundtrackTracks.sort(items, s, { it.title }, { it.ms }).map { it.title }
|
||||
|
||||
@Test fun defaultKeepsOrder() = assertEquals(listOf("banana", "Apple", "cherry"), sorted(SoundtrackTracks.Sort.DEFAULT))
|
||||
@Test fun titleAscIgnoresCase() = assertEquals(listOf("Apple", "banana", "cherry"), sorted(SoundtrackTracks.Sort.TITLE_ASC))
|
||||
@Test fun titleDesc() = assertEquals(listOf("cherry", "banana", "Apple"), sorted(SoundtrackTracks.Sort.TITLE_DESC))
|
||||
@Test fun longestFirst() = assertEquals(listOf("banana", "cherry", "Apple"), sorted(SoundtrackTracks.Sort.LONGEST))
|
||||
@Test fun shortestFirst() = assertEquals(listOf("Apple", "cherry", "banana"), sorted(SoundtrackTracks.Sort.SHORTEST))
|
||||
|
||||
@Test fun blankQueryMatchesEverything() = assertTrue(SoundtrackTracks.matches(" ", "anything"))
|
||||
@Test fun wordsMayHitDifferentFields() = assertTrue(SoundtrackTracks.matches("main theme", "Main Menu", "Theme Composer"))
|
||||
@Test fun everyWordMustMatch() = assertFalse(SoundtrackTracks.matches("main boss", "Main Menu", "Composer"))
|
||||
@Test fun matchIsCaseInsensitive() = assertTrue(SoundtrackTracks.matches("MENU", "main menu"))
|
||||
|
||||
@Test fun rankOrdersExactPrefixContains() {
|
||||
assertEquals(0, SoundtrackTracks.rank("Menu", "menu"))
|
||||
assertEquals(1, SoundtrackTracks.rank("men", "Menu Theme"))
|
||||
assertEquals(2, SoundtrackTracks.rank("theme", "Menu Theme"))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.droiddeck.launcher.ui
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class DragTargetTest {
|
||||
@Test fun smallMovesStayInPlace() = assertEquals(5, dragTarget(20f, 100f, 5, 0, 9))
|
||||
|
||||
@Test fun halfRowMovesToNextSlot() {
|
||||
assertEquals(6, dragTarget(60f, 100f, 5, 0, 9))
|
||||
assertEquals(4, dragTarget(-60f, 100f, 5, 0, 9))
|
||||
}
|
||||
|
||||
@Test fun longMovesSkipSeveralRows() = assertEquals(8, dragTarget(310f, 100f, 5, 0, 9))
|
||||
|
||||
@Test fun staysInsideTheDisc() {
|
||||
assertEquals(9, dragTarget(900f, 100f, 5, 0, 9))
|
||||
assertEquals(2, dragTarget(-900f, 100f, 5, 2, 9))
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user