bbara/Purefin
1
0
Fork 0
mirror of https://github.com/bbara04/Purefin.git synced 2026-07-23 19:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: moved packages from data/core into /data in the data module

Browse Source
This commit is contained in:
Barnabas Balogh
2026-04-24 08:37:45 +02:00
parent 3f7c1966af
commit 8423e63937
113 changed files with 285 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreenContentTest.kt
View File

@@ -13,8 +13,8 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performKeyInput
import androidx.compose.ui.test.pressKey
import androidx.compose.ui.input.key.Key
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.ui.theme.AppTheme
import hu.bbara.purefin.ui.screen.episode.components.EpisodePlayButtonTag
import org.junit.Assert.assertEquals

6
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/home/components/TvHomeContentTest.kt
View File

@@ -16,9 +16,9 @@ import androidx.compose.ui.test.performKeyInput
import androidx.compose.ui.test.pressKey
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.core.ui.model.EpisodeUiModel
import hu.bbara.purefin.core.ui.model.MediaUiModel
import hu.bbara.purefin.core.ui.model.MovieUiModel

2
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreenTest.kt
View File

@@ -4,7 +4,7 @@ import androidx.activity.ComponentActivity
import androidx.compose.ui.test.junit4.createAndroidComposeRule
import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.test.performClick
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.ui.theme.AppTheme
import org.junit.Assert.assertEquals

4
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/movie/MovieScreenContentTest.kt
View File

@@ -13,8 +13,8 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performKeyInput
import androidx.compose.ui.test.pressKey
import androidx.compose.ui.input.key.Key
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.ui.theme.AppTheme
import hu.bbara.purefin.ui.screen.movie.components.MoviePlayButtonTag
import org.junit.Assert.assertEquals

8
app-tv/src/androidTest/java/hu/bbara/purefin/ui/screen/series/SeriesScreenContentTest.kt
View File

@@ -11,10 +11,10 @@ import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performKeyInput
import androidx.compose.ui.test.pressKey
import androidx.compose.ui.input.key.Key
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.ui.theme.AppTheme
import hu.bbara.purefin.ui.screen.series.components.SeriesFirstSeasonTabTag
import hu.bbara.purefin.ui.screen.series.components.SeriesPlayButtonTag

2
app-tv/src/main/java/hu/bbara/purefin/modules/TvPlaybackProfileFamilyModule.kt
View File

@@ -4,7 +4,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.PlaybackProfileFamily
import hu.bbara.purefin.data.PlaybackProfileFamily
@Module
@InstallIn(SingletonComponent::class)

4
app-tv/src/main/java/hu/bbara/purefin/tv/TvActivity.kt
View File

@@ -36,8 +36,8 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
import coil3.request.crossfade
import coil3.util.DebugLogger
import dagger.hilt.android.AndroidEntryPoint
import hu.bbara.purefin.core.data.SessionBootstrapper
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.SessionBootstrapper
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.core.navigation.NavigationCommand
import hu.bbara.purefin.core.navigation.NavigationManager
import hu.bbara.purefin.core.navigation.Route

4
app-tv/src/main/java/hu/bbara/purefin/ui/common/media/MediaDetailShell.kt
View File

@@ -32,8 +32,8 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.image.ArtworkKind
internal val MediaDetailHorizontalPadding = 48.dp
private val MediaDetailHeaderTopPadding = 104.dp

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/TvAppScreen.kt
View File

@@ -15,7 +15,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.LifecycleResumeEffect
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.feature.browse.home.AppViewModel
import hu.bbara.purefin.ui.screen.home.TvHomeScreen
import hu.bbara.purefin.ui.screen.home.components.TvDrawerDestination

6
app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/TvEpisodeScreen.kt
View File

@@ -21,13 +21,13 @@ import hu.bbara.purefin.ui.common.media.MediaDetailSectionTitle
import hu.bbara.purefin.ui.common.media.TvMediaDetailBodyBox
import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
import hu.bbara.purefin.ui.screen.episode.components.TvEpisodeHeroSection
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LocalNavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
@Composable
fun TvEpisodeScreen(

3
app-tv/src/main/java/hu/bbara/purefin/ui/screen/episode/components/TvEpisodeComponents.kt
View File

@@ -1,6 +1,5 @@
package hu.bbara.purefin.ui.screen.episode.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,7 +21,7 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.model.Episode
internal const val EpisodePlayButtonTag = "episode-play-button"

3
app-tv/src/main/java/hu/bbara/purefin/ui/screen/libraries/TvLibrariesOverviewScreen.kt
View File

@@ -18,7 +18,6 @@ import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.itemsIndexed
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Collections
import androidx.compose.material.icons.outlined.Movie
import androidx.compose.material.icons.outlined.Tv
import androidx.compose.material3.Icon
@@ -45,7 +44,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.model.LibraryKind
internal const val TvLibrariesOverviewItemTagPrefix = "tv-libraries-overview-item-"

2
app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/TvMovieScreen.kt
View File

@@ -23,7 +23,7 @@ import hu.bbara.purefin.ui.common.media.TvMediaDetailScaffold
import hu.bbara.purefin.ui.common.media.tvMediaDetailBackgroundImageUrl
import hu.bbara.purefin.ui.screen.movie.components.TvMovieHeroSection
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
@Composable

3
app-tv/src/main/java/hu/bbara/purefin/ui/screen/movie/components/TvMovieComponents.kt
View File

@@ -1,6 +1,5 @@
package hu.bbara.purefin.ui.screen.movie.components
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
@@ -22,7 +21,7 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.Movie
internal const val MoviePlayButtonTag = "movie-play-button"

4
app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/TvSeriesScreen.kt
View File

@@ -28,8 +28,8 @@ import hu.bbara.purefin.ui.screen.series.components.TvEpisodeCarousel
import hu.bbara.purefin.ui.screen.series.components.TvSeasonTabs
import hu.bbara.purefin.ui.screen.series.components.TvSeriesHeroSection
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.feature.content.series.SeriesViewModel
import java.util.UUID

12
app-tv/src/main/java/hu/bbara/purefin/ui/screen/series/components/TvSeriesComponents.kt
View File

@@ -59,13 +59,13 @@ import hu.bbara.purefin.ui.common.badge.WatchStateBadge
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.ui.common.media.mediaPlaybackProgress
import hu.bbara.purefin.ui.common.media.mediaPlayButtonText
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.feature.content.series.SeriesViewModel
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
internal const val SeriesPlayButtonTag = "series-play-button"
internal const val SeriesFirstSeasonTabTag = "series-first-season-tab"

12
app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvFocusedItemHeroTest.kt
View File

@@ -1,14 +1,14 @@
package hu.bbara.purefin.ui.screen.home.components
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.MediaKind
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.MediaKind
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
import hu.bbara.purefin.feature.browse.home.NextUpItem
import hu.bbara.purefin.feature.browse.home.PosterItem
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
import org.junit.Assert.assertEquals
import org.junit.Test
import java.util.UUID

8
app-tv/src/test/java/hu/bbara/purefin/ui/screen/home/components/TvHomeHeroStateTest.kt
View File

@@ -1,9 +1,9 @@
package hu.bbara.purefin.ui.screen.home.components
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.core.model.MediaKind
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.model.MediaKind
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.feature.browse.home.ContinueWatchingItem
import hu.bbara.purefin.feature.browse.home.LibraryItem
import hu.bbara.purefin.feature.browse.home.NextUpItem

4
app/src/main/java/hu/bbara/purefin/PurefinActivity.kt
View File

@@ -36,9 +36,9 @@ import coil3.network.okhttp.OkHttpNetworkFetcherFactory
import coil3.request.crossfade
import coil3.util.DebugLogger
import dagger.hilt.android.AndroidEntryPoint
import hu.bbara.purefin.core.data.SessionBootstrapper
import hu.bbara.purefin.data.SessionBootstrapper
import hu.bbara.purefin.data.jellyfin.client.JellyfinAuthInterceptor
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.navigation.LocalNavigationBackStack
import hu.bbara.purefin.navigation.LocalNavigationManager
import hu.bbara.purefin.core.navigation.NavigationCommand

2
app/src/main/java/hu/bbara/purefin/modules/PlaybackProfileFamilyModule.kt
View File

@@ -4,7 +4,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.PlaybackProfileFamily
import hu.bbara.purefin.data.PlaybackProfileFamily
@Module
@InstallIn(SingletonComponent::class)

8
app/src/main/java/hu/bbara/purefin/ui/screen/episode/EpisodeScreen.kt
View File

@@ -35,18 +35,18 @@ import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.common.media.MediaHero
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LocalNavigationBackStack
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.feature.content.episode.EpisodeScreenViewModel
import hu.bbara.purefin.ui.screen.episode.components.EpisodeDetails
import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBar
import hu.bbara.purefin.ui.screen.episode.components.EpisodeTopBarShortcut
import hu.bbara.purefin.ui.theme.AppTheme
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
import java.util.UUID
@Composable

2
app/src/main/java/hu/bbara/purefin/ui/screen/episode/components/EpisodeComponents.kt
View File

@@ -43,7 +43,7 @@ import hu.bbara.purefin.ui.common.button.MediaActionButton
import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.player.PlayerActivity
internal sealed interface EpisodeTopBarShortcut {

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchOverlay.kt
View File

@@ -37,7 +37,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import hu.bbara.purefin.feature.search.SearchViewModel
import java.util.UUID
import hu.bbara.purefin.core.model.MediaKind
import hu.bbara.purefin.model.MediaKind
@OptIn(ExperimentalMaterial3Api::class)
@Composable

2
app/src/main/java/hu/bbara/purefin/ui/screen/home/components/search/HomeSearchResultCard.kt
View File

@@ -17,7 +17,7 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import hu.bbara.purefin.core.model.MediaKind
import hu.bbara.purefin.model.MediaKind
import hu.bbara.purefin.feature.search.SearchResult
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage

8
app/src/main/java/hu/bbara/purefin/ui/screen/movie/MovieScreen.kt
View File

@@ -34,15 +34,15 @@ import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.common.media.MediaHero
import hu.bbara.purefin.ui.common.media.MediaMetadataFlowRow
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.MovieDto
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.feature.content.movie.MovieScreenViewModel
import hu.bbara.purefin.ui.screen.movie.components.MovieDetails
import hu.bbara.purefin.ui.screen.movie.components.MovieTopBar
import hu.bbara.purefin.ui.theme.AppTheme
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
import java.util.UUID
@Composable

2
app/src/main/java/hu/bbara/purefin/ui/screen/movie/components/MovieComponents.kt
View File

@@ -38,7 +38,7 @@ import hu.bbara.purefin.ui.common.button.MediaActionButton
import hu.bbara.purefin.ui.common.media.MediaPlaybackSettings
import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.player.PlayerActivity
@Composable

12
app/src/main/java/hu/bbara/purefin/ui/screen/series/SeriesScreen.kt
View File

@@ -34,12 +34,12 @@ import hu.bbara.purefin.ui.common.media.MediaSynopsis
import hu.bbara.purefin.ui.screen.waiting.PurefinWaitingScreen
import hu.bbara.purefin.ui.common.media.MediaHero
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.SeriesDto
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.feature.content.series.SeriesViewModel
import hu.bbara.purefin.ui.screen.series.components.CastRow
import hu.bbara.purefin.ui.screen.series.components.EpisodeCarousel
@@ -49,7 +49,7 @@ import hu.bbara.purefin.ui.screen.series.components.SeriesDownloadOption
import hu.bbara.purefin.ui.screen.series.components.SeriesMetaChips
import hu.bbara.purefin.ui.screen.series.components.SeriesTopBar
import hu.bbara.purefin.ui.theme.AppTheme
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
import java.util.UUID
@Composable

12
app/src/main/java/hu/bbara/purefin/ui/screen/series/components/SeriesComponents.kt
View File

@@ -66,17 +66,17 @@ import hu.bbara.purefin.ui.common.button.MediaResumeButton
import hu.bbara.purefin.ui.common.image.PurefinAsyncImage
import hu.bbara.purefin.ui.common.badge.WatchStateBadge
import hu.bbara.purefin.core.download.DownloadState
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.core.navigation.EpisodeDto
import hu.bbara.purefin.navigation.LocalNavigationManager
import hu.bbara.purefin.core.navigation.Route
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.feature.content.series.SeriesViewModel
import hu.bbara.purefin.player.PlayerActivity
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.image.ArtworkKind
@Composable
internal fun SeriesTopBar(

2
data/src/main/java/hu/bbara/purefin/core/data/AuthenticationRepository.kt → data/src/main/java/hu/bbara/purefin/data/AuthenticationRepository.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
interface AuthenticationRepository {
suspend fun login(url: String, username: String, password: String): Boolean

10
data/src/main/java/hu/bbara/purefin/core/data/DownloadMediaSourceResolver.kt → data/src/main/java/hu/bbara/purefin/data/DownloadMediaSourceResolver.kt
View File

@@ -1,9 +1,9 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import java.util.UUID
interface DownloadMediaSourceResolver {

2
data/src/main/java/hu/bbara/purefin/core/data/EpisodeSeriesLookup.kt → data/src/main/java/hu/bbara/purefin/data/EpisodeSeriesLookup.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import java.util.UUID

6
data/src/main/java/hu/bbara/purefin/core/data/HomeRepository.kt → data/src/main/java/hu/bbara/purefin/data/HomeRepository.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import hu.bbara.purefin.core.model.Library
import hu.bbara.purefin.core.model.Media
import hu.bbara.purefin.model.Library
import hu.bbara.purefin.model.Media
import kotlinx.coroutines.flow.StateFlow
import java.util.UUID

8
data/src/main/java/hu/bbara/purefin/core/data/MediaCatalogReader.kt → data/src/main/java/hu/bbara/purefin/data/MediaCatalogReader.kt
View File

@@ -1,8 +1,8 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import java.util.UUID
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.StateFlow

2
data/src/main/java/hu/bbara/purefin/core/data/MediaProgressWriter.kt → data/src/main/java/hu/bbara/purefin/data/MediaProgressWriter.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/data/NetworkMonitor.kt → data/src/main/java/hu/bbara/purefin/data/NetworkMonitor.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import kotlinx.coroutines.flow.Flow

8
data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogReader.kt → data/src/main/java/hu/bbara/purefin/data/OfflineCatalogReader.kt
View File

@@ -1,8 +1,8 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import java.util.UUID
import kotlinx.coroutines.flow.StateFlow

10
data/src/main/java/hu/bbara/purefin/core/data/OfflineCatalogStore.kt → data/src/main/java/hu/bbara/purefin/data/OfflineCatalogStore.kt
View File

@@ -1,9 +1,9 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import java.util.UUID
interface OfflineCatalogStore {

4
data/src/main/java/hu/bbara/purefin/core/data/PlayableMediaRepository.kt → data/src/main/java/hu/bbara/purefin/data/PlayableMediaRepository.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import androidx.media3.common.MediaItem
import hu.bbara.purefin.core.model.MediaSegment
import hu.bbara.purefin.model.MediaSegment
import java.util.UUID
interface PlayableMediaRepository {

2
data/src/main/java/hu/bbara/purefin/core/data/PlaybackMethod.kt → data/src/main/java/hu/bbara/purefin/data/PlaybackMethod.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
enum class PlaybackMethod {
DIRECT_PLAY,

2
data/src/main/java/hu/bbara/purefin/core/data/PlaybackProfileFamily.kt → data/src/main/java/hu/bbara/purefin/data/PlaybackProfileFamily.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
enum class PlaybackProfileFamily {
MOBILE,

2
data/src/main/java/hu/bbara/purefin/core/data/PlaybackProgressReporter.kt → data/src/main/java/hu/bbara/purefin/data/PlaybackProgressReporter.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/data/PlaybackReportContext.kt → data/src/main/java/hu/bbara/purefin/data/PlaybackReportContext.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
data class PlaybackReportContext(
val playMethod: PlaybackMethod,

2
data/src/main/java/hu/bbara/purefin/core/data/SessionBootstrapper.kt → data/src/main/java/hu/bbara/purefin/data/SessionBootstrapper.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
interface SessionBootstrapper {
suspend fun initialize()

2
data/src/main/java/hu/bbara/purefin/core/data/SmartDownloadStore.kt → data/src/main/java/hu/bbara/purefin/data/SmartDownloadStore.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data
package hu.bbara.purefin.data
import java.util.UUID
import kotlinx.coroutines.flow.Flow

18
data/src/main/java/hu/bbara/purefin/data/catalog/CompositeMediaRepository.kt
View File

@@ -1,14 +1,11 @@
package hu.bbara.purefin.data.catalog
import hu.bbara.purefin.core.data.MediaCatalogReader
import hu.bbara.purefin.core.data.MediaProgressWriter
import hu.bbara.purefin.core.data.NetworkMonitor
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.data.MediaProgressWriter
import hu.bbara.purefin.data.NetworkMonitor
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -20,6 +17,9 @@ import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.stateIn
import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
@OptIn(ExperimentalCoroutinesApi::class)
@Singleton

4
data/src/main/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookup.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.data.catalog
import hu.bbara.purefin.core.data.EpisodeSeriesLookup
import hu.bbara.purefin.core.data.MediaCatalogReader
import hu.bbara.purefin.data.EpisodeSeriesLookup
import hu.bbara.purefin.data.MediaCatalogReader
import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton

24
data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryAppContentRepository.kt
View File

@@ -2,18 +2,18 @@ package hu.bbara.purefin.data.catalog
import android.util.Log
import androidx.datastore.core.DataStore
import hu.bbara.purefin.core.data.HomeRepository
import hu.bbara.purefin.core.data.NetworkMonitor
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Library
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.core.model.Media
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.data.HomeRepository
import hu.bbara.purefin.data.NetworkMonitor
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.image.ArtworkKind
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Library
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.model.Media
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import hu.bbara.purefin.data.offline.cache.HomeCache
import hu.bbara.purefin.data.offline.cache.toCachedEpisode

16
data/src/main/java/hu/bbara/purefin/data/catalog/InMemoryMediaRepository.kt
View File

@@ -1,14 +1,14 @@
package hu.bbara.purefin.data.catalog
import hu.bbara.purefin.core.data.MediaCatalogReader
import hu.bbara.purefin.core.data.MediaProgressWriter
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.data.MediaProgressWriter
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.util.Locale

10
data/src/main/java/hu/bbara/purefin/data/catalog/MediaRepositoryModule.kt
View File

@@ -4,11 +4,11 @@ import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.EpisodeSeriesLookup
import hu.bbara.purefin.core.data.HomeRepository
import hu.bbara.purefin.core.data.MediaCatalogReader
import hu.bbara.purefin.core.data.MediaProgressWriter
import hu.bbara.purefin.core.data.OfflineCatalogReader
import hu.bbara.purefin.data.EpisodeSeriesLookup
import hu.bbara.purefin.data.HomeRepository
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.data.MediaProgressWriter
import hu.bbara.purefin.data.OfflineCatalogReader
@Module
@InstallIn(SingletonComponent::class)

12
data/src/main/java/hu/bbara/purefin/data/catalog/OfflineMediaRepository.kt
View File

@@ -1,12 +1,12 @@
package hu.bbara.purefin.data.catalog
import hu.bbara.purefin.core.data.MediaCatalogReader
import hu.bbara.purefin.core.data.MediaProgressWriter
import hu.bbara.purefin.core.data.OfflineCatalogReader
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.data.MediaProgressWriter
import hu.bbara.purefin.data.OfflineCatalogReader
import hu.bbara.purefin.data.offline.room.offline.OfflineRoomMediaLocalDataSource
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/ConnectivityNetworkMonitor.kt
View File

@@ -6,7 +6,7 @@ import android.net.Network
import android.net.NetworkCapabilities
import android.net.NetworkRequest
import dagger.hilt.android.qualifiers.ApplicationContext
import hu.bbara.purefin.core.data.NetworkMonitor
import hu.bbara.purefin.data.NetworkMonitor
import kotlinx.coroutines.channels.awaitClose
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.callbackFlow

14
data/src/main/java/hu/bbara/purefin/data/jellyfin/DefaultPlayableMediaRepository.kt
View File

@@ -6,13 +6,13 @@ import androidx.core.net.toUri
import androidx.media3.common.MediaItem
import androidx.media3.common.MediaMetadata
import androidx.media3.common.util.UnstableApi
import hu.bbara.purefin.core.data.PlayableMediaRepository
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.core.image.ArtworkKind
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.model.MediaSegment
import hu.bbara.purefin.core.model.SegmentType
import hu.bbara.purefin.data.PlayableMediaRepository
import hu.bbara.purefin.data.PlaybackReportContext
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.image.ArtworkKind
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.model.SegmentType
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import hu.bbara.purefin.data.jellyfin.playback.JellyfinPlaybackResolver
import hu.bbara.purefin.data.jellyfin.playback.PlaybackDecision

12
data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinBindingsModule.kt
View File

@@ -4,12 +4,12 @@ import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.AuthenticationRepository
import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
import hu.bbara.purefin.core.data.NetworkMonitor
import hu.bbara.purefin.core.data.PlayableMediaRepository
import hu.bbara.purefin.core.data.PlaybackProgressReporter
import hu.bbara.purefin.core.data.SessionBootstrapper
import hu.bbara.purefin.data.AuthenticationRepository
import hu.bbara.purefin.data.DownloadMediaSourceResolver
import hu.bbara.purefin.data.NetworkMonitor
import hu.bbara.purefin.data.PlayableMediaRepository
import hu.bbara.purefin.data.PlaybackProgressReporter
import hu.bbara.purefin.data.SessionBootstrapper
import hu.bbara.purefin.data.jellyfin.download.JellyfinDownloadMediaSourceResolver
import hu.bbara.purefin.data.jellyfin.session.JellyfinAuthenticationRepository
import hu.bbara.purefin.data.jellyfin.session.JellyfinSessionBootstrapper

4
data/src/main/java/hu/bbara/purefin/data/jellyfin/JellyfinPlaybackProgressReporter.kt
View File

@@ -1,8 +1,8 @@
package hu.bbara.purefin.data.jellyfin
import hu.bbara.purefin.core.data.PlaybackProgressReporter
import hu.bbara.purefin.data.PlaybackProgressReporter
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.data.PlaybackReportContext
import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton

6
data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinApiClient.kt
View File

@@ -3,9 +3,9 @@ package hu.bbara.purefin.data.jellyfin.client
import android.content.Context
import android.util.Log
import dagger.hilt.android.qualifiers.ApplicationContext
import hu.bbara.purefin.core.data.PlaybackMethod
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.PlaybackMethod
import hu.bbara.purefin.data.PlaybackReportContext
import hu.bbara.purefin.data.session.UserSessionRepository
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.withContext

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/client/JellyfinAuthInterceptor.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.jellyfin.client
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.session.UserSessionRepository
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob

10
data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMappers.kt
View File

@@ -1,10 +1,10 @@
package hu.bbara.purefin.data.jellyfin.download
import hu.bbara.purefin.core.image.ImageUrlBuilder
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.image.ImageUrlBuilder
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import java.util.UUID
import java.util.concurrent.TimeUnit
import org.jellyfin.sdk.model.api.BaseItemDto

10
data/src/main/java/hu/bbara/purefin/data/jellyfin/download/JellyfinDownloadMediaSourceResolver.kt
View File

@@ -1,10 +1,10 @@
package hu.bbara.purefin.data.jellyfin.download
import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
import hu.bbara.purefin.core.data.EpisodeDownloadSource
import hu.bbara.purefin.core.data.MovieDownloadSource
import hu.bbara.purefin.core.data.PlaybackMethod
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.DownloadMediaSourceResolver
import hu.bbara.purefin.data.EpisodeDownloadSource
import hu.bbara.purefin.data.MovieDownloadSource
import hu.bbara.purefin.data.PlaybackMethod
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import hu.bbara.purefin.data.jellyfin.playback.PlaybackDecisionResolver
import hu.bbara.purefin.data.jellyfin.playback.playbackCustomCacheKey

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/JellyfinPlaybackResolver.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.data.jellyfin.playback
import android.util.Log
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import java.util.UUID
import java.util.concurrent.ConcurrentHashMap

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeys.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.jellyfin.playback
import hu.bbara.purefin.core.data.PlaybackMethod
import hu.bbara.purefin.data.PlaybackMethod
fun playbackCustomCacheKey(
mediaId: String,

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecision.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.jellyfin.playback
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.data.PlaybackReportContext
import org.jellyfin.sdk.model.api.MediaSourceInfo
data class PlaybackDecision(

5
data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolver.kt
View File

@@ -1,10 +1,9 @@
package hu.bbara.purefin.data.jellyfin.playback
import hu.bbara.purefin.core.data.PlaybackMethod
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.data.PlaybackMethod
import hu.bbara.purefin.data.PlaybackReportContext
import org.jellyfin.sdk.model.api.MediaProtocol
import org.jellyfin.sdk.model.api.MediaSourceInfo
import org.jellyfin.sdk.model.api.PlayMethod
internal object PlaybackDecisionResolver {
fun resolve(

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackProfileModule.kt
View File

@@ -4,7 +4,7 @@ import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.PlaybackProfileFamily
import hu.bbara.purefin.data.PlaybackProfileFamily
import javax.inject.Singleton
@Module

4
data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinAuthenticationRepository.kt
View File

@@ -1,8 +1,8 @@
package hu.bbara.purefin.data.jellyfin.session
import android.util.Log
import hu.bbara.purefin.core.data.AuthenticationRepository
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.AuthenticationRepository
import hu.bbara.purefin.data.session.UserSessionRepository
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import javax.inject.Inject
import javax.inject.Singleton

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/session/JellyfinSessionBootstrapper.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.jellyfin.session
import hu.bbara.purefin.core.data.SessionBootstrapper
import hu.bbara.purefin.data.SessionBootstrapper
import hu.bbara.purefin.data.jellyfin.client.JellyfinApiClient
import javax.inject.Inject
import javax.inject.Singleton

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSession.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.data.jellyfin.session
import kotlinx.serialization.Serializable
import hu.bbara.purefin.core.navigation.UuidSerializer
import hu.bbara.purefin.navigation.UuidSerializer
import java.util.UUID
@Serializable

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionModule.kt
View File

@@ -10,7 +10,7 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.session.UserSessionRepository
import javax.inject.Singleton
@Module

2
data/src/main/java/hu/bbara/purefin/data/jellyfin/session/UserSessionRepository.kt
View File

@@ -1,7 +1,7 @@
package hu.bbara.purefin.data.jellyfin.session
import androidx.datastore.core.DataStore
import hu.bbara.purefin.core.data.session.UserSessionRepository
import hu.bbara.purefin.data.session.UserSessionRepository
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first

4
data/src/main/java/hu/bbara/purefin/data/offline/OfflineBindingsModule.kt
View File

@@ -4,8 +4,8 @@ import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import hu.bbara.purefin.core.data.OfflineCatalogStore
import hu.bbara.purefin.core.data.SmartDownloadStore
import hu.bbara.purefin.data.OfflineCatalogStore
import hu.bbara.purefin.data.SmartDownloadStore
@Module
@InstallIn(SingletonComponent::class)

10
data/src/main/java/hu/bbara/purefin/data/offline/RoomOfflineCatalogStore.kt
View File

@@ -1,11 +1,11 @@
package hu.bbara.purefin.data.offline
import hu.bbara.purefin.core.data.OfflineCatalogStore
import hu.bbara.purefin.data.OfflineCatalogStore
import hu.bbara.purefin.data.offline.room.offline.OfflineRoomMediaLocalDataSource
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton

2
data/src/main/java/hu/bbara/purefin/data/offline/RoomSmartDownloadStore.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.offline
import hu.bbara.purefin.core.data.SmartDownloadStore
import hu.bbara.purefin.data.SmartDownloadStore
import hu.bbara.purefin.data.offline.room.dao.SmartDownloadDao
import hu.bbara.purefin.data.offline.room.entity.SmartDownloadEntity
import java.util.UUID

14
data/src/main/java/hu/bbara/purefin/data/offline/cache/HomeCache.kt vendored
View File

@@ -1,12 +1,12 @@
package hu.bbara.purefin.data.offline.cache
import hu.bbara.purefin.core.model.CastMember
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Library
import hu.bbara.purefin.core.model.LibraryKind
import hu.bbara.purefin.core.model.Media
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.CastMember
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Library
import hu.bbara.purefin.model.LibraryKind
import hu.bbara.purefin.model.Media
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import kotlinx.serialization.Serializable
import java.util.UUID

8
data/src/main/java/hu/bbara/purefin/data/offline/room/offline/OfflineRoomMediaLocalDataSource.kt
View File

@@ -9,10 +9,10 @@ import hu.bbara.purefin.data.offline.room.entity.EpisodeEntity
import hu.bbara.purefin.data.offline.room.entity.MovieEntity
import hu.bbara.purefin.data.offline.room.entity.SeasonEntity
import hu.bbara.purefin.data.offline.room.entity.SeriesEntity
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Season
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Season
import hu.bbara.purefin.model.Series
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/data/session/UserSessionRepository.kt → data/src/main/java/hu/bbara/purefin/data/session/UserSessionRepository.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.data.session
package hu.bbara.purefin.data.session
import java.util.UUID
import kotlinx.coroutines.flow.Flow

2
data/src/main/java/hu/bbara/purefin/core/image/ArtworkKind.kt → data/src/main/java/hu/bbara/purefin/image/ArtworkKind.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.image
package hu.bbara.purefin.image
enum class ArtworkKind(
internal val pathSegment: String,

2
data/src/main/java/hu/bbara/purefin/core/image/ImageUrlBuilder.kt → data/src/main/java/hu/bbara/purefin/image/ImageUrlBuilder.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.image
package hu.bbara.purefin.image
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/CastMember.kt → data/src/main/java/hu/bbara/purefin/model/CastMember.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
data class CastMember(
val name: String,

2
data/src/main/java/hu/bbara/purefin/core/model/Episode.kt → data/src/main/java/hu/bbara/purefin/model/Episode.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/Library.kt → data/src/main/java/hu/bbara/purefin/model/Library.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/LibraryKind.kt → data/src/main/java/hu/bbara/purefin/model/LibraryKind.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
enum class LibraryKind {
MOVIES,

2
data/src/main/java/hu/bbara/purefin/core/model/Media.kt → data/src/main/java/hu/bbara/purefin/model/Media.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/MediaKind.kt → data/src/main/java/hu/bbara/purefin/model/MediaKind.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
enum class MediaKind {
MOVIE,

2
data/src/main/java/hu/bbara/purefin/core/model/MediaSegment.kt → data/src/main/java/hu/bbara/purefin/model/MediaSegment.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/Movie.kt → data/src/main/java/hu/bbara/purefin/model/Movie.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/Season.kt → data/src/main/java/hu/bbara/purefin/model/Season.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

2
data/src/main/java/hu/bbara/purefin/core/model/Series.kt → data/src/main/java/hu/bbara/purefin/model/Series.kt
View File

@@ -1,4 +1,4 @@
package hu.bbara.purefin.core.model
package hu.bbara.purefin.model
import java.util.UUID

6
data/src/main/java/hu/bbara/purefin/core/navigation/UuidSerializer.kt → data/src/main/java/hu/bbara/purefin/navigation/UuidSerializer.kt
View File

@@ -1,12 +1,12 @@
package hu.bbara.purefin.core.navigation
package hu.bbara.purefin.navigation
import java.util.UUID
import kotlinx.serialization.KSerializer
import kotlinx.serialization.descriptors.PrimitiveKind
import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import java.util.UUID
object UuidSerializer : KSerializer<UUID> {
override val descriptor: SerialDescriptor =
@@ -17,4 +17,4 @@ object UuidSerializer : KSerializer<UUID> {
override fun serialize(encoder: Encoder, value: UUID) {
encoder.encodeString(value.toString())
}
}
}

8
data/src/test/java/hu/bbara/purefin/data/catalog/DefaultEpisodeSeriesLookupTest.kt
View File

@@ -1,9 +1,9 @@
package hu.bbara.purefin.data.catalog
import hu.bbara.purefin.core.data.MediaCatalogReader
import hu.bbara.purefin.core.model.Episode
import hu.bbara.purefin.core.model.Movie
import hu.bbara.purefin.core.model.Series
import hu.bbara.purefin.data.MediaCatalogReader
import hu.bbara.purefin.model.Episode
import hu.bbara.purefin.model.Movie
import hu.bbara.purefin.model.Series
import java.util.UUID
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow

2
data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackCacheKeysTest.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.jellyfin.playback
import hu.bbara.purefin.core.data.PlaybackMethod
import hu.bbara.purefin.data.PlaybackMethod
import org.junit.Assert.assertEquals
import org.junit.Assert.assertNull
import org.junit.Test

2
data/src/test/java/hu/bbara/purefin/data/jellyfin/playback/PlaybackDecisionResolverTest.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.data.jellyfin.playback
import hu.bbara.purefin.core.data.PlaybackMethod
import hu.bbara.purefin.data.PlaybackMethod
import org.jellyfin.sdk.model.api.MediaProtocol
import org.jellyfin.sdk.model.api.MediaSourceInfo
import org.jellyfin.sdk.model.api.MediaSourceType

7
domain/src/main/java/hu/bbara/purefin/core/download/MediaDownloadManager.kt
View File

@@ -9,9 +9,9 @@ import androidx.media3.exoplayer.offline.Download
import androidx.media3.exoplayer.offline.DownloadManager
import androidx.media3.exoplayer.offline.DownloadRequest
import dagger.hilt.android.qualifiers.ApplicationContext
import hu.bbara.purefin.core.data.DownloadMediaSourceResolver
import hu.bbara.purefin.core.data.OfflineCatalogStore
import hu.bbara.purefin.core.data.SmartDownloadStore
import hu.bbara.purefin.data.DownloadMediaSourceResolver
import hu.bbara.purefin.data.OfflineCatalogStore
import hu.bbara.purefin.data.SmartDownloadStore
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.delay
@@ -19,7 +19,6 @@ import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.flow
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.launch

2
domain/src/main/java/hu/bbara/purefin/core/navigation/EpisodeDto.kt
View File

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
import java.util.UUID
import kotlinx.serialization.Serializable
import hu.bbara.purefin.core.navigation.UuidSerializer
import hu.bbara.purefin.navigation.UuidSerializer
@Serializable
data class EpisodeDto(

2
domain/src/main/java/hu/bbara/purefin/core/navigation/LibraryDto.kt
View File

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
import java.util.UUID
import kotlinx.serialization.Serializable
import hu.bbara.purefin.core.navigation.UuidSerializer
import hu.bbara.purefin.navigation.UuidSerializer
@Serializable
data class LibraryDto(

2
domain/src/main/java/hu/bbara/purefin/core/navigation/MovieDto.kt
View File

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
import java.util.UUID
import kotlinx.serialization.Serializable
import hu.bbara.purefin.core.navigation.UuidSerializer
import hu.bbara.purefin.navigation.UuidSerializer
@Serializable
data class MovieDto(

2
domain/src/main/java/hu/bbara/purefin/core/navigation/SeriesDto.kt
View File

@@ -2,7 +2,7 @@ package hu.bbara.purefin.core.navigation
import java.util.UUID
import kotlinx.serialization.Serializable
import hu.bbara.purefin.core.navigation.UuidSerializer
import hu.bbara.purefin.navigation.UuidSerializer
@Serializable
data class SeriesDto(

4
domain/src/main/java/hu/bbara/purefin/core/player/manager/MediaSegmentManager.kt
View File

@@ -6,8 +6,8 @@ import androidx.annotation.OptIn
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.ExoPlayer
import androidx.media3.exoplayer.PlayerMessage
import hu.bbara.purefin.core.model.MediaSegment
import hu.bbara.purefin.core.model.SegmentType
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.model.SegmentType
import hu.bbara.purefin.core.player.model.SegmentStatus
@OptIn(UnstableApi::class)

4
domain/src/main/java/hu/bbara/purefin/core/player/manager/PlayerManager.kt
View File

@@ -9,8 +9,8 @@ import androidx.media3.common.TrackSelectionOverride
import androidx.media3.common.util.UnstableApi
import androidx.media3.exoplayer.ExoPlayer
import dagger.hilt.android.scopes.ViewModelScoped
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.core.model.MediaSegment
import hu.bbara.purefin.data.PlaybackReportContext
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.core.player.model.MediaContext
import hu.bbara.purefin.core.player.model.MetadataState
import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot

6
domain/src/main/java/hu/bbara/purefin/core/player/manager/ProgressManager.kt
View File

@@ -2,9 +2,9 @@ package hu.bbara.purefin.core.player.manager
import android.util.Log
import dagger.hilt.android.scopes.ViewModelScoped
import hu.bbara.purefin.core.data.MediaProgressWriter
import hu.bbara.purefin.core.data.PlaybackProgressReporter
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.data.MediaProgressWriter
import hu.bbara.purefin.data.PlaybackProgressReporter
import hu.bbara.purefin.data.PlaybackReportContext
import hu.bbara.purefin.core.player.model.MetadataState
import hu.bbara.purefin.core.player.model.PlaybackProgressSnapshot
import hu.bbara.purefin.core.player.model.PlaybackStateSnapshot

2
domain/src/main/java/hu/bbara/purefin/core/player/model/MediaContext.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.core.player.model
import hu.bbara.purefin.core.model.MediaSegment
import hu.bbara.purefin.model.MediaSegment
import hu.bbara.purefin.core.player.preference.MediaTrackPreferences
data class MediaContext(

2
domain/src/main/java/hu/bbara/purefin/core/player/model/MetadataState.kt
View File

@@ -1,6 +1,6 @@
package hu.bbara.purefin.core.player.model
import hu.bbara.purefin.core.data.PlaybackReportContext
import hu.bbara.purefin.data.PlaybackReportContext
data class MetadataState(
val mediaId: String? = null,

Some files were not shown because too many files have changed in this diff Show More