Add close project and export options

Author: javalikescript

Ffmpeg.lua

@@ -117,7 +117,7 @@ return class.create(function(ffmpeg)
     return args
   end
 
-  function ffmpeg:createCommand(part, filename, options, parameters)
+  function ffmpeg:createCommand(part, filename, options, sourceOptions, parameters)
     --[[
       '-ss position (input/output)'
       When used as an input option (before -i), seeks in this input file to position.
@@ -138,7 +138,7 @@ return class.create(function(ffmpeg)
     ]]
     local srcOptions = {}
     local destOptions = {}
-    if part.from ~= nil then
+    if part.from ~= nil and part.from >= 0 then
       local delay = (parameters and parameters.seekDelay) or self.seekDelayMs or 0
       if (delay >= 0) and (delay < part.from) then
         List.concat(srcOptions, '-ss', formatTime(part.from - delay))
@@ -149,15 +149,16 @@ return class.create(function(ffmpeg)
         List.concat(destOptions, '-ss', formatTime(part.from))
       end
     end
-    if part.to ~= nil then
-      if part.from ~= nil then
+    if part.to ~= nil and part.to >= 0 then
+      if part.from ~= nil and part.to > part.from then
         List.concat(destOptions, '-t', formatTime(part.to - part.from))
         --List.concat(destOptions, '-to', formatTime(part.to))
       else
         List.concat(destOptions, '-t', formatTime(part.to))
       end
     end
     List.concat(destOptions, options)
+    List.concat(srcOptions, sourceOptions)
     local sourceFile = self.sources[part.sourceId]
     return self:computeArguments(filename, destOptions, sourceFile:getPath(), srcOptions)
   end
@@ -175,21 +176,23 @@ return class.create(function(ffmpeg)
     end
   end
 
-  function ffmpeg:createCommands(destFilename, parts, destOptions, parameters)
+  function ffmpeg:createCommands(destFilename, parts, options, sourceOptions, parameters)
     local commands = {}
     local filename = destFilename
     if parameters.subtitles then
       filename = self:createTempFile('full.tmp'):getPath()
     end
-    if #parts == 1 then
-      table.insert(commands, self:createCommand(parts[1], filename, destOptions, parameters))
+    if #parts == 0 then
+      table.insert(commands, self:createCommand({}, filename, options, sourceOptions, parameters))
+    elseif #parts == 1 then
+      table.insert(commands, self:createCommand(parts[1], filename, options, sourceOptions, parameters))
     elseif #parts > 1 then
       local concatScript = StringBuffer:new()
       concatScript:append('# fcut')
       for i, part in ipairs(parts) do
         local partName = 'part_'..tostring(i)..'.tmp'
         local outFilename = self:createTempFile(partName):getPath()
-        table.insert(commands, self:createCommand(part, outFilename, destOptions, parameters))
+        table.insert(commands, self:createCommand(part, outFilename, options, sourceOptions, parameters))
         local concatPartname = string.gsub(outFilename, '[\\+]', '/')
         --local concatPartname = partName -- to be safe
         concatScript:append('\nfile ', concatPartname)

fcut.lua

@@ -353,7 +353,7 @@ local httpContexts = {
       return false
     end,
     ['export(requestJson)?method=POST&:Content-Type=application/json'] = function(exchange, parameters)
-      local commands = ffmpeg:createCommands(parameters.filename, parameters.parts, parameters.options or {}, parameters.parameters or {})
+      local commands = ffmpeg:createCommands(parameters.filename, parameters.parts, parameters.options or {}, parameters.sourceOptions or {}, parameters.parameters or {})
       local exportId = strings.formatInteger(system.currentTimeMillis(), 64)
       logger:info('export '..exportId..' '..tostring(#commands)..' command(s)')
       exportContexts[exportId] = {

htdocs/fcut.html

@@ -23,6 +23,7 @@
         <div class="bar-flex-row">
           <button v-on:click="openProject().then(function() { pages.navigateTo('preview'); })" title="Select FCut Project file to open"><i class="fas fa-file"></i></button>
           <button v-on:click="saveProject()" title="Select FCut Project file to save as"><i class="fas fa-save"></i></button>
+          <button v-if="parts.length > 0" v-on:click="closeProject()" title="Close FCut Project"><i class="fas fa-trash"></i></button>
           <span class="bar-flex-row-content"></span>
           <button v-on:click="pages.navigateTo('help')"><i class="fas fa-question"></i></button>
         </div>
@@ -245,6 +246,19 @@ <h2>Export</h2>
           <div class="input-bar">
             <label><input type="checkbox" v-model="exportMapAllStreams" /> Map all streams</label>
           </div>
+          <div class="input-bar">
+            <label><input type="checkbox" v-model="exportUseOptions" /> Use additional options</label>
+          </div>
+          <template v-if="exportUseOptions">
+            <div class="bar-flex-row">
+              <label>Source:</label>
+              <input v-model="exportSourceOptions" name="exportSourceOptions" type="text" class="bar-flex-row-content"></input>
+            </div>
+            <div class="bar-flex-row">
+              <label>Destination:</label>
+              <input v-model="exportOptions" name="exportOptions" type="text" class="bar-flex-row-content"></input>
+            </div>
+          </template>
           <!--
             <div class="input-bar">
               <label>Subtitles:</label>

htdocs/fcut.js

@@ -18,6 +18,9 @@ function updatePart(part) {
   }
   return part;
 }
+function parseSourceDuration(duration) {
+  return Math.floor(parseFloat(duration) - 1.1);
+}
 
 var vm = new Vue({
   el: '#app',
@@ -33,7 +36,7 @@ var vm = new Vue({
       time: true,
       cut: true,
       bsearch: true,
-      project: false
+      project: true
     },
     step: 1,
     period: 180,
@@ -45,6 +48,9 @@ var vm = new Vue({
     exportAudioCodec: 'copy',
     exportSubtitleCodec: '-',
     exportMapAllStreams: true,
+    exportUseOptions: false,
+    exportOptions: '',
+    exportSourceOptions: '',
     duration: 0,
     parts: [],
     partIndex: 0,
@@ -181,7 +187,7 @@ var vm = new Vue({
     },
     addSource: function(sourceId, beforeIndex) {
       var info = this.sources[sourceId];
-      var duration = Math.floor(parseFloat(info.format.duration) - 1.1);
+      var duration = parseSourceDuration(info.format.duration);
       var part = updatePart({
         sourceId: sourceId,
         duration: duration,
@@ -432,6 +438,14 @@ var vm = new Vue({
         return;
       }
       var options = [];
+      if (this.exportUseOptions) {
+        if (this.exportOptions) {
+          options = options.concat(this.exportOptions.split(' '));
+        }
+        if (this.exportSourceOptions) {
+          options = options.concat(this.exportSourceOptions.split(' '));
+        }
+      }
       if (this.exportMapAllStreams) {
         options.push('-map', '0');
       }
@@ -453,9 +467,26 @@ var vm = new Vue({
       } else if (this.exportSubtitleCodec !== '') {
         options.push('-scodec', this.exportSubtitleCodec);
       }
+      var parts = [];
+      for (var i = 0; i < this.parts.length; i++) {
+        var part = this.parts[i];
+        var sourceId = part.sourceId;
+        var info = this.sources[sourceId];
+        if (info) {
+          var duration = parseSourceDuration(info.format.duration);
+          var p = {sourceId: sourceId};
+          if (part.from > 0) {
+            p.from = part.from;
+          }
+          if (part.to > 0 && part.to < duration) {
+            p.to = part.to;
+          }
+          parts.push(p);
+        }
+      }
       var request = {
         filename: this.destinationFilename,
-        parts: this.parts,
+        parts: parts,
         options: options
       };
       this.logBuffer = '';
@@ -542,6 +573,21 @@ var vm = new Vue({
         });
       });
     },
+    closeProject: function() {
+      this.sources = [];
+      this.parts = [];
+      this.previewSrc = 'roll.png';
+      this.partIndex = 0;
+      this.partTime = 0;
+      this.partEndTime = 0;
+      this.partInfo = {};
+      this.canJoin = false;
+      this.time = 0;
+      this.destinationFilename = DEFAULT_DESTINATION_FILENAME;
+      this.projectFilename = DEFAULT_PROJECT_FILENAME;
+      this.aspectRatio = 0;
+      this.refreshParts();
+    },
     openProject: function() {
       var that = this;
       return this.selectFiles(false, false, '.json').then(function(filename) {