Fix "Waiting for PS3" loop

Author: WinG4merBR

src/main/kotlin/net/openps3/drp3/presence/ActivityBuilder.kt

@@ -28,34 +28,31 @@ class ActivityBuilder(val instance: DRP3Instance) {
             instance.lastActivity = activityDetails
             instance.lastTitleID = webmanUtils.titleID
 
+            val titleData = mapOf(
+                Constants.PLAYSTATION_STORE_ID to Triple("Looking at PlayStation® Store", Constants.PS_STORE_LOGO_KEY, "PlayStation® Store"),
+                Constants.PSTVPLUS_ID to Triple("Watching PlayStation®TV Plus", Constants.PSTVPLUS_LOGO_KEY, "PlayStation®TV Plus"),
+                Constants.YOUTUBE_ID to Triple("Watching YouTube", Constants.YOUTUBE_LOGO_KEY, "YouTube")
+            )
+
             Activity().use { activity ->
-                if (webmanUtils.titleID == Constants.PLAYSTATION_STORE_ID) {
-                    activity.details = "Looking at PlayStation® Store"
-                    activity.state = if (instance.config.showTemp) webmanUtils.thermalData else webmanUtils.titleID
-                    activity.timestamps().start = Instant.now()
-                    activity.assets().largeImage = Constants.PS_STORE_LOGO_KEY
-                    activity.assets().largeText = "PlayStation® Store"
-
-                    core.activityManager().updateActivity(activity)
-                    return
-                }
+                val data = titleData[webmanUtils.titleID]
+                val isSpecial = data != null
 
-                activity.details = activityDetails
+                activity.details = data?.first ?: activityDetails
                 activity.state = if (instance.config.showTemp) webmanUtils.thermalData else webmanUtils.titleID
                 activity.timestamps().start = Instant.now()
 
-                if (instance.config.showCover) {
-                    activity.assets().largeImage = if (webmanUtils.gameName.isNullOrBlank()) {
-                        Constants.DEFAULT_IMAGE_KEY
-                    } else {
-                        webmanUtils.titleID?.let { getGameTDBImage(it) } ?: Constants.DEFAULT_IMAGE_KEY
-                    }
-
-                } else activity.assets().largeImage = Constants.DEFAULT_IMAGE_KEY
+                activity.assets().largeImage = when {
+                    data != null -> data.second
+                    instance.config.showCover -> webmanUtils.titleID?.let { getGameTDBImage(it) } ?: Constants.DEFAULT_IMAGE_KEY
+                    else -> Constants.DEFAULT_IMAGE_KEY
+                }
 
-                    activity.assets().largeText = webmanUtils.titleID ?: "Unknown ID"
+                activity.assets().largeText = data?.third ?: (webmanUtils.titleID ?: "Unknown ID")
 
                 core.activityManager().updateActivity(activity)
+
+                if (isSpecial) return
             }
         }
     }

src/main/kotlin/net/openps3/drp3/utils/common/Constants.kt

@@ -5,6 +5,10 @@ object Constants {
     const val TARGET_BLANK = "a[target=_blank]"
     const val CPU_RSX_PAGE = "a[href=/cpursx.ps3?up]"
     const val PLAYSTATION_STORE_ID = "NPIA00025"
+    const val YOUTUBE_ID = "NPEB01229"
+    const val PSTVPLUS_ID = "PS3TV2025"
     const val DEFAULT_IMAGE_KEY = "default_image_key"
     const val PS_STORE_LOGO_KEY = "psstore_logo"
+    const val PSTVPLUS_LOGO_KEY = "pstvplus_logo"
+    const val YOUTUBE_LOGO_KEY = "youtube_logo"
 }

src/main/kotlin/net/openps3/drp3/utils/ps3/PSActivityUtils.kt

@@ -7,11 +7,8 @@ class PSActivityUtils(private val dataLoader: PSDataLoader) {
         dataLoader.isRetroGame = false
         if (dataLoader.document?.selectFirst(Constants.TARGET_BLANK) != null) {
             dataLoader.systemUtils.getPS3Details()
-        }
-        else if (dataLoader.document?.selectFirst(Constants.DIRECTORIES_REGEX) != null) {
-            dataLoader.isRetroGame = true
         } else {
-            dataLoader.name = "XMB™"
+            dataLoader.name = null
             dataLoader.titleID = null
         }
     }

src/main/kotlin/net/openps3/drp3/utils/ps3/SystemUtils.kt

@@ -10,21 +10,23 @@ class SystemUtils(private val dataLoader: PSDataLoader) {
     fun getPS3Details() {
         val titleLink = dataLoader.document?.selectFirst(Constants.TARGET_BLANK)
         val nameElement = titleLink?.nextElementSibling()
+        lateinit var gameName: String
 
         if (titleLink == null || nameElement == null) {
             logger.info { "Game info not found." }
             return
         }
 
         val titleText = titleLink.text()
-        var gameName = nameElement.text().replace("\n", "")
+        gameName = nameElement.text().replace("\n", "")
 
         val versionPattern = Pattern.compile("(.+)[0-9]{2}\\.[0-9]{2}")
         val versionMatcher = versionPattern.matcher(gameName)
         if (versionMatcher.find()) {
             gameName = versionMatcher.group(1)
         }
 
+        logger.info { "Received $gameName from webMAN"}
         dataLoader.titleID = titleText
         dataLoader.name = gameName
     }

src/main/kotlin/net/openps3/drp3/utils/ps3/webman/WebmanUtils.kt

@@ -24,7 +24,7 @@ class WebmanUtils(ip: String) {
 
     fun fetchDetails(): Boolean {
         if (!dataLoader.getHtml()) {
-            logger.error { "Can't get PlayStation® 3 Home page, is WebmanMOD installed?" }
+            logger.error { "Can't get PlayStation®3 Home page, is WebmanMOD installed?" }
             thermalData = null
             gameName = null
             titleID = null