From c13e54f5a3ff2c517c81f3cbcb87b1f1812d6cfe Mon Sep 17 00:00:00 2001
From: Mikael Finstad <finstaden@gmail.com>
Date: Tue, 17 Jul 2018 23:04:48 +0200
Subject: [PATCH] Don't set cutEndTime when duration arrives

Instead make cutEndTime === undefined mean that there is no cut end
The problem was that duration can change later
...when starting to playback
---
 src/ffmpeg.js    | 14 ++++++++------
 src/renderer.jsx | 26 ++++++++++++--------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/ffmpeg.js b/src/ffmpeg.js
index a2ceeff7..4eb85b88 100644
--- a/src/ffmpeg.js
+++ b/src/ffmpeg.js
@@ -56,19 +56,21 @@ function handleProgress(process, cutDuration, onProgress) {
 }
 
 async function cut({
-  customOutDir, filePath, format, cutFrom, cutTo, videoDuration, rotation, includeAllStreams,
-  onProgress, stripAudio,
+  customOutDir, filePath, format, cutFrom, cutTo, cutToApparent, videoDuration, rotation,
+  includeAllStreams, onProgress, stripAudio,
 }) {
   const ext = path.extname(filePath) || `.${format}`;
-  const cutSpecification = `${util.formatDuration(cutFrom, true)}-${util.formatDuration(cutTo, true)}`;
+  const cutSpecification = `${util.formatDuration(cutFrom, true)}-${util.formatDuration(cutToApparent, true)}`;
 
   const outPath = util.getOutPath(customOutDir, filePath, `${cutSpecification}${ext}`);
 
-  console.log('Cutting from', cutFrom, 'to', cutTo);
+  console.log('Cutting from', cutFrom, 'to', cutToApparent);
+
+  const cutDuration = cutToApparent - cutFrom;
 
   // https://github.com/mifi/lossless-cut/issues/50
   const cutFromArgs = cutFrom === 0 ? [] : ['-ss', cutFrom];
-  const cutToArgs = cutTo === videoDuration ? [] : ['-t', cutTo - cutFrom];
+  const cutToArgs = cutTo === undefined || cutTo === videoDuration ? [] : ['-t', cutDuration];
 
   const rotationArgs = rotation !== undefined ? ['-metadata:s:v:0', `rotate=${rotation}`] : [];
   const ffmpegArgs = [
@@ -90,7 +92,7 @@ async function cut({
 
   const ffmpegPath = await getFfmpegPath();
   const process = execa(ffmpegPath, ffmpegArgs);
-  handleProgress(process, cutTo - cutFrom, onProgress);
+  handleProgress(process, cutDuration, onProgress);
   const result = await process;
   console.log(result.stdout);
 
diff --git a/src/renderer.jsx b/src/renderer.jsx
index 27ed650d..5298184b 100644
--- a/src/renderer.jsx
+++ b/src/renderer.jsx
@@ -193,7 +193,6 @@ class App extends React.Component {
 
   onDurationChange(duration) {
     this.setState({ duration });
-    if (!this.state.cutEndTime) this.setState({ cutEndTime: duration });
   }
 
   onCutProgress(cutProgress) {
@@ -232,17 +231,19 @@ class App extends React.Component {
     return `${this.getRotation()}°`;
   }
 
+  getApparentCutEndTime() {
+    if (this.state.cutEndTime !== undefined) return this.state.cutEndTime;
+    if (this.state.duration !== undefined) return this.state.duration;
+    return 0; // Haven't gotten duration yet
+  }
+
   isRotationSet() {
     // 360 means we don't modify rotation
     return this.state.rotation !== 360;
   }
 
-  areCutTimesSet() {
-    return (this.state.cutStartTime !== undefined || this.state.cutEndTime !== undefined);
-  }
-
   isCutRangeValid() {
-    return this.areCutTimesSet() && this.state.cutStartTime < this.state.cutEndTime;
+    return this.state.cutStartTime < this.getApparentCutEndTime();
   }
 
   increaseRotation() {
@@ -264,7 +265,7 @@ class App extends React.Component {
   }
 
   jumpCutEnd() {
-    seekAbs(this.state.cutEndTime);
+    seekAbs(this.getApparentCutEndTime());
   }
 
   handlePan(e) {
@@ -318,9 +319,6 @@ class App extends React.Component {
     const includeAllStreams = this.state.includeAllStreams;
     const stripAudio = this.state.stripAudio;
 
-    if (!this.areCutTimesSet()) {
-      return alert('Please select both start and end time');
-    }
     if (!this.isCutRangeValid()) {
       return alert('Start time must be before end time');
     }
@@ -333,6 +331,7 @@ class App extends React.Component {
         format: fileFormat,
         cutFrom: cutStartTime,
         cutTo: cutEndTime,
+        cutToApparent: this.getApparentCutEndTime(),
         videoDuration,
         rotation,
         includeAllStreams,
@@ -367,7 +366,6 @@ class App extends React.Component {
   }
 
   renderCutTimeInput(type) {
-    const cutTimeKey = type === 'start' ? 'cutStartTime' : 'cutEndTime';
     const cutTimeManualKey = type === 'start' ? 'cutStartTimeManual' : 'cutEndTimeManual';
     const cutTimeInputStyle = { width: '8em', textAlign: type === 'start' ? 'right' : 'left' };
 
@@ -386,7 +384,7 @@ class App extends React.Component {
         return;
       }
 
-      this.setState({ [cutTimeManualKey]: undefined, [cutTimeKey]: time });
+      this.setState({ [cutTimeManualKey]: undefined, [type === 'start' ? 'cutStartTime' : 'cutEndTime']: time });
     };
 
 
@@ -396,7 +394,7 @@ class App extends React.Component {
       onChange={e => handleCutTimeInput(e.target.value)}
       value={isCutTimeManualSet()
         ? this.state[cutTimeManualKey]
-        : util.formatDuration(this.state[cutTimeKey])
+        : util.formatDuration(type === 'start' ? this.state.cutStartTime : this.getApparentCutEndTime())
       }
     />);
   }
@@ -445,7 +443,7 @@ class App extends React.Component {
                 className="cut-start-time"
                 style={{
                   left: `${((this.state.cutStartTime) / (this.state.duration || 1)) * 100}%`,
-                  width: `${(((this.state.cutEndTime) - this.state.cutStartTime) / (this.state.duration || 1)) * 100}%`,
+                  width: `${(((this.getApparentCutEndTime()) - this.state.cutStartTime) / (this.state.duration || 1)) * 100}%`,
                 }}
               />
             }