Keep part color

javalikescript · Oct 31, 2022 · 20b9319 · 20b9319
1 parent 803ce85
commit 20b9319
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/fcut.lua b/fcut.lua
@@ -398,6 +398,7 @@ else
     contexts = httpContexts,
   }):next(function(webview)
     local httpServer = webview:getHttpServer()
+    logger:info('FCut HTTP Server available at http://localhost:%s/', (select(2, httpServer:getAddress())))
     httpServer:createContext('/webview/(.*)', RestHttpHandler:new({
       ['fullscreen(requestJson)?method=POST&Content-Type=application/json'] = function(exchange, fullscreen)
         webview:fullscreen(fullscreen == true);

diff --git a/htdocs/fcut-utils.js b/htdocs/fcut-utils.js
@@ -198,3 +198,15 @@ function readFile(filename, asJson) {
     return response.text();
   });
 }
+
+function hashString(s) {
+  var h = 0;
+  if (typeof s !== 'string') {
+    s = '' + s;
+  }
+  for (var i = 0; i < s.length; i++) {
+    h = ((h << 5) - h) + s.charCodeAt(i);
+    h |= 0;
+  }
+  return h;
+}
diff --git a/htdocs/fcut.html b/htdocs/fcut.html
@@ -76,7 +76,7 @@ <h2>Fast FFmpeg Cutter (Preview)</h2>
       </div>
       <div id="navigation-bar" v-if="bars.nav" v-on:click="navigateOnClick($event, 'navigation-bar')" class="navigation-bar">
         <span v-for="(part, index) in parts" class="part" v-bind:style="{
-          'background-color': hsvToRgb((index * 67) % 240 / 240, 0.8, partIndex === index ? 0.8 : 0.5),
+          'background-color': hsvToRgb(part ? part.hue : 0, 0.8, partIndex === index ? 0.8 : 0.5),
           width: (Math.floor((part ? part.duration : 0) * 980 / duration) / 10) + '%'
         }"></span>
         <span v-bind:style="{ left: (Math.floor(time * 980 / duration) / 10 + 1) + '%' }" class="position"></span>

diff --git a/htdocs/fcut.js b/htdocs/fcut.js
@@ -5,6 +5,14 @@ var timeRegExp = /^frame=.*\stime=([0-9:.]+)\s/;
 var DEFAULT_DESTINATION_FILENAME = 'fcut-out.mp4';
 var DEFAULT_PROJECT_FILENAME = 'fcut-project.json';
 
+function updatePart(part) {
+  if (typeof part === 'object') {
+    var u = hashString(part.sourceId + (part.from | 0).toString(16));
+    part.hue = Math.abs(u) % 240 / 240;
+  }
+  return part;
+}
+
 var vm = new Vue({
   el: '#app',
   data: {
@@ -171,12 +179,12 @@ var vm = new Vue({
     addSource: function(sourceId, beforeIndex) {
       var info = this.sources[sourceId];
       var duration = Math.floor(parseFloat(info.format.duration) - 1.1);
-      var part = {
+      var part = updatePart({
         sourceId: sourceId,
         duration: duration,
         from: 0,
         to: duration
-      };
+      });
       if ((beforeIndex >= 0) && (beforeIndex < this.parts.length)) {
         this.parts.splice(beforeIndex, 0, part);
       } else {
@@ -313,12 +321,12 @@ var vm = new Vue({
       if (firstIndex >= 0) {
         var part1 = this.parts[firstIndex];
         var part2 = this.parts[firstIndex + 1];
-        var part = {
+        var part = updatePart({
           sourceId: part1.sourceId,
           duration: part1.duration + part2.duration,
           from: part1.from,
           to: part2.to
-        };
+        });
         this.parts.splice(firstIndex, 2, part);
       }
     },
@@ -327,18 +335,18 @@ var vm = new Vue({
       if (at && (at.relTime > 0) && (at.relTime < at.part.duration)) {
         var part = at.part;
         var splitTime = part.from + at.relTime;
-        var part1 = {
+        var part1 = updatePart({
           sourceId: part.sourceId,
           duration: at.relTime,
           from: part.from,
           to: splitTime
-        };
-        var part2 = {
+        });
+        var part2 = updatePart({
           sourceId: part.sourceId,
           duration: part.duration - at.relTime,
           from: splitTime,
           to: part.to
-        };
+        });
         this.partTime = this.time;
         this.partEndTime = this.time + part2.duration;
         this.parts.splice(at.index, 1, part1, part2);