Merge pull request #785 from AI4Bharat/timebox-fix

fix timestamp updation issue
AI4Bharat · Aug 9, 2024 · 35d0019 · 35d0019
2 parents bc5537c + 8cda8b6
commit 35d0019
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/src/common/TimeBoxes.jsx b/src/common/TimeBoxes.jsx
@@ -2,15 +2,15 @@ import React, { memo } from "react";
 import { ProjectStyle } from "styles";
 import { TextField } from "@mui/material";
 
-const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
+const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly, player }) => {
   const classes = ProjectStyle();
 
   return (
     <div style={{display: "flex", margin:"0"}}>
       <TextField
         variant="standard"
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "hours")
+          handleTimeChange(event.target.value, index, type, "hours", player)
         }
         value={time.split(":")[0]}
         onFocus={(event) => event.target.select()}
@@ -36,7 +36,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         onFocus={(event) => event.target.select()}
         InputProps={{ inputProps: { min: 0, max: 100 }, readOnly:readOnly }}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "minutes")
+          handleTimeChange(event.target.value, index, type, "minutes", player)
         }
       />
 
@@ -55,7 +55,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         InputProps={{ inputProps: { min: 0, max: 100 }, readOnly:readOnly }}
         className={classes.timeInputBox}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "seconds")
+          handleTimeChange(event.target.value, index, type, "seconds", player)
         }
         // style={{
 
@@ -78,7 +78,7 @@ const TimeBoxes = ({ handleTimeChange, time, index, type, readOnly }) => {
         InputProps={{ inputProps: { min: 0, max: 999 }, readOnly:readOnly }}
         className={classes.timeInputBox}
         onChange={(event) =>
-          handleTimeChange(event.target.value, index, type, "miliseconds")
+          handleTimeChange(event.target.value, index, type, "miliseconds", player)
         }
       />
     </div>

diff --git a/src/config/config.js b/src/config/config.js
@@ -2,9 +2,9 @@ const configs = {
   BASE_URL: "https://backend.chitralekha.ai4bharat.org/",
   BASE_URL_AUTO: process.env.REACT_APP_APIGW_BASE_URL
     ? process.env.REACT_APP_APIGW_BASE_URL
-   : "https://backend.dev.chitralekha.ai4bharat.org"
+  //  : "https://backend.dev.chitralekha.ai4bharat.org"
     // : "https://backend.chitralekha.ai4bharat.org"
-    // : "http://127.0.0.1:8000",
+    : "http://127.0.0.1:8000",
 };
 
 export default configs;
diff --git a/src/containers/Organization/Video/RightPanel.jsx b/src/containers/Organization/Video/RightPanel.jsx
@@ -463,12 +463,12 @@ const RightPanel = ({ currentIndex, currentSubs,setCurrentIndex, showTimeline, s
 
   const handleTimeChange = useCallback(
     (value, index, type, time) => {
-      const sub = timeChange(value, index, type, time);
+      const sub = timeChange(value, index, type, time, player);
       dispatch(setSubtitles(sub, C.SUBTITLES));
       // saveTranscriptHandler(false, true, sub);
     },
     // eslint-disable-next-line
-    [limit, currentOffset]
+    [limit, currentOffset, player]
   );
 
   const onDelete = useCallback(

diff --git a/src/containers/Organization/Video/TranslationRightPanel.jsx b/src/containers/Organization/Video/TranslationRightPanel.jsx
@@ -491,11 +491,11 @@ const TranslationRightPanel = ({ currentIndex, currentSubs,setCurrentIndex, show
 
   const handleTimeChange = useCallback(
     (value, index, type, time) => {
-      const sub = timeChange(value, index, type, time);
+      const sub = timeChange(value, index, type, time, player);
       dispatch(setSubtitles(sub, C.SUBTITLES));
     },
     // eslint-disable-next-line
-    [limit, currentOffset]
+    [limit, currentOffset, player]
   );
 
   const addNewSubtitleBox = useCallback(

diff --git a/src/containers/Organization/Video/VoiceOverRightPanel1.jsx b/src/containers/Organization/Video/VoiceOverRightPanel1.jsx
@@ -554,11 +554,11 @@ const VoiceOverRightPanel1 = ({ currentIndex, setCurrentIndex, showTimeline, seg
 
   const handleTimeChange = useCallback(
     (value, index, type, time) => {
-      const sub = timeChange(value, index, type, time);
+      const sub = timeChange(value, index, type, time, player);
       dispatch(setSubtitles(sub, C.SUBTITLES));
     },
     // eslint-disable-next-line
-    [limit, currentOffset]
+    [limit, currentOffset, player]
   );
 
   const replaceSelectedText = (text, index) => {

diff --git a/src/utils/subtitleUtils.js b/src/utils/subtitleUtils.js
@@ -60,7 +60,7 @@ export const getKeyCode = (event) => {
   }
 };
 
-export const timeChange = (value, index, type, time) => {
+export const timeChange = (value, index, type, time, player) => {
   const subtitles = store.getState().commonReducer.subtitles;
   const copySub = [...subtitles];
 
@@ -70,15 +70,17 @@ export const timeChange = (value, index, type, time) => {
       time,
       copySub[index].start_time,
       index,
-      type
+      type,
+      player,
     );
   } else {
     copySub[index].end_time = getUpdatedTime(
       value,
       time,
       copySub[index].end_time,
       index,
-      type
+      type,
+      player,
     );
   }
 

diff --git a/src/utils/utils.js b/src/utils/utils.js
@@ -250,9 +250,9 @@ export const getMilliseconds = (timeInString) => {
   return 0;
 };
 
-export const getUpdatedTime = (value, type, time, index, startEnd) => {
+export const getUpdatedTime = (value, type, time, index, startEnd, player) => {
   const subtitles = store.getState().commonReducer.subtitles;
-  const videoDuration = store.getState().getVideoDetails.data.video.duration;
+  const videoDuration = typeof player.getDuration === 'function' ? player.getDuration() : store.getState().getVideoDetails.data.video.duration;
 
   let newValue = "";