From f427d50fa3c3ce34ffd5695f09e67e55c81139ec Mon Sep 17 00:00:00 2001 From: kichikuou Date: Tue, 9 Apr 2024 08:33:41 +0900 Subject: [PATCH] Android: Remove playlist migration code And stop using -playlist option, so that it can be overridden by .xsys35rc. --- .../github/kichikuou/xsystem35/GameActivity.kt | 3 +-- .../io/github/kichikuou/xsystem35/Launcher.kt | 18 ++++++------------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt index b444082..b8f3e86 100644 --- a/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt +++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/GameActivity.kt @@ -63,8 +63,7 @@ class GameActivity : SDLActivity() { override fun getArguments(): Array { return arrayOf( "-gamedir", intent.getStringExtra(EXTRA_GAME_ROOT)!!, - "-savedir", intent.getStringExtra(EXTRA_SAVE_DIRECTORY)!!, - "-playlist", Launcher.PLAYLIST_FILE) + "-savedir", intent.getStringExtra(EXTRA_SAVE_DIRECTORY)!!) } override fun setTitle(title: CharSequence?) { diff --git a/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt b/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt index 88f0ee4..d8f87db 100644 --- a/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt +++ b/android/app/src/main/java/io/github/kichikuou/xsystem35/Launcher.kt @@ -44,8 +44,8 @@ class Launcher private constructor(private val rootDir: File) { const val SAVE_DIR = "save" const val TITLE_FILE = "title.txt" const val GAMEDIR_FILE = "game_directory.txt" - const val PLAYLIST_FILE = "playlist2.txt" - const val OLD_PLAYLIST_FILE = "playlist.txt" + const val PLAYLIST_FILE = "playlist.txt" + const val OLD_PLAYLIST_FILE = "playlist2.txt" fun getInstance(rootDir: File): Launcher { if (gLauncher == null) { @@ -202,18 +202,12 @@ class Launcher private constructor(private val rootDir: File) { return configWriter.gameDir?.let { File(outDir, it) } ?: outDir } - // Xsystem35-sdl2 <=2.2.0 had a bug where playlist had an extra empty line at - // the beginning of the file. This migrates playlist.txt created by an old - // version of xsystem35-sdl2 to playlist2.txt. + // Xsystem35-sdl2 2.3.0 - 2.11.1 used playlist2.txt. Rename it to playlist.txt. private fun migratePlaylist(dir: File) { val oldPlaylist = File(dir, OLD_PLAYLIST_FILE) - if (!oldPlaylist.exists()) - return - var tracks = oldPlaylist.readLines() - if (tracks.isNotEmpty()) - tracks = tracks.subList(1, tracks.size) - File(dir, PLAYLIST_FILE).writeText(tracks.joinToString("\n")) - oldPlaylist.delete() + if (oldPlaylist.exists()) { + oldPlaylist.renameTo(File(dir, PLAYLIST_FILE)) + } } class InstallFailureException(val msgId: Int) : Exception()