added server tag to bond screenshots name

Fate-Grand-Automata · Dec 28, 2023 · 5e8c974 · 5e8c974
1 parent 2ea7133
commit 5e8c974
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/main/java/io/github/fate_grand_automata/util/StorageProvider.kt b/app/src/main/java/io/github/fate_grand_automata/util/StorageProvider.kt
@@ -10,6 +10,7 @@ import io.github.fate_grand_automata.BuildConfig
 import io.github.fate_grand_automata.IStorageProvider
 import io.github.fate_grand_automata.SupportImageKind
 import io.github.fate_grand_automata.prefs.core.PrefsCore
+import io.github.fate_grand_automata.scripts.enums.GameServer
 import io.github.lib_automata.Pattern
 import timber.log.Timber
 import java.io.File
@@ -186,11 +187,11 @@ class StorageProvider @Inject constructor(
     private val bondFolder
         get() = dirRoot.getOrCreateDir("bond")
 
-    override fun dropBondScreenShot(pattern: Pattern) {
+    override fun dropBondScreenShot(pattern: Pattern, server: GameServer) {
         val sdf = SimpleDateFormat("yyyy-MM-dd-hh-mm-ss", Locale.getDefault())
         val timeString = sdf.format(Date())
 
-        val dropFileName = "bond-${timeString}.png"
+        val dropFileName = "bond-${server.simple.uppercase()}-${timeString}.png"
 
         pattern.use {
             val file = bondFolder.createFile(mimePng, dropFileName)

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/IStorageProvider.kt b/scripts/src/main/java/io/github/fate_grand_automata/IStorageProvider.kt
@@ -1,5 +1,6 @@
 package io.github.fate_grand_automata
 
+import io.github.fate_grand_automata.scripts.enums.GameServer
 import io.github.lib_automata.Pattern
 import java.io.File
 import java.io.InputStream
@@ -16,7 +17,7 @@ interface IStorageProvider {
 
     fun dropScreenshot(patterns: List<Pattern>)
 
-    fun dropBondScreenShot(pattern: Pattern)
+    fun dropBondScreenShot(pattern: Pattern, server: GameServer = GameServer.default)
 
     /**
      * For debugging images

diff --git a/scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/ScreenshotDrops.kt b/scripts/src/main/java/io/github/fate_grand_automata/scripts/modules/ScreenshotDrops.kt
@@ -50,7 +50,7 @@ class ScreenshotDrops @Inject constructor(
         useColor {
             val pattern = screenshotService.takeScreenshot()
 
-            storageProvider.dropBondScreenShot(pattern)
+            storageProvider.dropBondScreenShot(pattern, server = prefs.gameServer)
         }
 
         prefs.hidePlayButtonForScreenshot = false