Skip to content

Commit 6d62ffb

Browse files
lsakeeSangwook123
authored andcommitted
[delete] #62 delete unnecessary code
1 parent 3ec1692 commit 6d62ffb

File tree

3 files changed

+3
-96
lines changed

3 files changed

+3
-96
lines changed

app/src/main/java/com/record/recordy/RecordyApplication.kt

-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package com.record.recordy
22

33
import android.app.Application
4-
import android.content.BroadcastReceiver
5-
import android.content.Context
6-
import android.content.Intent
74
import android.util.Log
85
import com.kakao.sdk.common.KakaoSdk
96
import com.kakao.sdk.common.util.Utility
@@ -22,6 +19,4 @@ class RecordyApplication : Application() {
2219
private fun setKakaoSdk() {
2320
KakaoSdk.init(this, KAKAO_NATIVE_KEY)
2421
}
25-
2622
}
27-

feature/upload/src/main/java/com/record/upload/UploadViewModel.kt

+3-32
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ import dagger.hilt.android.lifecycle.HiltViewModel
1313
import kotlinx.coroutines.Dispatchers
1414
import kotlinx.coroutines.launch
1515
import java.io.File
16-
import java.net.URL
1716
import javax.inject.Inject
1817

1918
@HiltViewModel
2019
class UploadViewModel @Inject constructor(
2120
private val uploadRepository: UploadRepository,
2221
private val keywordRepository: KeywordRepository,
2322

24-
) : BaseViewModel<UploadState, UploadSideEffect>(UploadState()) {
23+
) : BaseViewModel<UploadState, UploadSideEffect>(UploadState()) {
2524
fun getKeyWordList() = viewModelScope.launch {
2625
keywordRepository.getKeywords().onSuccess {
2726
intent { copy(contentList = it.keywords) }
@@ -38,35 +37,7 @@ class UploadViewModel @Inject constructor(
3837
Log.d("failure", "${it.message}")
3938
}
4039
}
41-
fun removeQueryParameters(urlString: String): String {
42-
val url = URL(urlString)
43-
val cleanUrl = URL(url.protocol, url.host, url.port, url.path)
44-
return cleanUrl.toString()
45-
}
46-
47-
// fun uploadVideoToS3Bucket(context: Context, file: File) =
48-
// viewModelScope.launch {
49-
// var a = ""
50-
// var b = ""
51-
// uploadFileToS3PresignedUrl(
52-
// uiState.value.bucketUrl,
53-
// file
54-
// ) { success, message ->
55-
// println(message)
56-
// a = removeQueryParameters(message)
57-
// if (success) {
58-
// uploadFileToS3ThumbnailPresignedUrl(
59-
// context,
60-
// uiState.value.thumbnailUrl,
61-
// file,
62-
// ) { success, message ->
63-
// println(message)
64-
// b = removeQueryParameters(message)
65-
// uploadRecord(a, b)
66-
// }
67-
// }
68-
// }
69-
// }
40+
7041
fun uploadVideoToS3Bucket(file: File) = viewModelScope.launch(Dispatchers.IO) {
7142
uploadRepository.uploadVideoToS3Bucket(
7243
uiState.value.bucketUrl,
@@ -76,7 +47,7 @@ class UploadViewModel @Inject constructor(
7647
uiState.value.thumbnailUrl,
7748
file,
7849
).onSuccess { thumbNailUrl ->
79-
uploadRecord(removeQueryParameters(videoUrl), thumbNailUrl)
50+
uploadRecord(videoUrl, thumbNailUrl)
8051
}
8152
}.onFailure {
8253
}

feature/upload/src/main/java/com/record/upload/extension/UploadExtension.kt

-59
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@ import com.abedelazizshe.lightcompressorlibrary.VideoQuality
1212
import com.abedelazizshe.lightcompressorlibrary.config.Configuration
1313
import com.abedelazizshe.lightcompressorlibrary.config.SaveLocation
1414
import com.abedelazizshe.lightcompressorlibrary.config.SharedStorageConfiguration
15-
import com.record.common.util.getVideoFrameAt1Sec
1615
import kotlinx.coroutines.CoroutineScope
1716
import kotlinx.coroutines.Dispatchers
1817
import kotlinx.coroutines.launch
19-
import okhttp3.MediaType.Companion.toMediaTypeOrNull
20-
import okhttp3.OkHttpClient
21-
import okhttp3.Request
22-
import okhttp3.RequestBody
23-
import java.io.File
24-
import java.io.IOException
2518

2619
fun getAllVideos(
2720
loadSize: Int,
@@ -100,59 +93,7 @@ fun getVideoDuration(context: Context, uri: Uri): Long {
10093
retriever.release()
10194
}
10295
}
103-
fun uploadFileToS3PresignedUrl(presignedUrl: String, file: File, callback: (Boolean, String) -> Unit) {
104-
val client = OkHttpClient()
105-
val mediaType = "application/octet-stream".toMediaTypeOrNull()
106-
val requestBody = RequestBody.create(mediaType, file)
10796

108-
val request = Request.Builder()
109-
.url(presignedUrl)
110-
.put(requestBody)
111-
.build()
112-
client.newCall(request).enqueue(
113-
object : okhttp3.Callback {
114-
override fun onFailure(call: okhttp3.Call, e: IOException) {
115-
callback(false, "Upload failed: ${e.message}")
116-
}
117-
118-
override fun onResponse(call: okhttp3.Call, response: okhttp3.Response) {
119-
if (response.isSuccessful) {
120-
callback(true, "${response.request.url}")
121-
} else {
122-
callback(false, "Upload failed: ${response.message}")
123-
}
124-
}
125-
},
126-
)
127-
}
128-
fun uploadFileToS3ThumbnailPresignedUrl(context: Context, presignedUrl: String, file: File, callback: (Boolean, String) -> Unit) {
129-
val videoPath = file.absolutePath
130-
val outputImagePath = File(context.cacheDir, file.name)
131-
getVideoFrameAt1Sec(videoPath, outputImagePath.absolutePath)
132-
val client = OkHttpClient()
133-
val mediaType = "application/octet-stream".toMediaTypeOrNull()
134-
val requestBody = RequestBody.create(mediaType, outputImagePath)
135-
136-
val request = Request.Builder()
137-
.url(presignedUrl)
138-
.put(requestBody)
139-
.build()
140-
client.newCall(request).enqueue(
141-
object : okhttp3.Callback {
142-
override fun onFailure(call: okhttp3.Call, e: IOException) {
143-
callback(false, "Upload failed: ${e.message}")
144-
}
145-
146-
override fun onResponse(call: okhttp3.Call, response: okhttp3.Response) {
147-
if (response.isSuccessful) {
148-
callback(true, "${response.request.url}")
149-
} else {
150-
callback(false, "Upload failed: ${response.message}")
151-
}
152-
}
153-
},
154-
)
155-
}
15697
fun formatDuration(durationMillis: Long): String {
15798
val minutes = (durationMillis / 1000) / 60
15899
val seconds = (durationMillis / 1000) % 60

0 commit comments

Comments
 (0)