start second (or third?) reborn

features/files/client/src/commonMain/kotlin/dev/inmo/postssystem/features/files/client/ClientReadFilesStorage.kt

@@ -2,28 +2,28 @@ package dev.inmo.postssystem.features.files.client
 
 import dev.inmo.postssystem.features.files.common.*
 import dev.inmo.postssystem.features.files.common.storage.ReadFilesStorage
-import dev.inmo.micro_utils.ktor.client.UnifiedRequester
+import dev.inmo.micro_utils.ktor.client.bodyOrNull
 import dev.inmo.micro_utils.ktor.common.buildStandardUrl
 import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.client.crud.KtorReadStandardCrudRepo
+import dev.inmo.micro_utils.repos.ktor.client.crud.KtorReadCRUDRepoClient
 import io.ktor.client.HttpClient
-import io.ktor.client.request.post
-import io.ktor.client.request.setBody
-import io.ktor.client.statement.HttpResponse
+import io.ktor.client.request.*
 import io.ktor.client.statement.readBytes
+import io.ktor.http.ContentType
+import io.ktor.http.encodeURLQueryComponent
 import kotlinx.serialization.BinaryFormat
 import kotlinx.serialization.builtins.nullable
 
 class ClientReadFilesStorage(
     baseUrl: String,
     private val client: HttpClient,
-    private val serialFormat: BinaryFormat
-) : ReadFilesStorage, ReadCRUDRepo<MetaFileInfoStorageWrapper, FileId> by KtorReadStandardCrudRepo(
+    private val serialFormat: BinaryFormat,
+    contentType: ContentType
+) : ReadFilesStorage, ReadCRUDRepo<MetaFileInfoStorageWrapper, FileId> by KtorReadCRUDRepoClient<MetaFileInfoStorageWrapper, FileId>(
     buildStandardUrl(baseUrl, filesRootPathPart),
-    UnifiedRequester(client, serialFormat),
-    MetaFileInfoStorageWrapper.serializer(),
-    MetaFileInfoStorageWrapper.serializer().nullable,
-    FileId.serializer()
+    client,
+    contentType,
+    { it.string.encodeURLQueryComponent() }
 ) {
     private val fullFilesPath = buildStandardUrl(baseUrl, filesRootPathPart)
     private val fullFilesGetBytesPath = buildStandardUrl(
@@ -37,12 +37,11 @@ class ClientReadFilesStorage(
 
     override suspend fun getFullFileInfo(
         id: FileId
-    ): FullFileInfoStorageWrapper? = unifiedRequester.uniget(
+    ): FullFileInfoStorageWrapper? = client.get(
         buildStandardUrl(
             fullFilesPath,
             filesGetFullFileInfoPathPart,
-            filesFileIdParameter to unifiedRequester.encodeUrlQueryValue(FileId.serializer(), id)
-        ),
-        FullFileInfoStorageWrapper.serializer().nullable
-    )
+            filesFileIdParameter to id.string.encodeURLQueryComponent()
+        )
+    ).bodyOrNull()
 }

features/files/client/src/main/AndroidManifest.xml

@@ -1 +0,0 @@
-<manifest package="dev.inmo.postssystem.features.files.client"/>