From a830c918abaa4ba71b8dadf8a966dfc118521d5d Mon Sep 17 00:00:00 2001
From: Koen <koen@pop-os.localdomain>
Date: Tue, 23 Apr 2024 15:07:10 +0200
Subject: [PATCH] Finished embedding bilibili.
---
.gitmodules | 6 ++++++
.../java/com/futo/platformplayer/states/StatePlugins.kt | 7 +++++--
app/src/stable/assets/sources/bilibili | 1 +
app/src/stable/res/raw/plugin_config.json | 3 ++-
app/src/unstable/assets/sources/bilibili | 1 +
app/src/unstable/res/raw/plugin_config.json | 3 ++-
6 files changed, 17 insertions(+), 4 deletions(-)
create mode 160000 app/src/stable/assets/sources/bilibili
create mode 160000 app/src/unstable/assets/sources/bilibili
diff --git a/.gitmodules b/.gitmodules
index 19b8f63e..2e67308c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -58,3 +58,9 @@
[submodule "dep/futopay"]
path = dep/futopay
url = ../futopayclientlibraries.git
+[submodule "app/src/unstable/assets/sources/bilibili"]
+ path = app/src/unstable/assets/sources/bilibili
+ url = ../plugins/bilibili.git
+[submodule "app/src/stable/assets/sources/bilibili"]
+ path = app/src/stable/assets/sources/bilibili
+ url = ../plugins/bilibili.git
diff --git a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
index 7eefeddb..d0c2d8be 100644
--- a/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
+++ b/app/src/main/java/com/futo/platformplayer/states/StatePlugins.kt
@@ -134,8 +134,11 @@ class StatePlugins {
val embeddedConfig = getEmbeddedPluginConfig(context, embedded.value);
if(embeddedConfig != null) {
val existing = getPlugin(embedded.key);
- if(existing != null && (existing.config.version < embeddedConfig.version || (force || FORCE_REINSTALL_EMBEDDED))) {
- Logger.i(TAG, "Outdated Embedded plugin [${existing.config.id}] ${existing.config.name} (${existing.config.version} < ${embeddedConfig.version}), reinstalling");
+ if(existing == null || (existing.config.version < embeddedConfig.version || (force || FORCE_REINSTALL_EMBEDDED))) {
+ if (existing != null)
+ Logger.i(TAG, "Outdated Embedded plugin [${existing.config.id}] ${existing.config.name} (${existing.config.version} < ${embeddedConfig.version}), reinstalling");
+ else
+ Logger.i(TAG, "Embedded plugin nog installed [${embeddedConfig.id}] ${embeddedConfig.name} (${embeddedConfig.version}), installing");
installEmbeddedPlugin(context, embedded.value)
}
else if(existing != null && _isFirstEmbedUpdate) {
diff --git a/app/src/stable/assets/sources/bilibili b/app/src/stable/assets/sources/bilibili
new file mode 160000
index 00000000..650ef8e5
--- /dev/null
+++ b/app/src/stable/assets/sources/bilibili
@@ -0,0 +1 @@
+Subproject commit 650ef8e5a901d65836b237145674b87e562a69a8
diff --git a/app/src/stable/res/raw/plugin_config.json b/app/src/stable/res/raw/plugin_config.json
index 3d12be89..64dcc595 100644
--- a/app/src/stable/res/raw/plugin_config.json
+++ b/app/src/stable/res/raw/plugin_config.json
@@ -8,7 +8,8 @@
"c0f315f9-0992-4508-a061-f2738724c331": "sources/twitch/TwitchConfig.json",
"4a78c2ff-c20f-43ac-8f75-34515df1d320": "sources/kick/KickConfig.json",
"aac9e9f0-24b5-11ee-be56-0242ac120002": "sources/patreon/PatreonConfig.json",
- "9d703ff5-c556-4962-a990-4f000829cb87": "sources/nebula/NebulaConfig.json"
+ "9d703ff5-c556-4962-a990-4f000829cb87": "sources/nebula/NebulaConfig.json",
+ "cf8ea74d-ad9b-489e-a083-539b6aa8648c": "sources/bilibili/build/BiliBiliConfig.json"
},
"SOURCES_EMBEDDED_DEFAULT": [
"35ae969a-a7db-11ed-afa1-0242ac120002"
diff --git a/app/src/unstable/assets/sources/bilibili b/app/src/unstable/assets/sources/bilibili
new file mode 160000
index 00000000..650ef8e5
--- /dev/null
+++ b/app/src/unstable/assets/sources/bilibili
@@ -0,0 +1 @@
+Subproject commit 650ef8e5a901d65836b237145674b87e562a69a8
diff --git a/app/src/unstable/res/raw/plugin_config.json b/app/src/unstable/res/raw/plugin_config.json
index 3d12be89..64dcc595 100644
--- a/app/src/unstable/res/raw/plugin_config.json
+++ b/app/src/unstable/res/raw/plugin_config.json
@@ -8,7 +8,8 @@
"c0f315f9-0992-4508-a061-f2738724c331": "sources/twitch/TwitchConfig.json",
"4a78c2ff-c20f-43ac-8f75-34515df1d320": "sources/kick/KickConfig.json",
"aac9e9f0-24b5-11ee-be56-0242ac120002": "sources/patreon/PatreonConfig.json",
- "9d703ff5-c556-4962-a990-4f000829cb87": "sources/nebula/NebulaConfig.json"
+ "9d703ff5-c556-4962-a990-4f000829cb87": "sources/nebula/NebulaConfig.json",
+ "cf8ea74d-ad9b-489e-a083-539b6aa8648c": "sources/bilibili/build/BiliBiliConfig.json"
},
"SOURCES_EMBEDDED_DEFAULT": [
"35ae969a-a7db-11ed-afa1-0242ac120002"
--
GitLab