Only compress PNG when needed, instance-queue-left

vrcx-team · Sep 1, 2024 · 06dad59 · 06dad59
1 parent ed74e82
commit 06dad59
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 28 deletions.
diff --git a/Dotnet/AppApi/AppApi.cs b/Dotnet/AppApi/AppApi.cs
@@ -68,36 +68,39 @@ public string ResizeImageToFitLimits(string base64data)
         public byte[] ResizeImageToFitLimits(byte[] imageData, int maxWidth = 2000, int maxHeight = 2000, long maxSize = 10_000_000)
         {
             using var fileMemoryStream = new MemoryStream(imageData);
-            System.Drawing.Bitmap image = new System.Drawing.Bitmap(fileMemoryStream);
+            var image = new Bitmap(fileMemoryStream);
+
+            // for APNG, check if image is png format and less than maxSize
+            if (image.RawFormat.Equals(System.Drawing.Imaging.ImageFormat.Png) &&
+                imageData.Length < maxSize &&
+                image.Width <= maxWidth &&
+                image.Height <= maxHeight)
+            {
+                return imageData;
+            }
+
             if (image.Width > maxWidth)
             {
                 var sizingFactor = image.Width / (double)maxWidth;
-                int newHeight = (int)Math.Round(image.Height / sizingFactor);
-                image = new System.Drawing.Bitmap(image, maxWidth, newHeight);
+                var newHeight = (int)Math.Round(image.Height / sizingFactor);
+                image = new Bitmap(image, maxWidth, newHeight);
             }
             if (image.Height > maxHeight)
             {
                 var sizingFactor = image.Height / (double)maxHeight;
-                int newWidth = (int)Math.Round(image.Width / sizingFactor);
-                image = new System.Drawing.Bitmap(image, newWidth, maxHeight);
-            }
-
-            void saveToFileToUpload()
-            {
-                using var imageSaveMemoryStream = new MemoryStream();
-                image.Save(imageSaveMemoryStream, System.Drawing.Imaging.ImageFormat.Png);
-                imageData = imageSaveMemoryStream.ToArray();
+                var newWidth = (int)Math.Round(image.Width / sizingFactor);
+                image = new Bitmap(image, newWidth, maxHeight);
             }
 
-            saveToFileToUpload();
-
+            SaveToFileToUpload();
             for (int i = 0; i < 250 && imageData.Length > maxSize; i++)
             {
-                saveToFileToUpload();
+                SaveToFileToUpload();
                 if (imageData.Length < maxSize)
                     break;
-                int newWidth = image.Width;
-                int newHeight = image.Height;
+
+                int newWidth;
+                int newHeight;
                 if (image.Width > image.Height)
                 {
                     newWidth = image.Width - 25;
@@ -108,7 +111,7 @@ void saveToFileToUpload()
                     newHeight = image.Height - 25;
                     newWidth = (int)Math.Round(image.Width / (image.Height / (double)newHeight));
                 }
-                image = new System.Drawing.Bitmap(image, newWidth, newHeight);
+                image = new Bitmap(image, newWidth, newHeight);
             }
 
             if (imageData.Length > maxSize)
@@ -117,6 +120,13 @@ void saveToFileToUpload()
             }
 
             return imageData;
+
+            void SaveToFileToUpload()
+            {
+                using var imageSaveMemoryStream = new MemoryStream();
+                image.Save(imageSaveMemoryStream, System.Drawing.Imaging.ImageFormat.Png);
+                imageData = imageSaveMemoryStream.ToArray();
+            }
         }
 
         /// <summary>

diff --git a/html/src/app.js b/html/src/app.js
@@ -5227,6 +5227,11 @@ speechSynthesis.getVoices();
                 $app.instanceQueueReady(instanceId);
                 break;
 
+            case 'instance-queue-left':
+                console.log('instance-queue-left', content);
+                $app.instanceQueueClear();
+                break;
+
             case 'content-refresh':
                 var contentType = content.contentType;
                 console.log('content-refresh', content);
@@ -29003,16 +29008,13 @@ speechSynthesis.getVoices();
         // workerTimers.setTimeout(this.instanceQueueTimeout, 3600000);
     };
 
-    // $app.methods.instanceQueueTimeout = function () {
-    //     // remove instance from queue after 1hour of inactivity
-    //     API.queuedInstances.forEach((ref) => {
-    //         // 59mins
-    //         if (Date.now() - ref.updatedAt > 3540000) {
-    //             ref.$msgBox.close();
-    //             API.queuedInstances.delete(ref.location);
-    //         }
-    //     });
-    // };
+    $app.methods.instanceQueueClear = function () {
+        // remove all instances from queue
+        API.queuedInstances.forEach((ref) => {
+            ref.$msgBox.close();
+            API.queuedInstances.delete(ref.location);
+        });
+    };
 
     /**
      * @param {{ groupId: string }} params