Merge branch 'new-plugins' into 'master'

feat: add bichute and dailymotion to embedded sources See merge request videostreaming/grayjay!31
futo-org · Aug 29, 2024 · 8188399 · 8188399
2 parents 2409afc + f72b7db
commit 8188399
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -70,3 +70,15 @@
 [submodule "app/src/unstable/assets/sources/spotify"]
 	path = app/src/unstable/assets/sources/spotify
 	url = ../plugins/spotify.git
+[submodule "app/src/stable/assets/sources/bitchute"]
+	path = app/src/stable/assets/sources/bitchute
+	url = ../plugins/bitchute.git
+[submodule "app/src/unstable/assets/sources/bitchute"]
+	path = app/src/unstable/assets/sources/bitchute
+	url = ../plugins/bitchute.git
+[submodule "app/src/unstable/assets/sources/dailymotion"]
+	path = app/src/unstable/assets/sources/dailymotion
+	url = ../plugins/dailymotion.git
+[submodule "app/src/stable/assets/sources/dailymotion"]
+	path = app/src/stable/assets/sources/dailymotion
+	url = ../plugins/dailymotion.git
diff --git a/app/src/stable/AndroidManifest.xml b/app/src/stable/AndroidManifest.xml
@@ -33,6 +33,11 @@
                 <data android:host="bilibili.com" />
                 <data android:host="bilibili.tv" />
                 <data android:host="spotify.com" />
+                <data android:host="dailymotion.com" />
+                <data android:host="www.dailymotion.com" />
+                <data android:host="bitchute.com" />
+                <data android:host="www.bitchute.com" />
+                <data android:host="old.bitchute.com" />
                 <data android:pathPrefix="/" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
@@ -57,6 +62,11 @@
                 <data android:host="bilibili.com" />
                 <data android:host="bilibili.tv" />
                 <data android:host="spotify.com" />
+                <data android:host="dailymotion.com" />
+                <data android:host="www.dailymotion.com" />
+                <data android:host="bitchute.com" />
+                <data android:host="www.bitchute.com" />
+                <data android:host="old.bitchute.com" />
             </intent-filter>
         </activity>
     </application>

diff --git a/app/src/stable/assets/sources/bitchute b/app/src/stable/assets/sources/bitchute
diff --git a/app/src/stable/assets/sources/dailymotion b/app/src/stable/assets/sources/dailymotion
diff --git a/app/src/stable/res/raw/plugin_config.json b/app/src/stable/res/raw/plugin_config.json
@@ -10,7 +10,9 @@
         "aac9e9f0-24b5-11ee-be56-0242ac120002": "sources/patreon/PatreonConfig.json",
         "9d703ff5-c556-4962-a990-4f000829cb87": "sources/nebula/NebulaConfig.json",
         "cf8ea74d-ad9b-489e-a083-539b6aa8648c": "sources/bilibili/build/BiliBiliConfig.json",
-        "4e365633-6d3f-4267-8941-fdc36631d813": "sources/spotify/build/SpotifyConfig.json"
+        "4e365633-6d3f-4267-8941-fdc36631d813": "sources/spotify/build/SpotifyConfig.json",
+        "9c87e8db-e75d-48f4-afe5-2d203d4b95c5": "sources/dailymotion/build/DailymotionConfig.json",
+        "e8b1ad5f-0c6d-497d-a5fa-0a785a16d902": "sources/bitchute/BitchuteConfig.json"
     },
     "SOURCES_EMBEDDED_DEFAULT": [
         "35ae969a-a7db-11ed-afa1-0242ac120002"

diff --git a/app/src/unstable/AndroidManifest.xml b/app/src/unstable/AndroidManifest.xml
@@ -34,6 +34,11 @@
                 <data android:host="bilibili.com" />
                 <data android:host="bilibili.tv" />
                 <data android:host="spotify.com" />
+                <data android:host="dailymotion.com" />
+                <data android:host="www.dailymotion.com" />
+                <data android:host="bitchute.com" />
+                <data android:host="www.bitchute.com" />
+                <data android:host="old.bitchute.com" />
                 <data android:pathPrefix="/" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
@@ -58,6 +63,11 @@
                 <data android:host="bilibili.com" />
                 <data android:host="bilibili.tv" />
                 <data android:host="spotify.com" />
+                <data android:host="dailymotion.com" />
+                <data android:host="www.dailymotion.com" />
+                <data android:host="bitchute.com" />
+                <data android:host="www.bitchute.com" />
+                <data android:host="old.bitchute.com" />
             </intent-filter>
         </activity>
     </application>

diff --git a/app/src/unstable/assets/sources/bitchute b/app/src/unstable/assets/sources/bitchute
diff --git a/app/src/unstable/assets/sources/dailymotion b/app/src/unstable/assets/sources/dailymotion
diff --git a/app/src/unstable/res/raw/plugin_config.json b/app/src/unstable/res/raw/plugin_config.json
@@ -10,7 +10,9 @@
         "aac9e9f0-24b5-11ee-be56-0242ac120002": "sources/patreon/PatreonConfig.json",
         "9d703ff5-c556-4962-a990-4f000829cb87": "sources/nebula/NebulaConfig.json",
         "cf8ea74d-ad9b-489e-a083-539b6aa8648c": "sources/bilibili/build/BiliBiliConfig.json",
-        "4e365633-6d3f-4267-8941-fdc36631d813": "sources/spotify/build/SpotifyConfig.json"
+        "4e365633-6d3f-4267-8941-fdc36631d813": "sources/spotify/build/SpotifyConfig.json",
+        "9c87e8db-e75d-48f4-afe5-2d203d4b95c5": "sources/dailymotion/build/DailymotionConfig.json",
+        "e8b1ad5f-0c6d-497d-a5fa-0a785a16d902": "sources/bitchute/BitchuteConfig.json"
     },
     "SOURCES_EMBEDDED_DEFAULT": [
         "35ae969a-a7db-11ed-afa1-0242ac120002"