Fall back to source audio inside project directory when applicable (#…

…1186) * picks up source audio in project dir if applicable * add note
Bible-Translation-Tools · Sep 11, 2024 · ac597d3 · ac597d3
1 parent 4f26336
commit ac597d3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/...ain/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/viewmodel/ChunkingViewModel.kt b/...ain/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/viewmodel/ChunkingViewModel.kt
@@ -148,10 +148,13 @@ class ChunkingViewModel : ViewModel(), IMarkerViewModel {
     private fun initializeSourceAudio(chapter: Int): Maybe<SourceAudio> {
         return Maybe.fromCallable {
             val workbook = workbookDataStore.workbook
-            ChunkAudioUseCase(directoryProvider, workbook.projectFilesAccessor)
-                .copySourceAudioToProject(sourceAudio.file)
+            workbook.sourceAudioAccessor.getUserMarkedChapter(chapter, workbook.target)  // this first call is intentional. See https://github.com/Bible-Translation-Tools/Orature/pull/1186
+                ?: let {
+                    ChunkAudioUseCase(directoryProvider, workbook.projectFilesAccessor)
+                        .copySourceAudioToProject(sourceAudio.file)
 
-            workbook.sourceAudioAccessor.getUserMarkedChapter(chapter, workbook.target)
+                    workbook.sourceAudioAccessor.getUserMarkedChapter(chapter, workbook.target)
+                }
         }
     }
 

diff --git a/...main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/viewmodel/ConsumeViewModel.kt b/...main/kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/viewmodel/ConsumeViewModel.kt
@@ -99,6 +99,7 @@ class ConsumeViewModel : ViewModel(), IMarkerViewModel {
         Maybe
             .fromCallable<SourceAudio> {
                 wb.sourceAudioAccessor.getChapter(chapter.sort, wb.target)
+                    ?: wb.sourceAudioAccessor.getUserMarkedChapter(chapter.sort, wb.target)
             }
             .subscribeOn(Schedulers.io())
             .observeOnFx()

diff --git a/...kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/viewmodel/TranslationViewModel2.kt b/...kotlin/org/wycliffeassociates/otter/jvm/workbookapp/ui/viewmodel/TranslationViewModel2.kt
@@ -267,6 +267,7 @@ class TranslationViewModel2 : ViewModel() {
         Maybe
             .fromCallable {
                 wb.sourceAudioAccessor.getChapter(chapter.sort, wb.target)
+                    ?: wb.sourceAudioAccessor.getUserMarkedChapter(chapter.sort, wb.target)
             }
             .subscribeOn(Schedulers.io())
             .observeOnFx()