V 0.4.0.0; services di to factory (should be killed on service death)

dinaraparanid · May 18, 2024 · e46112a · e46112a
1 parent f707450
commit e46112a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/data/src/main/java/com/paranid5/crescendo/data/ktor_client/Files.kt b/data/src/main/java/com/paranid5/crescendo/data/ktor_client/Files.kt
@@ -29,7 +29,7 @@ import kotlinx.coroutines.withTimeoutOrNull
 import java.io.File
 import java.util.concurrent.atomic.AtomicLong
 
-private const val TAG = "Ktor Client"
+private const val TAG = "KtorClient"
 
 private const val NEXT_PACKET_TIMEOUT = 3000L
 

diff --git a/...eam/src/main/java/com/paranid5/crescendo/system/services/stream/di/StreamServiceModule.kt b/...eam/src/main/java/com/paranid5/crescendo/system/services/stream/di/StreamServiceModule.kt
@@ -4,12 +4,13 @@ import com.paranid5.crescendo.system.services.stream.StreamServiceAccessor
 import com.paranid5.crescendo.system.services.stream.extractor.UrlExtractor
 import com.paranid5.crescendo.system.services.stream.notification.NotificationManager
 import com.paranid5.crescendo.system.services.stream.playback.PlayerProvider
+import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val streamServiceModule = module {
     singleOf(::StreamServiceAccessor)
-    single { params -> PlayerProvider(params.get(), get()) }
-    singleOf(::UrlExtractor)
-    single { params -> NotificationManager(params.get(), get()) }
+    factory { params -> PlayerProvider(params.get(), get()) }
+    factoryOf(::UrlExtractor)
+    factory { params -> NotificationManager(params.get(), get()) }
 }
diff --git a/...track/src/main/java/com/paranid5/crescendo/system/services/track/di/TrackServiceModule.kt b/...track/src/main/java/com/paranid5/crescendo/system/services/track/di/TrackServiceModule.kt
@@ -8,6 +8,6 @@ import org.koin.dsl.module
 
 val trackServiceModule = module {
     singleOf(::TrackServiceAccessor)
-    single { params -> PlayerProvider(params.get(), get(), get()) }
-    single { params -> NotificationManager(params.get(), get(), get()) }
+    factory { params -> PlayerProvider(params.get(), get(), get()) }
+    factory { params -> NotificationManager(params.get(), get(), get()) }
 }
diff --git a/...ain/java/com/paranid5/crescendo/system/services/video_cache/di/VideoCacheServiceModule.kt b/...ain/java/com/paranid5/crescendo/system/services/video_cache/di/VideoCacheServiceModule.kt
@@ -6,14 +6,15 @@ import com.paranid5.crescendo.system.services.video_cache.extractor.UrlExtractor
 import com.paranid5.crescendo.system.services.video_cache.files.MediaFileDownloader
 import com.paranid5.crescendo.system.services.video_cache.files.VideoQueueManager
 import com.paranid5.crescendo.system.services.video_cache.notification.NotificationManager
+import org.koin.core.module.dsl.factoryOf
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 
 val videoCacheServiceModule = module {
     singleOf(::VideoCacheServiceAccessor)
-    singleOf(::VideoQueueManager)
-    single { params -> NotificationManager(params.get()) }
-    singleOf(::CacheManager)
-    singleOf(::UrlExtractor)
-    singleOf(::MediaFileDownloader)
+    factoryOf(::VideoQueueManager)
+    factory { params -> NotificationManager(params.get()) }
+    factoryOf(::CacheManager)
+    factoryOf(::UrlExtractor)
+    factoryOf(::MediaFileDownloader)
 }