From a196d06bc0effc51ebcdd0e432034e91179703c1 Mon Sep 17 00:00:00 2001 From: lunaticbum Date: Mon, 16 Nov 2026 12:57:11 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Task=2016=20=EC=99=84=EB=A3=8C=20-?= =?UTF-8?q?=20MlKitTranslationHelper=20=EB=8F=84=EC=9E=85=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=9E=90=EB=A7=89=20=EC=96=B8=EC=96=B4=20=EA=B0=90?= =?UTF-8?q?=EC=A7=80/=EB=B2=88=EC=97=AD=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - utils/MlKitTranslationHelper.kt 신규 생성: * detectSourceLanguage(): ML Kit LanguageIdentification 기반 소스 언어 감지 및 한국어/미지원 언어 스킵 공통화 * translateBatch(): Translator 생성, 모델 다운로드, 배치 번역 및 finally 블록 내 translator.close() 자원 해제 보장 - PlayerActivity.kt & CompletedFilesActivity.kt: 중복된 ML Kit 언어 식별/번역 파이프라인을 MlKitTranslationHelper 위임으로 통합 - TODO.md: 4-3 항목 완료 처리 - 검증: ./gradlew :app:compileDebugKotlin 빌드 성공 확인 (3s) --- TODO.md | 2 +- .../launcher/home/CompletedFilesActivity.kt | 94 ++++++++----------- .../lunatic/launcher/player/PlayerActivity.kt | 83 +++++----------- .../launcher/utils/MlKitTranslationHelper.kt | 66 +++++++++++++ 4 files changed, 131 insertions(+), 114 deletions(-) create mode 100644 app/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt diff --git a/TODO.md b/TODO.md index 6b91b700..6832327b 100644 --- a/TODO.md +++ b/TODO.md @@ -127,7 +127,7 @@ - `LunaticLauncher.kt:132`, `ForeGroundService.kt:769, 793`, `LocationUpdateService.kt:72, 110`, `PlayerActivity.kt:662` 등 여러 클래스에서 매번 `OkHttpClient.Builder()`와 `ConnectionPool`을 새로 생성함. - **작업**: 앱 공용 `OkHttpClient` 싱글톤(또는 DI 제공)과 공통 요청 헬퍼를 두어 커넥션 풀 재사용 및 보일러플레이트 제거. -- [ ] **4-3. ML Kit 언어 감지 + 번역 보일러플레이트 통합** +- [x] **4-3. ML Kit 언어 감지 + 번역 보일러플레이트 통합** (`MlKitTranslationHelper` 도입 완료) - `PlayerActivity.kt`, `TranslatorActivity.kt`, `CompletedFilesActivity.kt`가 각각 `LanguageIdentification`, `Translation`, `TranslatorOptions`를 개별적으로 초기화·호출함. - **작업**: 공통 `MlKitTranslationHelper` 클래스로 캡슐화하여 모델 다운로드, 언어 감지, 번역 캐싱 로직을 일원화. diff --git a/app/src/main/kotlin/bums/lunatic/launcher/home/CompletedFilesActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/home/CompletedFilesActivity.kt index b6130505..b8219f43 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/home/CompletedFilesActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/home/CompletedFilesActivity.kt @@ -504,73 +504,55 @@ class CompletedFilesActivity : AppCompatActivity() { } val sampleText = subtitles.take(10).joinToString(" ") { it.text } - val languageIdentifier = LanguageIdentification.getClient() - - languageIdentifier.identifyLanguage(sampleText) - .addOnSuccessListener { languageCode -> - if (languageCode == "und" || languageCode == "ko") { - Log.d("CompletedFilesActivity", "번역 불필요 (언어: $languageCode)") - onSingleSubtitlePipelineFinished(videoFile, subFile.absolutePath) - } else { - Log.d("CompletedFilesActivity", "감지된 언어: $languageCode - 번역 시작") - val sourceLang = TranslateLanguage.fromLanguageTag(languageCode) - if (sourceLang != null) { - startTranslationProcess(sourceLang, subtitles, subFile, videoFile) - } else { - onSingleSubtitlePipelineFinished(videoFile, subFile.absolutePath) - } - } - } - .addOnFailureListener { - Log.e("CompletedFilesActivity", "언어 감지 실패", it) + bums.lunatic.launcher.utils.MlKitTranslationHelper.detectSourceLanguage( + sampleText = sampleText, + skipKorean = true, + onNotNeeded = { languageCode -> + Log.d("CompletedFilesActivity", "번역 불필요 또는 미지원 (언어: $languageCode)") + onSingleSubtitlePipelineFinished(videoFile, subFile.absolutePath) + }, + onDetected = { sourceLang -> + Log.d("CompletedFilesActivity", "감지된 언어: $sourceLang - 번역 시작") + startTranslationProcess(sourceLang, subtitles, subFile, videoFile) + }, + onFailure = { e -> + Log.e("CompletedFilesActivity", "언어 감지 실패", e) onSingleSubtitlePipelineFinished(videoFile, subFile.absolutePath) } + ) } private fun startTranslationProcess(sourceLang: String, subtitles: List, originalSubFile: File, videoFile: File) { - val options = TranslatorOptions.Builder() - .setSourceLanguage(sourceLang) - .setTargetLanguage(TranslateLanguage.KOREAN) - .build() - - val translator = Translation.getClient(options) Toast.makeText(this, "'${videoFile.name}' 자막 번역 중...", Toast.LENGTH_SHORT).show() - translator.downloadModelIfNeeded() - .addOnSuccessListener { - lifecycleScope.launch(Dispatchers.IO) { - for (block in subtitles) { - try { - val translated = com.google.android.gms.tasks.Tasks.await(translator.translate(block.text)) - block.translatedText = translated - } catch (e: Exception) { - block.translatedText = block.text - } - } + lifecycleScope.launch(Dispatchers.IO) { + try { + val translatedLines = bums.lunatic.launcher.utils.MlKitTranslationHelper.translateBatch( + sourceLang = sourceLang, + texts = subtitles.map { it.text } + ) + subtitles.forEachIndexed { idx, block -> + block.translatedText = translatedLines.getOrNull(idx) ?: block.text + } - try { - val translatedSrtContent = convertSubtitlesToSrt(subtitles) - val newFileName = "${originalSubFile.nameWithoutExtension}_translated.srt" - val newFile = File(originalSubFile.parent, newFileName) - newFile.writeText(translatedSrtContent, Charsets.UTF_8) + val translatedSrtContent = convertSubtitlesToSrt(subtitles) + val newFileName = "${originalSubFile.nameWithoutExtension}_translated.srt" + val newFile = File(originalSubFile.parent, newFileName) + newFile.writeText(translatedSrtContent, Charsets.UTF_8) - withContext(Dispatchers.Main) { - Toast.makeText(this@CompletedFilesActivity, "'${videoFile.name}' 번역 완료!", Toast.LENGTH_SHORT).show() - loadFiles() - onSingleSubtitlePipelineFinished(videoFile, newFile.absolutePath) - } - } catch (e: Exception) { - Log.e("CompletedFilesActivity", "번역 자막 저장 실패", e) - withContext(Dispatchers.Main) { - onSingleSubtitlePipelineFinished(videoFile, originalSubFile.absolutePath) - } - } + withContext(Dispatchers.Main) { + Toast.makeText(this@CompletedFilesActivity, "'${videoFile.name}' 번역 완료!", Toast.LENGTH_SHORT).show() + loadFiles() + onSingleSubtitlePipelineFinished(videoFile, newFile.absolutePath) + } + } catch (e: Exception) { + Log.e("CompletedFilesActivity", "번역 처리 또는 저장 실패", e) + withContext(Dispatchers.Main) { + Toast.makeText(this@CompletedFilesActivity, "번역 모델 다운로드에 실패하여 원본 자막만 저장합니다.", Toast.LENGTH_SHORT).show() + onSingleSubtitlePipelineFinished(videoFile, originalSubFile.absolutePath) } } - .addOnFailureListener { - Toast.makeText(this, "번역 모델 다운로드에 실패하여 원본 자막만 저장합니다.", Toast.LENGTH_SHORT).show() - onSingleSubtitlePipelineFinished(videoFile, originalSubFile.absolutePath) - } + } } private fun launchVlcPlayer(videoFile: File, subtitlePath: String, startPositionMs: Long = 0L) { diff --git a/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt b/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt index 2f35a8a0..a9153de9 100644 --- a/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt +++ b/app/src/main/kotlin/bums/lunatic/launcher/player/PlayerActivity.kt @@ -839,72 +839,41 @@ class PlayerActivity : AppCompatActivity(), TextureView.SurfaceTextureListener { private fun detectLanguageAndTranslate() { if (externalSubtitles.isEmpty()) return - // 정확도를 위해 자막 앞부분의 텍스트를 적당히 뭉쳐서 샘플로 만듭니다. val sampleText = externalSubtitles.take(10).joinToString(" ") { it.text } - - val languageIdentifier = LanguageIdentification.getClient() - languageIdentifier.identifyLanguage(sampleText) - .addOnSuccessListener { languageCode -> - if (languageCode == "und") { - Blog.LOGE("언어 감지 실패 (알 수 없는 언어)") - } else { - Blog.LOGE("💡 감지된 언어 코드: $languageCode") - - // 만약 이미 한국어(ko)라면 번역할 필요가 없으므로 종료 - if (languageCode == "ko") return@addOnSuccessListener - - // 감지된 언어 코드를 번역기가 이해할 수 있는 코드로 변환 - val sourceLang = TranslateLanguage.fromLanguageTag(languageCode) - if (sourceLang != null) { - startTranslationProcess(sourceLang) - } else { - Blog.LOGE("번역을 지원하지 않는 언어입니다: $languageCode") - } - } - } - .addOnFailureListener { e -> - Blog.LOGE("언어 감지 에러: ${e.message}") - } + bums.lunatic.launcher.utils.MlKitTranslationHelper.detectSourceLanguage( + sampleText = sampleText, + skipKorean = true, + onNotNeeded = { code -> Blog.LOGE("번역 불필요 또는 미지원 언어: $code") }, + onDetected = { sourceLang -> startTranslationProcess(sourceLang) }, + onFailure = { e -> Blog.LOGE("언어 감지 에러: ${e.message}") } + ) } // 💡 2. 감지된 언어를 바탕으로 한국어로 번역하는 함수 private fun startTranslationProcess(sourceLang: String) { - val options = TranslatorOptions.Builder() - .setSourceLanguage(sourceLang) - .setTargetLanguage(TranslateLanguage.KOREAN) // 타겟은 무조건 한국어! - .build() - - val translator = Translation.getClient(options) - Toast.makeText(this, "번역 모델 확인 중...", Toast.LENGTH_SHORT).show() - - // 해당 언어 모델이 폰에 없으면 다운로드 (최초 1회, 약 30MB) - translator.downloadModelIfNeeded() - .addOnSuccessListener { - Toast.makeText(this, "자막 번역을 시작합니다!", Toast.LENGTH_SHORT).show() - - // 💡 3. 수백~수천 줄의 자막을 백그라운드에서 한방에 번역 (UI 멈춤 방지) - lifecycleScope.launch(Dispatchers.IO) { - for (block in externalSubtitles) { - try { - // ML Kit의 번역은 원래 비동기(Task)지만, Tasks.await를 쓰면 동기적으로 쫙 뽑아낼 수 있습니다. - val translated = com.google.android.gms.tasks.Tasks.await(translator.translate(block.text)) - block.translatedText = translated - } catch (e: Exception) { - block.translatedText = block.text // 에러나면 원본 유지 - } - } - - saveTranslatedSubtitle() - - withContext(Dispatchers.Main) { - Toast.makeText(this@PlayerActivity, "번역 완료 및 저장되었습니다.", Toast.LENGTH_SHORT).show() + lifecycleScope.launch(Dispatchers.IO) { + try { + val translatedLines = bums.lunatic.launcher.utils.MlKitTranslationHelper.translateBatch( + sourceLang = sourceLang, + texts = externalSubtitles.map { it.text }, + onModelReady = { + Toast.makeText(this@PlayerActivity, "자막 번역을 시작합니다!", Toast.LENGTH_SHORT).show() } + ) + externalSubtitles.forEachIndexed { idx, block -> + block.translatedText = translatedLines.getOrNull(idx) ?: block.text + } + saveTranslatedSubtitle() + withContext(Dispatchers.Main) { + Toast.makeText(this@PlayerActivity, "번역 완료 및 저장되었습니다.", Toast.LENGTH_SHORT).show() + } + } catch (_: Exception) { + withContext(Dispatchers.Main) { + Toast.makeText(this@PlayerActivity, "번역 모델 다운로드 실패", Toast.LENGTH_SHORT).show() } } - .addOnFailureListener { - Toast.makeText(this, "번역 모델 다운로드 실패", Toast.LENGTH_SHORT).show() - } + } } diff --git a/app/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt b/app/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt new file mode 100644 index 00000000..b70d14cf --- /dev/null +++ b/app/src/main/kotlin/bums/lunatic/launcher/utils/MlKitTranslationHelper.kt @@ -0,0 +1,66 @@ +package bums.lunatic.launcher.utils + +import com.google.android.gms.tasks.Tasks +import com.google.mlkit.nl.languageid.LanguageIdentification +import com.google.mlkit.nl.translate.TranslateLanguage +import com.google.mlkit.nl.translate.Translation +import com.google.mlkit.nl.translate.TranslatorOptions +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext + +/** + * Shared ML Kit language identification and translation helper with proper Translator lifecycle cleanup. + */ +object MlKitTranslationHelper { + + fun detectSourceLanguage( + sampleText: String, + skipKorean: Boolean = true, + onNotNeeded: (String) -> Unit, + onDetected: (String) -> Unit, + onFailure: (Exception) -> Unit = {} + ) { + LanguageIdentification.getClient().identifyLanguage(sampleText) + .addOnSuccessListener { languageCode -> + if (languageCode == "und" || (skipKorean && languageCode == "ko")) { + onNotNeeded(languageCode) + return@addOnSuccessListener + } + val sourceLang = TranslateLanguage.fromLanguageTag(languageCode) + if (sourceLang != null) { + onDetected(sourceLang) + } else { + onNotNeeded(languageCode) + } + } + .addOnFailureListener { e -> + onFailure(e) + } + } + + suspend fun translateBatch( + sourceLang: String, + targetLang: String = TranslateLanguage.KOREAN, + texts: List, + onModelReady: (() -> Unit)? = null + ): List = withContext(Dispatchers.IO) { + val options = TranslatorOptions.Builder() + .setSourceLanguage(sourceLang) + .setTargetLanguage(targetLang) + .build() + val translator = Translation.getClient(options) + try { + Tasks.await(translator.downloadModelIfNeeded()) + withContext(Dispatchers.Main) { onModelReady?.invoke() } + texts.map { line -> + try { + Tasks.await(translator.translate(line)) + } catch (_: Exception) { + line + } + } + } finally { + translator.close() + } + } +}