Skip to content

feat(settings): wire IPTV sort order controls and trigger cloud sync #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProdigyV21 merged 1 commit into from
Aug 17, 2026
+22 −3
Merged

feat(settings): wire IPTV sort order controls and trigger cloud sync #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/src/main/kotlin/com/arflix/tv/ui/screens/settings/SettingsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,7 +1646,9 @@ fun SettingsScreen(
},
onRefresh = { viewModel.refreshIptv() },
onDelete = { viewModel.clearIptvConfig() },
onManageCategories = openIptvCategories
onManageCategories = openIptvCategories,
sortOrder = uiState.iptvSortOrder,
onSortOrderChange = { viewModel.setIptvSortOrder(it) }
)
"home_server" -> HomeServerSettings(
connections = uiState.homeServerConnections,
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/kotlin/com/arflix/tv/ui/screens/settings/SettingsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import com.arflix.tv.data.repository.HomeServerRepository
import com.arflix.tv.data.repository.PlexPinAuthSession
import com.arflix.tv.data.repository.IptvConfig
import com.arflix.tv.data.repository.IptvRepository
import com.arflix.tv.data.repository.normalizeIptvSortOrder
import com.arflix.tv.data.repository.IptvPlaylistEntry
import com.arflix.tv.data.repository.LauncherContinueWatchingRepository
import com.arflix.tv.data.repository.MediaRepository
Expand Down Expand Up @@ -1939,7 +1940,7 @@ class SettingsViewModel @Inject constructor(
viewModelScope.launch {
iptvRepository.observeConfig().collect { config ->
val current = _uiState.value
if (current.iptvM3uUrl != config.m3uUrl || current.iptvEpgUrl != config.epgUrl || current.iptvStalkerUrl != config.stalkerPortalUrl || current.iptvStalkerMac != config.stalkerMacAddress || current.iptvPlaylists != config.playlists) {
if (current.iptvM3uUrl != config.m3uUrl || current.iptvEpgUrl != config.epgUrl || current.iptvStalkerUrl != config.stalkerPortalUrl || current.iptvStalkerMac != config.stalkerMacAddress || current.iptvPlaylists != config.playlists || current.iptvSortOrder != config.sortOrder) {
_uiState.value = current.copy(
iptvM3uUrl = config.m3uUrl,
iptvEpgUrl = config.epgUrl,
Expand Down Expand Up @@ -2449,8 +2450,11 @@ class SettingsViewModel @Inject constructor(
}

fun setIptvSortOrder(mode: String) {
val normalized = normalizeIptvSortOrder(mode)
_uiState.value = _uiState.value.copy(iptvSortOrder = normalized)
viewModelScope.launch {
iptvRepository.saveSortOrder(mode)
iptvRepository.saveSortOrder(normalized)
syncLocalStateToCloud(silent = true)
}
}

Expand Down
13 changes: 13 additions & 0 deletions app/src/test/kotlin/com/arflix/tv/data/repository/IptvProviderOrderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ class IptvProviderOrderTest {
assertThat(normalizeIptvSortOrder(null)).isEqualTo("provider")
}

@Test
fun iptvSortOrderCyclesThroughExpectedSequence() {
fun nextSortOrder(current: String): String = when (normalizeIptvSortOrder(current)) {
"provider" -> "number"
"number" -> "name"
else -> "provider"
}

assertThat(nextSortOrder("provider")).isEqualTo("number")
assertThat(nextSortOrder("number")).isEqualTo("name")
assertThat(nextSortOrder("name")).isEqualTo("provider")
}

@Test
fun xtreamCategoryEndpointDefinesGroupOrder() {
val categorizedChannels = listOf(
Expand Down
Loading