Skip to content

Commit

Permalink
fix(provider): incorrect provider order when updates are available
Browse files Browse the repository at this point in the history 
Fixes #129
  • Loading branch information
@rhenwinch
rhenwinch committed Nov 8, 2024
1 parent 67efc26 commit 25151fd
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 76 deletions.
178 changes: 110 additions & 68 deletions data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import androidx.compose.runtime.snapshotFlow
import com.flixclusive.core.datastore.AppSettingsManager
import com.flixclusive.core.ui.common.util.showToast
import com.flixclusive.core.util.coroutines.AppDispatchers
import com.flixclusive.core.util.coroutines.AppDispatchers.Companion.withDefaultContext
import com.flixclusive.core.util.coroutines.AppDispatchers.Companion.withIOContext
import com.flixclusive.core.util.exception.safeCall
import com.flixclusive.core.util.log.errorLog
Expand Down Expand Up @@ -36,6 +37,7 @@ import okhttp3.OkHttpClient
import java.io.File
import java.io.IOException
import java.io.InputStreamReader
import java.util.Collections
import javax.inject.Inject
import javax.inject.Singleton
import com.flixclusive.core.locale.R as LocaleR
Expand All @@ -52,10 +54,10 @@ class ProviderManager @Inject constructor(
private val providerApiRepository: ProviderApiRepository
) {
/** Map containing all loaded providers */
val providers: MutableMap<String, Provider> = LinkedHashMap()
private val classLoaders: MutableMap<PathClassLoader, Provider> = HashMap()
val providers: MutableMap<String, Provider> = Collections.synchronizedMap(LinkedHashMap())
private val classLoaders: MutableMap<PathClassLoader, Provider> = Collections.synchronizedMap(HashMap())

private var notificationChannelHasBeensInitialized = false
private var notificationChannelHasBeenInitialized = false

/**
* An observable map of provider data
Expand All @@ -72,6 +74,7 @@ class ProviderManager @Inject constructor(
private val updaterJsonMap = HashMap<String, List<ProviderData>>()

private val dynamicResourceLoader = DynamicResourceLoader(context = context)
private val LOCAL_PATH_PREFIX = context.getExternalFilesDir(null)?.absolutePath + "/providers/"

val workingApis = snapshotFlow {
providerDataList
Expand Down Expand Up @@ -108,18 +111,17 @@ class ProviderManager @Inject constructor(

if (failedToLoad.isNotEmpty()) {
context.notifyOnError(
shouldInitializeChannel = !notificationChannelHasBeensInitialized,
shouldInitializeChannel = !notificationChannelHasBeenInitialized,
providers = failedToLoad.keys,
)

notificationChannelHasBeensInitialized = true
notificationChannelHasBeenInitialized = true
}
}
}

private suspend fun initializeLocalProviders() {
val localPath = context.getExternalFilesDir(null)?.absolutePath + "/providers/"
val localDir = File(localPath)
val localDir = File(LOCAL_PATH_PREFIX)

if (!localDir.exists()) {
val isSuccess = localDir.mkdirs()
Expand Down Expand Up @@ -275,11 +277,11 @@ class ProviderManager @Inject constructor(
val hasNewErrors = needsDownload && failedToLoad.size - initialFailedToLoadProviders > 0
if (hasNewErrors) {
context.notifyOnError(
shouldInitializeChannel = !notificationChannelHasBeensInitialized,
shouldInitializeChannel = !notificationChannelHasBeenInitialized,
providers = failedToLoad.keys,
)

notificationChannelHasBeensInitialized = true
notificationChannelHasBeenInitialized = true
}
}

Expand All @@ -290,11 +292,16 @@ class ProviderManager @Inject constructor(
* @param providerData The provider information
*/
@Suppress("UNCHECKED_CAST")
private suspend fun loadProvider(file: File, providerData: ProviderData) {
private suspend fun loadProvider(
file: File,
providerData: ProviderData
) {
val name = file.nameWithoutExtension
val filePath = file.absolutePath

var providerPreference = getProviderPreference(name)
val providerPosition = getPositionIndexFromSettings(
name = name
)

infoLog("Loading provider: $name")

Expand Down Expand Up @@ -343,14 +350,16 @@ class ProviderManager @Inject constructor(
}
}

if (providerPreference == null) {
providerPreference = ProviderPreference(
val providerPreference = if (providerPosition > -1) {
appSettingsManager.cachedProviderSettings.providers[providerPosition]
} else {
ProviderPreference(
name = name,
filePath = filePath,
isDisabled = false
)

loadProviderOnSettings(providerPreference)
).also {
loadProviderOnSettings(it)
}
}

if (!providerPreference.isDisabled) {
Expand All @@ -362,9 +371,16 @@ class ProviderManager @Inject constructor(
)
}

providerDataList.add(providerData)
providers[name] = providerInstance
classLoaders[loader] = providerInstance

if (providerPosition > -1) {
providerDataList.add(
index = providerPosition, element = providerData
)
} else {
providerDataList.add(element = providerData)
}
} catch (e: Throwable) {
if (isCrashingOnGetApiMethod(e)) {
val message = context.getApiCrashMessage(provider = name)
Expand All @@ -384,10 +400,21 @@ class ProviderManager @Inject constructor(
}
}

private suspend fun loadProviderOnSettings(providerPreference: ProviderPreference) {
private suspend fun loadProviderOnSettings(
provider: ProviderPreference,
index: Int = -1
) {
appSettingsManager.updateProviderSettings {
val providersList = it.providers.toMutableList()

if (index > -1) {
providersList[index] = provider
} else {
providersList.add(provider)
}

it.copy(
providers = it.providers + listOf(providerPreference)
providers = providersList.toList()
)
}
}
Expand All @@ -402,15 +429,13 @@ class ProviderManager @Inject constructor(
providerData: ProviderData,
unloadOnSettings: Boolean = true
) {
val provider = providers[providerData.name]
val file = context.provideValidProviderPath(providerData)

if (provider == null || !file.exists()) {
errorLog("Provider [${providerData.name}] not found. Cannot be unloaded")
return
}
val index = getPositionIndexFromSettings(providerData.name)
val providerPreference = appSettingsManager.cachedProviderSettings.providers[index]

unloadProvider(provider, file, unloadOnSettings)
unloadProvider(
providerPreference = providerPreference,
unloadOnSettings = unloadOnSettings
)
}

/**
Expand Down Expand Up @@ -453,7 +478,10 @@ class ProviderManager @Inject constructor(
providerApiRepository.remove(provider.name)
providers.remove(provider.name)
if (unloadOnSettings) {
unloadProviderOnSettings(file.absolutePath)
unloadProviderOnSettings(
name = provider.name,
path = file.absolutePath
)
}
file.delete()

Expand All @@ -469,51 +497,60 @@ class ProviderManager @Inject constructor(
}
}

private suspend fun unloadProviderOnSettings(path: String) {
private suspend fun unloadProviderOnSettings(name: String, path: String) {
appSettingsManager.updateProviderSettings {
val newList = it.providers.toMutableList()
newList.removeIf { providerPref ->
providerPref.equals(path)
providerPref.filePath == path
&& providerPref.name == name
}

it.copy(providers = newList)
}
}

private suspend fun reloadProviderOnSettings(providerPreference: ProviderPreference) {
appSettingsManager.updateProviderSettings {
val newList = it.providers.toMutableList()
val indexOfProviderToReload = newList.indexOfFirst { savedProviderPreference ->
providerPreference.name.equals(savedProviderPreference.name, true)
&& providerPreference.filePath.equals(savedProviderPreference.filePath, true)
}

newList[indexOfProviderToReload] = newList[indexOfProviderToReload].copy(
name = providerPreference.name // Need to do this because name changes might occur for some instances.
)
private suspend fun reloadProviderOnSettings(
oldProviderData: ProviderData,
newProviderData: ProviderData
) {
val oldOrderPosition = getPositionIndexFromSettings(oldProviderData.name)
val oldPreference = appSettingsManager.cachedProviderSettings.providers[oldOrderPosition]

it.copy(providers = newList)
}
val localPrefix = if (oldPreference.filePath.contains(LOCAL_PATH_PREFIX)) LOCAL_PATH_PREFIX else null
val newPath = context.provideValidProviderPath(
newProviderData,
localPrefix = localPrefix
)

loadProviderOnSettings(
provider = oldPreference.copy(
name = newProviderData.name,
filePath = newPath.absolutePath
),
index = oldOrderPosition
)
}

suspend fun reloadProvider(providerData: ProviderData) {
if (!providers.containsKey(providerData.name)) throw IllegalArgumentException("No such provider: ${providerData.name}")

suspend fun reloadProvider(
oldProviderData: ProviderData,
newProviderData: ProviderData
) {
if (!providers.containsKey(oldProviderData.name))
throw IllegalArgumentException("No such provider: ${oldProviderData.name}")

unloadProvider(
providerData = providerData,
providerData = oldProviderData,
unloadOnSettings = false
)
loadProvider(
providerData = providerData,
needsDownload = true
)

reloadProviderOnSettings(
providerPreference = ProviderPreference(
name = providerData.name,
filePath = context.provideValidProviderPath(providerData).absolutePath,
isDisabled = false
)
oldProviderData = oldProviderData,
newProviderData = newProviderData
)

loadProvider(
providerData = newProviderData,
needsDownload = true
)
}

Expand Down Expand Up @@ -557,7 +594,8 @@ class ProviderManager @Inject constructor(
providerApiRepository.remove(providerData.name)
} else {
try {
val api = providers[providerData.name]?.getApi(context, client)
val api = providers[providerData.name]
?.getApi(context, client)

if (api != null) {
providerApiRepository.add(
Expand All @@ -580,23 +618,27 @@ class ProviderManager @Inject constructor(
isDisabled: Boolean
) {
appSettingsManager.updateProviderSettings {
val listOfSavedProviders = it.providers.toMutableList()
withDefaultContext {
val listOfSavedProviders = it.providers.toMutableList()

val indexOfProvider = listOfSavedProviders.indexOfFirst { provider ->
provider.name.equals(name, true)
}
val provider = listOfSavedProviders[indexOfProvider]
val indexOfProvider = listOfSavedProviders.indexOfFirst { provider ->
provider.name.equals(name, true)
}
val provider = listOfSavedProviders[indexOfProvider]

listOfSavedProviders[indexOfProvider] = provider.copy(isDisabled = isDisabled)
listOfSavedProviders[indexOfProvider] = provider.copy(isDisabled = isDisabled)

it.copy(providers = listOfSavedProviders.toList())
it.copy(providers = listOfSavedProviders.toList())
}
}
}

private fun getProviderPreference(name: String): ProviderPreference? {
return appSettingsManager.cachedProviderSettings
.providers
.find { it.name.equals(name, true) }
private suspend fun getPositionIndexFromSettings(name: String): Int {
return withDefaultContext {
appSettingsManager.cachedProviderSettings
.providers
.indexOfFirst { it.name.equals(name, true) }
}
}

/**
Expand Down
5 changes: 3 additions & 2 deletions data/provider/src/main/kotlin/com/flixclusive/data/provider/util/FileHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ internal fun rmrf(file: File) {
}

fun Context.provideValidProviderPath(
providerData: ProviderData
) = File("${filesDir}/$PROVIDERS_FOLDER/${buildValidFilename(providerData.repositoryUrl!!)}/${buildValidFilename(providerData.name)}.flx")
providerData: ProviderData,
localPrefix: String? = null
) = File("${localPrefix ?: "${filesDir}/$PROVIDERS_FOLDER/"}${buildValidFilename(providerData.repositoryUrl!!)}/${buildValidFilename(providerData.name)}.flx")

/**
* Mutate the given filename to make it valid for a FAT filesystem,
Expand Down
13 changes: 8 additions & 5 deletions domain/updater/src/main/kotlin/com/flixclusive/domain/updater/ProviderUpdaterUseCase.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import java.util.Collections
import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.inject.Singleton
import com.flixclusive.core.ui.common.R as UiCommonR
import com.flixclusive.core.locale.R as LocaleR
import com.flixclusive.core.ui.common.R as UiCommonR


private typealias VersionCode = Long
Expand Down Expand Up @@ -180,15 +180,18 @@ class ProviderUpdaterUseCase @Inject constructor(
}

suspend fun updateProvider(providerName: String): Boolean {
val providerData = providerManager.providerDataList.find {
val oldProviderData = providerManager.providerDataList.find {
it.name.equals(providerName, true)
} ?: throw NoSuchElementException("No such provider data: $providerName")

val updateInfo = getLatestProviderData(providerName)
val newProviderData = getLatestProviderData(providerName)
?: return false

providerManager.reloadProvider(providerData)
updatedProvidersMap[providerName] = updateInfo.versionCode
providerManager.reloadProvider(
oldProviderData,
newProviderData
)
updatedProvidersMap[providerName] = newProviderData.versionCode
return true
}

Expand Down
3 changes: 2 additions & 1 deletion .../provider-list/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreen.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import androidx.compose.ui.text.withStyle
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.util.fastFilter
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.flixclusive.core.theme.FlixclusiveTheme
Expand Down Expand Up @@ -112,7 +113,7 @@ internal fun ProvidersScreen(
val filteredProviders by remember {
derivedStateOf {
when (viewModel.searchQuery.isNotEmpty() && searchExpanded.value) {
true -> viewModel.providerDataList.filter {
true -> viewModel.providerDataList.fastFilter {
it.name.contains(viewModel.searchQuery, true)
}
false -> null
Expand Down
1 change: 1 addition & 0 deletions .../datastore/src/main/kotlin/com/flixclusive/model/datastore/provider/ProviderPreference.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ data class ProviderPreference(
val name: String,
val filePath: String,
val isDisabled: Boolean,
// TODO: Add lastUsedForSearching property
) {
override fun equals(other: Any?): Boolean {
return when(other) {
Expand Down

0 comments on commit 25151fd

Please sign in to comment.