-
Notifications
You must be signed in to change notification settings - Fork 112
Add PlaylistRepository #369
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
...ava/com/google/android/horologist/mediasample/data/datasource/PlaylistRemoteDataSource.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.horologist.mediasample.data.datasource | ||
|
|
||
| import com.google.android.horologist.mediasample.data.api.UampService | ||
| import com.google.android.horologist.mediasample.data.mapper.PlaylistMapper | ||
| import com.google.android.horologist.mediasample.domain.model.Playlist | ||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.flow.Flow | ||
| import kotlinx.coroutines.flow.flow | ||
| import kotlinx.coroutines.flow.flowOn | ||
|
|
||
| class PlaylistRemoteDataSource( | ||
| private val ioDispatcher: CoroutineDispatcher, | ||
| private val uampService: UampService, | ||
| ) { | ||
|
|
||
| fun getPlaylists(): Flow<List<Playlist>> = flow { | ||
| emit(PlaylistMapper.map(uampService.catalog())) | ||
| }.flowOn(ioDispatcher) | ||
| } | ||
36 changes: 36 additions & 0 deletions
36
...le/src/main/java/com/google/android/horologist/mediasample/data/mapper/MediaItemMapper.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.horologist.mediasample.data.mapper | ||
|
|
||
| import com.google.android.horologist.media.model.MediaItem | ||
| import com.google.android.horologist.mediasample.data.api.model.MusicApiModel | ||
|
|
||
| /** | ||
| * Maps a [MusicApiModel] into [MediaItem]. | ||
| */ | ||
| object MediaItemMapper { | ||
|
|
||
| fun map(musicApiModel: MusicApiModel): MediaItem = MediaItem( | ||
| id = musicApiModel.id, | ||
| uri = musicApiModel.source, | ||
| title = musicApiModel.title, | ||
| artist = musicApiModel.artist, | ||
| artworkUri = musicApiModel.image | ||
| ) | ||
|
|
||
| fun map(musicApiModels: List<MusicApiModel>): List<MediaItem> = musicApiModels.map(::map) | ||
| } |
41 changes: 41 additions & 0 deletions
41
...ple/src/main/java/com/google/android/horologist/mediasample/data/mapper/PlaylistMapper.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.horologist.mediasample.data.mapper | ||
|
|
||
| import com.google.android.horologist.mediasample.data.api.model.CatalogApiModel | ||
| import com.google.android.horologist.mediasample.domain.model.Playlist | ||
|
|
||
| /** | ||
| * Maps a [CatalogApiModel] into a [List] of [Playlist]. | ||
| */ | ||
| object PlaylistMapper { | ||
|
|
||
| fun map(catalog: CatalogApiModel): List<Playlist> = | ||
| catalog.music | ||
| .groupBy { it.genre } | ||
| .map { entry -> | ||
| Playlist( | ||
| id = sanitize(sanitize(entry.key)), | ||
| name = entry.key, | ||
| mediaItems = MediaItemMapper.map(entry.value) | ||
| ) | ||
| } | ||
|
|
||
| private fun sanitize(it: String): String { | ||
| return it.replace("[^A-Za-z]".toRegex(), "") | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
.../java/com/google/android/horologist/mediasample/data/repository/PlaylistRepositoryImpl.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.horologist.mediasample.data.repository | ||
|
|
||
| import com.google.android.horologist.mediasample.data.datasource.PlaylistRemoteDataSource | ||
| import com.google.android.horologist.mediasample.domain.PlaylistRepository | ||
| import com.google.android.horologist.mediasample.domain.model.Playlist | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| class PlaylistRepositoryImpl( | ||
| private val playlistRemoteDataSource: PlaylistRemoteDataSource | ||
| ) : PlaylistRepository { | ||
|
|
||
| override fun getPlaylists(): Flow<List<Playlist>> = playlistRemoteDataSource.getPlaylists() | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...mple/src/main/java/com/google/android/horologist/mediasample/domain/PlaylistRepository.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.horologist.mediasample.domain | ||
|
|
||
| import com.google.android.horologist.mediasample.domain.model.Playlist | ||
| import kotlinx.coroutines.flow.Flow | ||
|
|
||
| /** | ||
| * A repository of [Playlist]. | ||
| */ | ||
| interface PlaylistRepository { | ||
yschimke marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| fun getPlaylists(): Flow<List<Playlist>> | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 25 additions & 0 deletions
25
...a-sample/src/main/java/com/google/android/horologist/mediasample/domain/model/Playlist.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.horologist.mediasample.domain.model | ||
|
|
||
| import com.google.android.horologist.media.model.MediaItem | ||
|
|
||
| data class Playlist( | ||
| val id: String, | ||
| val name: String, | ||
| val mediaItems: List<MediaItem> | ||
| ) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: I'm curious about ioDispatcher here. The network layer, retrofit should be executing these correctly on a background thread. This would seem mainly to affect the JSON parsing, is that the intent? If so is the default dispatcher better here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good question, wouldn't retrofit also take care of executing the JSON parsing in a background thread?
if so, here the dispatcher would be just for the mapper, which we could move to default as suggested
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I suspect you are right. But I will confirm later, since there is some evidence that it isn't always the case. https://github.com/square/retrofit/pull/3693/files