Upload progressbar.js

progressbar.js

@@ -1,10 +1,18 @@
 // 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 lastGenerateTimeStamp = 0; // timestamp
+let cacheLastGenerateTimeStamp = 0;
+let cacheLastStringHourMin = null; //string
 
 
+//const options = { timeZone };
+const options = { timeZone, hour: '2-digit', minute: '2-digit' };
+const formatter = new Intl.DateTimeFormat([], options);
+
 function rememberGallerySelection() {
 
 }
@@ -50,24 +58,37 @@ function formatTime(secs) {
     }
 }
 
-function setTitle(progress) {
-    var title = 'Unity';
-
+function setTitle(progress, isGenerating = false) {
+   // var title = 'Unity';
+    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 
+                    if (lastGenerateTimeStamp == cacheLastGenerateTimeStamp && cacheLastStringHourMin != null){
+                        
+                    }
+                    else{
+                        cacheLastStringHourMin = getFormatDateTime(lastGenerateTimeStamp);
+                        cacheLastGenerateTimeStamp = lastGenerateTimeStamp;
+                    }
+                    title = cacheLastStringHourMin;
+                }
             }
         }
     }
@@ -76,6 +97,21 @@ function setTitle(progress) {
     }
 }
 
+function getFormatDateTime(timeStamp){
+    var currentDate = new Date(timeStamp);
+    var hours = currentDate.getHours();
+    var minutes = currentDate.getMinutes();
+    var formattedHours = hours.toString().padStart(2, '0');
+    var formattedMinutes = minutes.toString().padStart(2, '0');
+// Format the hours and minutes as a string
+     return `${formattedHours}:${formattedMinutes}`;
+}
+
+function getCurrentDateTimeGMTPlus7() {
+    // Use the global formatter to format the current date and time
+    return formatter.format(new Date());
+  }
+
 function getCurTimeInSeconds(){
     return Math.floor(Date.now() / 1000);
 }
@@ -123,25 +159,29 @@ function requestProgress(id_task, progressbarContainer, gallery, atEnd, onProgre
                 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
+                lastGenerateTimeStamp = 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;