diff --git a/plugins/directdownload/build.gradle.kts b/plugins/directdownload/build.gradle.kts index e18b5f5..475554a 100644 --- a/plugins/directdownload/build.gradle.kts +++ b/plugins/directdownload/build.gradle.kts @@ -1,6 +1,5 @@ plugins { id("com.google.devtools.ksp") - kotlin("plugin.serialization") } dependencies { diff --git a/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfin/plugins/directdownload/CompressionMode.kt b/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfinplugins/directdownload/CompressionMode.kt similarity index 71% rename from plugins/directdownload/src/main/kotlin/de/grimsi/gameyfin/plugins/directdownload/CompressionMode.kt rename to plugins/directdownload/src/main/kotlin/de/grimsi/gameyfinplugins/directdownload/CompressionMode.kt index c571604..27e5f8a 100644 --- a/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfin/plugins/directdownload/CompressionMode.kt +++ b/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfinplugins/directdownload/CompressionMode.kt @@ -1,6 +1,6 @@ -package de.grimsi.gameyfin.plugins.directdownload +package de.grimsi.gameyfinplugins.directdownload -import de.grimsi.gameyfin.plugins.directdownload.CompressionMode.* +import de.grimsi.gameyfinplugins.directdownload.CompressionMode.* import java.util.zip.Deflater enum class CompressionMode { diff --git a/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfin/plugins/directdownload/DirectDownloadPlugin.kt b/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfinplugins/directdownload/DirectDownloadPlugin.kt similarity index 98% rename from plugins/directdownload/src/main/kotlin/de/grimsi/gameyfin/plugins/directdownload/DirectDownloadPlugin.kt rename to plugins/directdownload/src/main/kotlin/de/grimsi/gameyfinplugins/directdownload/DirectDownloadPlugin.kt index 81f0fac..13328d8 100644 --- a/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfin/plugins/directdownload/DirectDownloadPlugin.kt +++ b/plugins/directdownload/src/main/kotlin/de/grimsi/gameyfinplugins/directdownload/DirectDownloadPlugin.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.plugins.directdownload +package de.grimsi.gameyfinplugins.directdownload import de.grimsi.gameyfin.pluginapi.core.config.ConfigMetadata import de.grimsi.gameyfin.pluginapi.core.config.PluginConfigMetadata diff --git a/plugins/directdownload/src/main/resources/MANIFEST.MF b/plugins/directdownload/src/main/resources/MANIFEST.MF index 12fa4fb..696ed49 100644 --- a/plugins/directdownload/src/main/resources/MANIFEST.MF +++ b/plugins/directdownload/src/main/resources/MANIFEST.MF @@ -1,5 +1,5 @@ -Plugin-Version: 1.0.0-alpha4 -Plugin-Class: de.grimsi.gameyfin.plugins.directdownload.DirectDownloadPlugin +Plugin-Version: 1.0.0-alpha5 +Plugin-Class: de.grimsi.gameyfinplugins.directdownload.DirectDownloadPlugin Plugin-Id: de.grimsi.gameyfin.directdownload Plugin-Name: Direct Download Plugin-Description: Downloads games directly in the browser.
diff --git a/plugins/igdb/src/main/kotlin/de/grimsi/gameyfin/plugins/igdb/IgdbPlugin.kt b/plugins/igdb/src/main/kotlin/de/grimsi/gameyfinplugins/igdb/IgdbPlugin.kt similarity index 94% rename from plugins/igdb/src/main/kotlin/de/grimsi/gameyfin/plugins/igdb/IgdbPlugin.kt rename to plugins/igdb/src/main/kotlin/de/grimsi/gameyfinplugins/igdb/IgdbPlugin.kt index eab29fb..d0e2cf9 100644 --- a/plugins/igdb/src/main/kotlin/de/grimsi/gameyfin/plugins/igdb/IgdbPlugin.kt +++ b/plugins/igdb/src/main/kotlin/de/grimsi/gameyfinplugins/igdb/IgdbPlugin.kt @@ -1,11 +1,14 @@ -package de.grimsi.gameyfin.plugins.igdb +package de.grimsi.gameyfinplugins.igdb import com.api.igdb.apicalypse.APICalypse import com.api.igdb.exceptions.RequestException import com.api.igdb.request.IGDBWrapper import com.api.igdb.request.TwitchAuthenticator import com.api.igdb.request.games -import de.grimsi.gameyfin.pluginapi.core.config.* +import de.grimsi.gameyfin.pluginapi.core.config.ConfigMetadata +import de.grimsi.gameyfin.pluginapi.core.config.PluginConfigError +import de.grimsi.gameyfin.pluginapi.core.config.PluginConfigMetadata +import de.grimsi.gameyfin.pluginapi.core.config.PluginConfigValidationResult import de.grimsi.gameyfin.pluginapi.core.wrapper.ConfigurableGameyfinPlugin import de.grimsi.gameyfin.pluginapi.gamemetadata.GameMetadata import de.grimsi.gameyfin.pluginapi.gamemetadata.GameMetadataProvider @@ -38,9 +41,7 @@ class IgdbPlugin(wrapper: PluginWrapper) : ConfigurableGameyfinPlugin(wrapper) { override fun validateConfig(config: Map): PluginConfigValidationResult { val pluginConfigValidationResult = super.validateConfig(config) - if (pluginConfigValidationResult.result == PluginConfigValidationResultType.INVALID) { - return pluginConfigValidationResult - } + if (!pluginConfigValidationResult.isValid()) return pluginConfigValidationResult try { val clientIdToValidate = config["clientId"] diff --git a/plugins/igdb/src/main/kotlin/de/grimsi/gameyfin/plugins/igdb/Mapper.kt b/plugins/igdb/src/main/kotlin/de/grimsi/gameyfinplugins/igdb/Mapper.kt similarity index 99% rename from plugins/igdb/src/main/kotlin/de/grimsi/gameyfin/plugins/igdb/Mapper.kt rename to plugins/igdb/src/main/kotlin/de/grimsi/gameyfinplugins/igdb/Mapper.kt index baa71f0..4eff182 100644 --- a/plugins/igdb/src/main/kotlin/de/grimsi/gameyfin/plugins/igdb/Mapper.kt +++ b/plugins/igdb/src/main/kotlin/de/grimsi/gameyfinplugins/igdb/Mapper.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.plugins.igdb +package de.grimsi.gameyfinplugins.igdb import com.api.igdb.utils.ImageSize import com.api.igdb.utils.ImageType diff --git a/plugins/igdb/src/main/resources/MANIFEST.MF b/plugins/igdb/src/main/resources/MANIFEST.MF index 7c28c30..9e0447e 100644 --- a/plugins/igdb/src/main/resources/MANIFEST.MF +++ b/plugins/igdb/src/main/resources/MANIFEST.MF @@ -1,5 +1,5 @@ -Plugin-Version: 1.0.0-alpha7 -Plugin-Class: de.grimsi.gameyfin.plugins.igdb.IgdbPlugin +Plugin-Version: 1.0.0-alpha8 +Plugin-Class: de.grimsi.gameyfinplugins.igdb.IgdbPlugin Plugin-Id: de.grimsi.gameyfin.igdb Plugin-Name: IGDB Metadata Plugin-Description: Fetches metadata from IGDB.
diff --git a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/SteamPlugin.kt b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/SteamPlugin.kt similarity index 94% rename from plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/SteamPlugin.kt rename to plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/SteamPlugin.kt index ad3dd89..73baeed 100644 --- a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/SteamPlugin.kt +++ b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/SteamPlugin.kt @@ -1,12 +1,12 @@ -package de.grimsi.gameyfin.plugins.steam +package de.grimsi.gameyfinplugins.steam import de.grimsi.gameyfin.pluginapi.core.wrapper.GameyfinPlugin import de.grimsi.gameyfin.pluginapi.gamemetadata.GameMetadata import de.grimsi.gameyfin.pluginapi.gamemetadata.GameMetadataProvider -import de.grimsi.gameyfin.plugins.steam.dto.SteamDetailsResultWrapper -import de.grimsi.gameyfin.plugins.steam.dto.SteamGame -import de.grimsi.gameyfin.plugins.steam.dto.SteamSearchResult -import de.grimsi.gameyfin.plugins.steam.mapper.Mapper +import de.grimsi.gameyfinplugins.steam.dto.SteamDetailsResultWrapper +import de.grimsi.gameyfinplugins.steam.dto.SteamGame +import de.grimsi.gameyfinplugins.steam.dto.SteamSearchResult +import de.grimsi.gameyfinplugins.steam.mapper.Mapper import io.ktor.client.* import io.ktor.client.call.* import io.ktor.client.engine.cio.* diff --git a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/dto/SteamGameDetails.kt b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/dto/SteamGameDetails.kt similarity index 94% rename from plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/dto/SteamGameDetails.kt rename to plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/dto/SteamGameDetails.kt index ff4dcd3..9ade5fb 100644 --- a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/dto/SteamGameDetails.kt +++ b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/dto/SteamGameDetails.kt @@ -1,6 +1,6 @@ -package de.grimsi.gameyfin.plugins.steam.dto +package de.grimsi.gameyfinplugins.steam.dto -import de.grimsi.gameyfin.plugins.steam.util.SteamDateSerializer +import de.grimsi.gameyfinplugins.steam.util.SteamDateSerializer import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import java.time.Instant diff --git a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/dto/SteamGameOverview.kt b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/dto/SteamGameOverview.kt similarity index 84% rename from plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/dto/SteamGameOverview.kt rename to plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/dto/SteamGameOverview.kt index 69299fa..986b7f9 100644 --- a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/dto/SteamGameOverview.kt +++ b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/dto/SteamGameOverview.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.plugins.steam.dto +package de.grimsi.gameyfinplugins.steam.dto import kotlinx.serialization.Serializable diff --git a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/mapper/Mapper.kt b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/mapper/Mapper.kt similarity index 95% rename from plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/mapper/Mapper.kt rename to plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/mapper/Mapper.kt index d564fee..6b51aef 100644 --- a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/mapper/Mapper.kt +++ b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/mapper/Mapper.kt @@ -1,7 +1,7 @@ -package de.grimsi.gameyfin.plugins.steam.mapper +package de.grimsi.gameyfinplugins.steam.mapper import de.grimsi.gameyfin.pluginapi.gamemetadata.Genre -import de.grimsi.gameyfin.plugins.steam.dto.SteamGenre +import de.grimsi.gameyfinplugins.steam.dto.SteamGenre class Mapper { companion object { diff --git a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/util/SteamDateSerializer.kt b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/util/SteamDateSerializer.kt similarity index 96% rename from plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/util/SteamDateSerializer.kt rename to plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/util/SteamDateSerializer.kt index e4a989c..8135d85 100644 --- a/plugins/steam/src/main/kotlin/de/grimsi/gameyfin/plugins/steam/util/SteamDateSerializer.kt +++ b/plugins/steam/src/main/kotlin/de/grimsi/gameyfinplugins/steam/util/SteamDateSerializer.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.plugins.steam.util +package de.grimsi.gameyfinplugins.steam.util import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.KSerializer diff --git a/plugins/steam/src/main/resources/MANIFEST.MF b/plugins/steam/src/main/resources/MANIFEST.MF index 8dd1183..80bbe24 100644 --- a/plugins/steam/src/main/resources/MANIFEST.MF +++ b/plugins/steam/src/main/resources/MANIFEST.MF @@ -1,5 +1,5 @@ -Plugin-Version: 1.0.0-alpha7 -Plugin-Class: de.grimsi.gameyfin.plugins.steam.SteamPlugin +Plugin-Version: 1.0.0-alpha8 +Plugin-Class: de.grimsi.gameyfinplugins.steam.SteamPlugin Plugin-Id: de.grimsi.gameyfin.steam Plugin-Name: Steam Metadata Plugin-Description: Fetches metadata from Steam using undocumented public API endpoints.
diff --git a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/SteamGridDbPlugin.kt b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/SteamGridDbPlugin.kt similarity index 94% rename from plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/SteamGridDbPlugin.kt rename to plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/SteamGridDbPlugin.kt index 0b4b4be..85de4d3 100644 --- a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/SteamGridDbPlugin.kt +++ b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/SteamGridDbPlugin.kt @@ -1,12 +1,12 @@ -package de.grimsi.gameyfin.plugins.steamgriddb +package de.grimsi.gameyfinplugins.steamgriddb import de.grimsi.gameyfin.pluginapi.core.config.* import de.grimsi.gameyfin.pluginapi.core.wrapper.ConfigurableGameyfinPlugin import de.grimsi.gameyfin.pluginapi.gamemetadata.GameMetadata import de.grimsi.gameyfin.pluginapi.gamemetadata.GameMetadataProvider -import de.grimsi.gameyfin.plugins.steamgriddb.api.SteamGridDbApiClient -import de.grimsi.gameyfin.plugins.steamgriddb.dto.SteamGridDbGame -import de.grimsi.gameyfin.plugins.steamgriddb.dto.SteamGridDbGrid +import de.grimsi.gameyfinplugins.steamgriddb.api.SteamGridDbApiClient +import de.grimsi.gameyfinplugins.steamgriddb.dto.SteamGridDbGame +import de.grimsi.gameyfinplugins.steamgriddb.dto.SteamGridDbGrid import kotlinx.coroutines.runBlocking import org.pf4j.Extension import org.pf4j.PluginWrapper diff --git a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/api/SteamGridDbApiClient.kt b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/api/SteamGridDbApiClient.kt similarity index 89% rename from plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/api/SteamGridDbApiClient.kt rename to plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/api/SteamGridDbApiClient.kt index 3c30960..1b390e9 100644 --- a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/api/SteamGridDbApiClient.kt +++ b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/api/SteamGridDbApiClient.kt @@ -1,7 +1,7 @@ -package de.grimsi.gameyfin.plugins.steamgriddb.api +package de.grimsi.gameyfinplugins.steamgriddb.api -import de.grimsi.gameyfin.plugins.steamgriddb.dto.SteamGridDbGridResult -import de.grimsi.gameyfin.plugins.steamgriddb.dto.SteamGridDbSearchResult +import de.grimsi.gameyfinplugins.steamgriddb.dto.SteamGridDbGridResult +import de.grimsi.gameyfinplugins.steamgriddb.dto.SteamGridDbSearchResult import io.ktor.client.* import io.ktor.client.call.* import io.ktor.client.engine.cio.* diff --git a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/dto/SteamGridDbGameOverview.kt b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/dto/SteamGridDbGameOverview.kt similarity index 82% rename from plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/dto/SteamGridDbGameOverview.kt rename to plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/dto/SteamGridDbGameOverview.kt index ac29014..957c2b4 100644 --- a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/dto/SteamGridDbGameOverview.kt +++ b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/dto/SteamGridDbGameOverview.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.plugins.steamgriddb.dto +package de.grimsi.gameyfinplugins.steamgriddb.dto import kotlinx.serialization.Serializable diff --git a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/dto/SteamGridDbGridsDetails.kt b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/dto/SteamGridDbGridsDetails.kt similarity index 84% rename from plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/dto/SteamGridDbGridsDetails.kt rename to plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/dto/SteamGridDbGridsDetails.kt index 50b9c7d..2bddcd3 100644 --- a/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfin/plugins/steamgriddb/dto/SteamGridDbGridsDetails.kt +++ b/plugins/steamgriddb/src/main/kotlin/de/grimsi/gameyfinplugins/steamgriddb/dto/SteamGridDbGridsDetails.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.plugins.steamgriddb.dto +package de.grimsi.gameyfinplugins.steamgriddb.dto import kotlinx.serialization.Serializable diff --git a/plugins/steamgriddb/src/main/resources/MANIFEST.MF b/plugins/steamgriddb/src/main/resources/MANIFEST.MF index f10a77a..45dfaa1 100644 --- a/plugins/steamgriddb/src/main/resources/MANIFEST.MF +++ b/plugins/steamgriddb/src/main/resources/MANIFEST.MF @@ -1,5 +1,5 @@ -Plugin-Version: 1.0.0-alpha4 -Plugin-Class: de.grimsi.gameyfin.plugins.steamgriddb.SteamGridDbPlugin +Plugin-Version: 1.0.0-alpha5 +Plugin-Class: de.grimsi.gameyfinplugins.steamgriddb.SteamGridDbPlugin Plugin-Id: de.grimsi.gameyfin.steamgriddb Plugin-Name: SteamGridDB Covers Plugin-Description: Fetches covers from SteamGridDB.
diff --git a/settings.gradle.kts b/settings.gradle.kts index 95fd655..57bd5c6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -26,4 +26,5 @@ include(":plugins") include(":plugins:igdb") include(":plugins:steam") include(":plugins:steamgriddb") -include(":plugins:directdownload") \ No newline at end of file +include(":plugins:directdownload") +include(":plugins:torrentdownload") \ No newline at end of file