Upload progressbar.js

progressbar.js

@@ -1,10 +1,11 @@
 // code related to showing and updating progressbar shown as the image is being made
-let lastTimeSuccess = 0; //epoch time in second
+let lastTimeGenerate = 0; //epoch time in second
 let timeWarning = 160;
 let maxTimeWarning = 3600;
 let firstTimeStart = 0;
 let timeZone = 'Asia/Bangkok';
-let lastCompleteTime = 0;
+let lastGenerateDateTime = 0;
+
 //const options = { timeZone };
 const options = { timeZone, hour: '2-digit', minute: '2-digit' };
 const formatter = new Intl.DateTimeFormat([], options);
@@ -54,28 +55,30 @@ function formatTime(secs) {
     }
 }
 
-function setTitle(progress, showCurDateTIme = false) {
+function setTitle(progress, isGenerating = false) {
    // var title = 'Unity';
-    var title = lastCompleteTime;
-    if (showCurDateTIme == true){
-        lastCompleteTime = getCurrentDateTimeGMTPlus7();
-        title = lastCompleteTime;
-    }
-    else if (opts.show_progress_in_title && progress) {
+    var title = lastTimeGenerate;
+    if (opts.show_progress_in_title && progress) {
         title = '[' + progress.trim() + '] ' + title;
     }
-    else if (lastTimeSuccess > 0){ // hoangpl display duration since last time success
-        var curTime = getCurTimeInSeconds();
-        if (curTime - firstTimeStart > 14400){
-            title = 'exceed 4 hours ';
-        }
-        else{
-            var durationSinceLastSuccess = curTime - lastTimeSuccess;
-            if (durationSinceLastSuccess > maxTimeWarning){ // hoangpl no need update ui
-                title = 'exceed > ' + maxTimeWarning + 's';
+    else if (!isGenerating){
+        if (lastTimeGenerate > 0){
+            var curTime = getCurTimeInSeconds();
+            if (curTime - firstTimeStart > 14400){
+                title = 'exceed 4 hours ';
             }
-            else if (durationSinceLastSuccess > timeWarning){
-                title = 'warning ' + durationSinceLastSuccess + 's';
+            else{
+                var durationSinceLastGenerate = curTime - lastTimeGenerate;
+                if (durationSinceLastGenerate > maxTimeWarning){ // hoangpl no need update ui
+                    title = 'exceed > ' + maxTimeWarning + 's';
+                }
+                else if (durationSinceLastGenerate > timeWarning){
+                    title = 'warning ' + durationSinceLastGenerate + 's';
+                }
+                else{
+                    //display last time generating 
+                    title = getFormatDateTime(lastGenerateDateTime);
+                }
             }
         }
     }
@@ -84,6 +87,13 @@ function setTitle(progress, showCurDateTIme = false) {
     }
 }
 
+function getFormatDateTime(currentDate){
+    var hours = currentDate.getHours();
+    var minutes = currentDate.getMinutes();
+// Format the hours and minutes as a string
+     return `${hours}:${minutes}`;
+}
+
 function getCurrentDateTimeGMTPlus7() {
     // Use the global formatter to format the current date and time
     return formatter.format(new Date());
@@ -116,13 +126,13 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
 
     var livePreview = null;
 
-    var removeProgressBar = function(showCurDateTIme = false) {
+    var removeProgressBar = function() {
         if (!divProgress) {
-            setTitle("",showCurDateTIme); // hoangpl continue update title
+            setTitle(""); // hoangpl continue update title
             return;
         }
 
-        setTitle("",showCurDateTIme);
+        setTitle("");
         parentProgressbar.removeChild(divProgress);
         if (gallery && livePreview) gallery.removeChild(livePreview);
         atEnd();
@@ -133,28 +143,32 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
     var funProgress = function(id_task) {
         request("./internal/progress", {id_task: id_task, live_preview: false}, function(res) {
             if (res.completed) {
-                removeProgressBar(rue);
+                removeProgressBar();
                 return;
             }
-
+            let isGenerating = false;
             let progressText = "";
 
             divInner.style.width = ((res.progress || 0) * 100.0) + '%';
             divInner.style.background = res.progress ? "" : "transparent";
 
             if (res.progress > 0) {
+                isGenerating = true;
                 progressText = ((res.progress || 0) * 100.0).toFixed(0) + '%';
             }
 
             if (res.eta) {
+                isGenerating = true;
                 progressText += " ETA: " + formatTime(res.eta);
-                lastTimeSuccess = getCurTimeInSeconds(); // hoangpl 
+            }
+            if (isGenerating){
+                lastTimeGenerate = getCurTimeInSeconds(); // hoangpl
+                lastGenerateDateTime = Date.now();
                 if (firstTimeStart <= 0){
-                    firstTimeStart = lastTimeSuccess;
+                    firstTimeStart = lastTimeGenerate;
                 }
             }
-
-            setTitle(progressText);
+            setTitle(progressText, isGenerating);
 
             if (res.textinfo && res.textinfo.indexOf("\n") == -1) {
                 progressText = res.textinfo + " " + progressText;
@@ -167,12 +181,12 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
             if (res.active) wasEverActive = true;
 
             if (!res.active && wasEverActive) {
-                removeProgressBar(true);
+                removeProgressBar();
                 return;
             }
 
             if (elapsedFromStart > inactivityTimeout && !res.queued && !res.active) {
-                removeProgressBar(true);
+                removeProgressBar();
                 return;
             }
 
@@ -184,7 +198,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 funProgress(id_task, res.id_live_preview);
             }, opts.live_preview_refresh_period || 500);
         }, function() {
-            removeProgressBar(true);
+            removeProgressBar();
         });
     };
 
@@ -215,7 +229,7 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 funLivePreview(id_task, res.id_live_preview);
             }, opts.live_preview_refresh_period || 500);
         }, function() {
-            removeProgressBar(true);
+            removeProgressBar();
         });
     };