feat: allow time entry for custom durations; show time elapsed and re…

…maining during video playback (#3661) * fix: groundwork to allow time entry for custom durations * fix: add elapsed time * fix: timeToSeconds * fix: logic fixes * fix: more logic fixes and linting * fix: media tag editing was broken * fix: properly set initial tag value on edit * fix: tag typing * fix: repeat and custom duration was not working as intended --------- Co-authored-by: Manoah Tervoort <[email protected]>
sircharlo · Dec 9, 2024 · d3c9ca4 · d3c9ca4
1 parent f3dcc98
commit d3c9ca4
Show file tree

Hide file tree

Showing 12 changed files with 332 additions and 253 deletions.
diff --git a/src/components/dialog/DialogAudioBible.vue b/src/components/dialog/DialogAudioBible.vue
@@ -202,22 +202,14 @@ import type {
 } from 'src/types';
 
 import { whenever } from '@vueuse/core';
-import { storeToRefs } from 'pinia';
 import { errorCatcher } from 'src/helpers/error-catcher';
 import {
   downloadAdditionalRemoteVideo,
   getAudioBibleMedia,
 } from 'src/helpers/jw-media';
-import { useCurrentStateStore } from 'src/stores/current-state';
-import { useJwStore } from 'src/stores/jw';
+import { timeToSeconds } from 'src/utils/time';
 import { computed, ref, watch } from 'vue';
 
-// Stores
-const currentStateStore = useCurrentStateStore();
-const { currentCongregation, selectedDate } = storeToRefs(currentStateStore);
-const jwStore = useJwStore();
-const { customDurations } = storeToRefs(jwStore);
-
 // Props
 const props = defineProps<{
   section: MediaSection | undefined;
@@ -337,11 +329,6 @@ const addSelectedVerses = async () => {
   const startVerseNumber = chosenVerses.value[0];
   const endVerseNumber = chosenVerses.value[1] || startVerseNumber;
 
-  const timeToSeconds = (time: string) => {
-    const [h, m, s] = time.split(':').map(parseFloat);
-    return (h ?? 0) * 3600 + (m ?? 0) * 60 + (s ?? 0);
-  };
-
   const min = timeToSeconds(
     selectedChapterMedia.value.map((item) =>
       item.markers.markers.find(
@@ -359,7 +346,7 @@ const addSelectedVerses = async () => {
     ? timeToSeconds(endVerse.startTime) + timeToSeconds(endVerse.duration)
     : 0;
 
-  const uniqueId = await downloadAdditionalRemoteVideo(
+  await downloadAdditionalRemoteVideo(
     selectedChapterMedia.value,
     undefined,
     false,
@@ -371,21 +358,12 @@ const addSelectedVerses = async () => {
         .filter((verse, index, self) => self.indexOf(verse) === index)
         .join('-'),
     props.section,
+    {
+      max,
+      min,
+    },
   );
 
-  if (
-    uniqueId &&
-    min &&
-    max &&
-    selectedDate.value &&
-    currentCongregation.value
-  ) {
-    const congregation = (customDurations.value[currentCongregation.value] ??=
-      {});
-    const dateDurations = (congregation[selectedDate.value] ??= {});
-    dateDurations[uniqueId] = { max, min };
-  }
-
   resetBibleBook(true, true);
 
   loading.value = false;