Merge pull request #33 from usefulness/size_comment

Add size outputs

Author: mateuszkwiecinski

.github/workflows/main.yml

@@ -36,6 +36,11 @@ jobs:
         with:
           body: |
             ### diffuse-smoke-test-1
+            `size-old-bytes`: ${{ steps.diffuse.outputs.size-old-bytes }}
+            `size-old-text`: ${{ steps.diffuse.outputs.size-old-text }}
+            `size-new-bytes`: ${{ steps.diffuse.outputs.size-new-bytes }}
+            `size-new-text`: ${{ steps.diffuse.outputs.size-new-text }}
+            `size-diff-comment_style_1`: ${{ steps.diffuse.outputs.size-diff-comment_style_1 }}
 
             `steps.diffuse.outputs.diff-gh-comment:`
             ${{ steps.diffuse.outputs.diff-gh-comment }}
@@ -101,6 +106,11 @@ jobs:
         with:
           body: |
             ### diffuse-smoke-test-2
+            `size-old-bytes`: ${{ steps.diffuse.outputs.size-old-bytes }}
+            `size-old-text`: ${{ steps.diffuse.outputs.size-old-text }}
+            `size-new-bytes`: ${{ steps.diffuse.outputs.size-new-bytes }}
+            `size-new-text`: ${{ steps.diffuse.outputs.size-new-text }}
+            `size-diff-comment_style_1`: ${{ steps.diffuse.outputs.size-diff-comment_style_1 }}
 
             `steps.diffuse.outputs.diff-gh-comment-no-dex:`
             ${{ steps.diffuse.outputs.diff-gh-comment-no-dex }}

action.yml

@@ -40,6 +40,7 @@ outputs:
   diff-gh-comment-no-dex-all-collapsed:
     description: "Diffuse full output as Github comment all collapsed, without dex section, workaround for https://github.com/JakeWharton/diffuse/issues/96"
     value: ${{ steps.run-diffuse.outputs.diff-gh-comment-no-dex-all-collapsed }}
+
   summary:
     description: "Diffuse summary"
     value: ${{ steps.run-diffuse.outputs.summary }}
@@ -61,6 +62,22 @@ outputs:
   classes:
     description: "Diffuse classes info"
     value: ${{ steps.run-diffuse.outputs.classes }}
+
+  size-old-bytes:
+    description: "Old artifact size, number, in Bytes"
+    value: ${{ steps.run-diffuse.outputs.size-old-bytes }}
+  size-old-text:
+    description: "Old artifact size, text, formatted with unit i.e. 320 KiB"
+    value: ${{ steps.run-diffuse.outputs.size-old-text }}
+  size-new-bytes:
+    description: "New artifact size, number, in Bytes"
+    value: ${{ steps.run-diffuse.outputs.size-new-bytes }}
+  size-new-text:
+    description: "New artifact size, text, formatted with unit i.e. 320 KiB"
+    value: ${{ steps.run-diffuse.outputs.size-new-text }}
+  size-diff-comment_style_1:
+    description: "Size diff in a human readable form. i.e. '+16.6MiB (16.1MiB -> 32.7MiB)'"
+    value: ${{ steps.run-diffuse.outputs.size-diff-comment_style_1 }}
 branding:
   color: 'red'
   icon: 'check-square'

entrypoint.py

@@ -42,6 +42,20 @@ def grouper(iterable, n, fillvalue=None):
     return zip_longest(*args, fillvalue=fillvalue)
 
 
+def sizeof_fmt(num, suffix='B', sign=False):
+    for unit in ['', 'Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi']:
+        if abs(num) < 1024.0:
+            if sign:
+                return "%+3.1f%s%s" % (num, unit, suffix)
+            else:
+                return "%3.1f%s%s" % (num, unit, suffix)
+        num /= 1024.0
+    if sign:
+        return "%+.1f%s%s" % (num, 'Yi', suffix)
+    else:
+        return "%.1f%s%s" % (num, 'Yi', suffix)
+
+
 url = "https://github.com/JakeWharton/diffuse/releases/download/{0}/diffuse-{0}-binary.jar" \
     .format(os.getenv("INPUT_VERSION"))
 downloadArgs = ""
@@ -70,11 +84,25 @@ def grouper(iterable, n, fillvalue=None):
 if os.getenv("INPUT_NEW_MAPPING_FILE").strip():
     java_call.extend(["--new-mapping", os.getenv("INPUT_NEW_MAPPING_FILE")])
 
+oldSize = os.stat(oldFile).st_size
+oldSizeText = sizeof_fmt(oldSize)
+newSize = os.stat(newFile).st_size
+newSizeText = sizeof_fmt(newSize)
+diff = newSize - oldSize
+diffComment1 = f"{sizeof_fmt(diff, sign=True)} ({oldSizeText} -> {newSizeText})"
 if is_debug():
-    print("Old: {} bytes".format(os.stat(oldFile).st_size))
-    print("New: {} bytes".format(os.stat(newFile).st_size))
+    print("Old: {} bytes".format(oldSizeText))
+    print("New: {} bytes".format(newSizeText))
+    print("Diff: {} bytes".format(diffComment1))
+    print(diffComment1)
     print(" ".join(java_call))
 
+os.system(f"echo \"::set-output name=size-old-bytes::{oldSize}\"")
+os.system(f"echo \"::set-output name=size-old-text::{oldSizeText}\"")
+os.system(f"echo \"::set-output name=size-new-bytes::{newSize}\"")
+os.system(f"echo \"::set-output name=size-new-text::{newSizeText}\"")
+os.system(f"echo \"::set-output name=size-diff-comment_style_1::{diffComment1}\"")
+
 process = subprocess.Popen(java_call, stdout=subprocess.PIPE)
 out, _ = process.communicate()
 
@@ -100,7 +128,7 @@ def grouper(iterable, n, fillvalue=None):
 
 for (title, content) in grouper(sections, 2):
     key = title.lower().strip().replace(" ", "-")
-    value = content.strip().replace("$", "_")
+    value = content.rstrip().lstrip("\n").replace("$", "_")
     if len(value) > github_output_limit:
         value = value[0:github_output_limit] + "\n...✂"