From 410922f15b52d39c63eeb170d2e3e3b0cab52b0f Mon Sep 17 00:00:00 2001 From: grakovne Date: Mon, 11 Nov 2024 14:13:56 +0100 Subject: [PATCH] wip --- .../AudiobookshelfChannelProvider.kt | 6 +++--- ...nnel.kt => UnknownAudiobookshelfChannel.kt} | 18 ++++++++++++++---- .../common/api/AudiobookshelfAuthService.kt | 2 +- .../grakovne/lissen/channel/common/AuthType.kt | 2 +- .../lissen/content/LissenMediaProvider.kt | 16 ++++++---------- 5 files changed, 25 insertions(+), 19 deletions(-) rename app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/{CommonAudiobookshelfChannel.kt => UnknownAudiobookshelfChannel.kt} (76%) diff --git a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/AudiobookshelfChannelProvider.kt b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/AudiobookshelfChannelProvider.kt index 6fe52069..cc5e8abd 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/AudiobookshelfChannelProvider.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/AudiobookshelfChannelProvider.kt @@ -1,6 +1,6 @@ package org.grakovne.lissen.channel.audiobookshelf -import org.grakovne.lissen.channel.audiobookshelf.common.CommonAudiobookshelfChannel +import org.grakovne.lissen.channel.audiobookshelf.common.UnknownAudiobookshelfChannel import org.grakovne.lissen.channel.audiobookshelf.common.api.AudiobookshelfAuthService import org.grakovne.lissen.channel.audiobookshelf.library.LibraryAudiobookshelfChannel import org.grakovne.lissen.channel.audiobookshelf.podcast.PodcastAudiobookshelfChannel @@ -17,7 +17,7 @@ import javax.inject.Singleton class AudiobookshelfChannelProvider @Inject constructor( private val podcastAudiobookshelfChannel: PodcastAudiobookshelfChannel, private val libraryAudiobookshelfChannel: LibraryAudiobookshelfChannel, - private val commonAudiobookshelfChannel: CommonAudiobookshelfChannel, + private val unknownAudiobookshelfChannel: UnknownAudiobookshelfChannel, private val audiobookshelfAuthService: AudiobookshelfAuthService, private val sharedPreferences: LissenSharedPreferences ) : ChannelProvider { @@ -31,7 +31,7 @@ class AudiobookshelfChannelProvider @Inject constructor( return when (libraryType) { LibraryType.LIBRARY -> libraryAudiobookshelfChannel LibraryType.PODCAST -> podcastAudiobookshelfChannel - LibraryType.UNKNOWN -> commonAudiobookshelfChannel + LibraryType.UNKNOWN -> unknownAudiobookshelfChannel } } diff --git a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/CommonAudiobookshelfChannel.kt b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/UnknownAudiobookshelfChannel.kt similarity index 76% rename from app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/CommonAudiobookshelfChannel.kt rename to app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/UnknownAudiobookshelfChannel.kt index 60539533..c7cc60ea 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/CommonAudiobookshelfChannel.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/UnknownAudiobookshelfChannel.kt @@ -17,7 +17,7 @@ import javax.inject.Inject import javax.inject.Singleton @Singleton -class CommonAudiobookshelfChannel @Inject constructor( +class UnknownAudiobookshelfChannel @Inject constructor( dataRepository: AudioBookshelfDataRepository, mediaRepository: AudioBookshelfMediaRepository, recentListeningResponseConverter: RecentListeningResponseConverter, @@ -37,9 +37,19 @@ class CommonAudiobookshelfChannel @Inject constructor( override fun getLibraryType(): LibraryType = LibraryType.UNKNOWN - override suspend fun fetchBooks(libraryId: String, pageSize: Int, pageNumber: Int): ApiResult> = ApiResult.Error(ApiError.UnsupportedError) + override suspend fun fetchBooks( + libraryId: String, + pageSize: Int, + pageNumber: Int + ): ApiResult> = ApiResult.Error(ApiError.UnsupportedError) - override suspend fun searchBooks(libraryId: String, query: String, limit: Int): ApiResult> = ApiResult.Error(ApiError.UnsupportedError) + override suspend fun searchBooks( + libraryId: String, + query: String, + limit: Int + ): ApiResult> = ApiResult.Error(ApiError.UnsupportedError) - override suspend fun fetchBook(bookId: String): ApiResult = ApiResult.Error(ApiError.UnsupportedError) + override suspend fun fetchBook( + bookId: String + ): ApiResult = ApiResult.Error(ApiError.UnsupportedError) } diff --git a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/api/AudiobookshelfAuthService.kt b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/api/AudiobookshelfAuthService.kt index 78d16b2e..229df20e 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/api/AudiobookshelfAuthService.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/audiobookshelf/common/api/AudiobookshelfAuthService.kt @@ -56,5 +56,5 @@ class AudiobookshelfAuthService @Inject constructor( ) } - override fun getAuthType(): AuthType = AuthType.AUDIOBOOKSHELF_CREDENTIALS + override fun getAuthType(): AuthType = AuthType.CREDENTIALS } diff --git a/app/src/main/java/org/grakovne/lissen/channel/common/AuthType.kt b/app/src/main/java/org/grakovne/lissen/channel/common/AuthType.kt index a4342f0d..349c8e14 100644 --- a/app/src/main/java/org/grakovne/lissen/channel/common/AuthType.kt +++ b/app/src/main/java/org/grakovne/lissen/channel/common/AuthType.kt @@ -1,5 +1,5 @@ package org.grakovne.lissen.channel.common enum class AuthType { - AUDIOBOOKSHELF_CREDENTIALS + CREDENTIALS } diff --git a/app/src/main/java/org/grakovne/lissen/content/LissenMediaProvider.kt b/app/src/main/java/org/grakovne/lissen/content/LissenMediaProvider.kt index 9b6102a6..4e2ee84d 100644 --- a/app/src/main/java/org/grakovne/lissen/content/LissenMediaProvider.kt +++ b/app/src/main/java/org/grakovne/lissen/content/LissenMediaProvider.kt @@ -224,17 +224,13 @@ class LissenMediaProvider @Inject constructor( return page.copy(items = items) } - fun provideAuthService(): ChannelAuthService { - return channels[sharedPreferences.getChannel()] - ?.provideChannelAuth() - ?: throw IllegalStateException("Selected auth service has been requested but not selected") - } + fun provideAuthService(): ChannelAuthService = channels[sharedPreferences.getChannel()] + ?.provideChannelAuth() + ?: throw IllegalStateException("Selected auth service has been requested but not selected") - fun providePreferredChannel(): MediaChannel { - return channels[sharedPreferences.getChannel()] - ?.provideMediaChannel() - ?: throw IllegalStateException("Selected auth service has been requested but not selected") - } + fun providePreferredChannel(): MediaChannel = channels[sharedPreferences.getChannel()] + ?.provideMediaChannel() + ?: throw IllegalStateException("Selected auth service has been requested but not selected") companion object {