mirrors/grayjay
0
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-09-18 15:32:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try a more heavy handed approach to get plugin ids for history changes.

Browse source
This commit is contained in:
Koen J 2025-05-07 13:26:31 +02:00
commit 18102a2a73
3 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

30
app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/HistoryFragment.kt
View file

@ -74,7 +74,7 @@ class HistoryFragment : MainFragment() {
private var _pager: IPager<HistoryVideo>? = null;
private val _results = arrayListOf<HistoryVideo>();
private var _loading = false;
//private val _toggleBar: ToggleBar
private val _toggleBar: ToggleBar
private var _togglePluginsDisabled = hashSetOf<String>()
private var _automaticNextPageCounter = 0;
@ -87,7 +87,7 @@ class HistoryFragment : MainFragment() {
_clearSearch = findViewById(R.id.button_clear_search);
_editSearch = findViewById(R.id.edit_search);
_tagsView = findViewById(R.id.tags_text);
//_toggleBar = findViewById(R.id.toggle_bar)
_toggleBar = findViewById(R.id.toggle_bar)
_tagsView.setPairs(listOf(
Pair(context.getString(R.string.last_hour), 60L),
Pair(context.getString(R.string.last_24_hours), 24L * 60L),
@ -97,21 +97,21 @@ class HistoryFragment : MainFragment() {
Pair(context.getString(R.string.all_time), -1L)
));
/*val toggles = StatePlatform.instance.getEnabledClients()
val toggles = StatePlatform.instance.getEnabledClients()
.filter { it is JSClient }
.map { plugin ->
val pluginName = plugin.name.lowercase()
ToggleBar.Toggle(if(Settings.instance.home.showHomeFiltersPluginNames) pluginName else "", plugin.icon, !_togglePluginsDisabled.contains(pluginName), { view, active ->
ToggleBar.Toggle(if(Settings.instance.home.showHomeFiltersPluginNames) pluginName else "", plugin.icon, !_togglePluginsDisabled.contains(plugin.id), { view, active ->
if (active) {
_togglePluginsDisabled.remove(pluginName)
_togglePluginsDisabled.remove(plugin.id)
} else {
_togglePluginsDisabled.add(pluginName)
_togglePluginsDisabled.add(plugin.id)
}
filtersChanged()
}).withTag("plugins")
}.toTypedArray()
_toggleBar.setToggles(*toggles)*/
_toggleBar.setToggles(*toggles)
_adapter = InsertedViewAdapterWithLoader(context, arrayListOf(), arrayListOf(),
{ _results.size },
@ -277,18 +277,14 @@ class HistoryFragment : MainFragment() {
}
private fun filterResults(a: List<HistoryVideo>): List<HistoryVideo> {
return a
/*
//TODO: Not an ideal way to do this, plugin id would be better but it is null for HistoryVideo ?
val enabledPluginNames = StatePlatform.instance.getEnabledClients().map { it.name.lowercase() }.toHashSet()
val disabledPluginNames = _togglePluginsDisabled.toHashSet()
val enabledPluginIds = StatePlatform.instance.getEnabledClients().map { it.id }.toHashSet()
val disabledPluginIds = _togglePluginsDisabled.toHashSet()
return a.filter {
val pluginName = it.video.id.platform.lowercase()
if (!enabledPluginNames.contains(pluginName))
val pluginId = it.video.id.pluginId ?: StatePlatform.instance.getContentClientOrNull(it.video.url)?.id ?: return@filter true
if (!enabledPluginIds.contains(pluginId))
return@filter false
return@filter !disabledPluginNames.contains(pluginName)
};*/
return@filter !disabledPluginIds.contains(pluginId)
};
}
private fun loadPagerInternal(pager: IPager<HistoryVideo>) {

5
app/src/main/java/com/futo/platformplayer/views/adapters/HistoryListViewHolder.kt
View file

@ -14,6 +14,7 @@ import com.futo.platformplayer.R
import com.futo.platformplayer.constructs.Event1
import com.futo.platformplayer.images.GlideHelper.Companion.crossfade
import com.futo.platformplayer.models.HistoryVideo
import com.futo.platformplayer.states.StatePlatform
import com.futo.platformplayer.toHumanNumber
import com.futo.platformplayer.toHumanTime
import com.futo.platformplayer.views.others.ProgressBar
@ -75,7 +76,9 @@ class HistoryListViewHolder : ViewHolder {
_textName.text = v.video.name;
_textAuthor.text = v.video.author.name;
_textVideoDuration.text = v.video.duration.toHumanTime(false);
_thumbnailPlatform.setPlatformFromClientName(v.video.id.platform)
val pluginId = v.video.id.pluginId ?: StatePlatform.instance.getContentClientOrNull(v.video.url)?.id
_thumbnailPlatform.setPlatformFromClientID(pluginId)
if(v.video.isLive) {
_containerDuration.visibility = View.GONE;

6
app/src/main/res/layout/fragment_history.xml
View file

@ -107,14 +107,12 @@
android:textColor="@color/white"
android:paddingStart="5dp"
android:paddingTop="15dp"
android:paddingBottom="8dp"
android:visibility="gone" />
android:paddingBottom="8dp" />
<com.futo.platformplayer.views.ToggleBar
android:id="@+id/toggle_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone" />
android:layout_height="wrap_content" />
</LinearLayout>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>