From e8d83c6e9b2ca2b1fb178d4e2898a1eb78c2240f Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Thu, 14 Sep 2023 20:42:00 -0400
Subject: [PATCH] Background fill the .ico

- Add additional ignores/msbuild deletes to icon gen script
---
 .gitignore                                     |  2 ++
 build/logo.svg                                 |  6 +++++-
 .../Tgstation.Server.Common.csproj             |  4 ++--
 src/Tgstation.Server.Common/build_logo.js      | 18 +++++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 770d2a28d4..32a0e7ad23 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,5 @@ packaging/
 /src/Tgstation.Server.Common/node_modules
 /src/Tgstation.Server.Common/package.json
 /src/Tgstation.Server.Common/yarn.lock
+/src/Tgstation.Server.Common/logo_bg_white.svg
+yarn-error.log*
diff --git a/build/logo.svg b/build/logo.svg
index 58b432ac35..a3b75b7af6 100644
--- a/build/logo.svg
+++ b/build/logo.svg
@@ -118,4 +118,8 @@
          style="stroke:#ffffff;stroke-width:1;stroke-dasharray:none;stroke-opacity:1" /><path
          style="fill:#097dd6;stroke:#ffffff;stroke-width:1;stroke-dasharray:none;stroke-opacity:1"
          d="m 128.64827,132.83849 c -0.266,2.394 -1.596,3.591 -3.99,3.591 -2.261,0 -3.325,-1.197 -3.059,-3.591 l 3.325,-23.275 h -13.832 l -3.325,23.275 c -0.399,1.463 -0.266,2.66 -0.266,4.123 0,9.044 4.788,13.965 15.428,13.965 12.369,0 18.487,-6.384 20.083,-18.088 l 2.261,-15.694 c 0.266,-1.995 0.399,-3.857 0.399,-5.586 0,-6.384 -1.995,-11.570998 -6.916,-19.683998 -6.783,-10.64 -8.645,-13.034 -7.98,-18.62 l 2.261,-16.226 c 0.399,-2.261 1.729,-3.458 3.99,-3.458 2.394,0 3.325,1.197 2.926,3.458 l -2.793,20.083 h 13.3 l 2.793,-20.083 c 0.266,-1.729 0.399,-3.325 0.399,-4.921 0,-9.044 -4.389,-13.034 -15.029,-13.034 -11.837,0 -18.487,5.985 -20.216,17.955 l -2.261,16.359 c -0.266,1.596 -0.399,3.059 -0.399,4.522 0,7.049 2.527,12.502 7.182,19.95 7.315,11.171998 8.645,13.698998 7.98,19.417998 z"
-         id="path10" /></g></g></svg>
+         id="path10" /></g><!-- DO NOT CHANGE THIS LINE, UNCOMMENTING IT ENABLES THE WHITE BACKGROUND FOR THE .ICO--><!--<path
+       style="fill:#ffffff"
+       d="m 346.5,637.41216 -30,-16.90917 -9.5,0.48243 c -5.225,0.26534 -20.975,0.7302 -35,1.03302 l -25.5,0.55059 -3.98732,-6.28452 c -2.19302,-3.45648 -8.68943,-13.48448 -14.43645,-22.28443 -12.07576,-18.49065 -10.77605,-18.80069 -13.62427,3.24992 l -1.71148,13.25 h -45.27662 c -42.60474,0 -45.25326,-0.10327 -44.88073,-1.75 0.21774,-0.9625 4.2721,-29.425 9.00969,-63.25 7.84345,-55.99986 8.56021,-62.42474 8.0145,-71.84 -0.49275,-8.50175 -0.99839,-10.90178 -2.8442,-13.5 -1.23469,-1.738 -10.46149,-14.57539 -20.50401,-28.52752 C 106.2166,417.68034 98,405.93801 98,405.53841 c 0,-0.3996 5.80004,-15.08421 12.88898,-32.63248 L 123.77796,341 118.90952,308 c -2.67764,-18.15 -4.87768,-33.92047 -4.88898,-35.0455 -0.0145,-1.44381 6.37658,-7.47391 21.72716,-20.5 L 157.49541,234 145.14722,233.71841 c -12.17997,-0.27774 -12.34115,-0.3118 -11.83209,-2.5 0.28386,-1.22012 3.13511,-21.45591 6.33613,-44.96841 l 5.82003,-42.75 h 56.5971 56.5971 l 25.24775,-23.6361 25.24774,-23.636099 33.66951,9.149359 33.66951,9.14936 32.5,-8.99646 c 17.875,-4.94805 33.175,-8.988084 34,-8.977844 0.825,0.01024 12.75,10.565664 26.5,23.456494 l 25,23.43788 7.46702,1.67537 c 6.08824,1.36601 8.21172,1.46021 11.5,0.51014 20.16618,-5.82653 31.51705,-7.16875 50.4588,-5.96665 40.47571,2.56869 64.18322,25.798 64.12809,62.83455 -0.0145,9.73827 -2.03549,33.44674 -4.04907,47.5 l -0.85969,6 4.67098,4 c 2.56903,2.2 6.32736,5.575 8.35184,7.5 l 3.68086,3.5 -4.96888,34.26846 -4.96888,34.26846 13.10148,32.57006 c 13.02564,32.38152 13.09139,32.58546 11.35991,35.23154 -0.95787,1.46381 -9.82182,13.86313 -19.69769,27.55403 -9.87586,13.69091 -18.33794,26.06591 -18.80461,27.5 -0.64274,1.97514 -6.93585,64.48805 -6.88076,68.35029 0.006,0.40857 -5.76314,3.63607 -12.81993,7.17224 l -12.83053,6.42939 -1.80052,6.65165 c -5.57436,20.59338 -20.17734,40.31853 -37.31288,50.40084 -6.00842,3.53527 -20.25474,9.01455 -27.36585,10.52519 -1.73427,0.36842 -3.68771,2.19381 -5.69251,5.31937 L 508.11499,622 l -34.8503,-0.78637 -34.8503,-0.78637 -30.43741,17.03637 c -16.74057,9.37 -30.67131,16.99617 -30.95719,16.94703 C 376.7339,654.36153 363,646.7122 346.5,637.41216 Z m -6,-42.59711 c 10.01065,-2.20375 20.55025,-7.34652 26.54199,-12.95109 l 5.14759,-4.81497 8.65521,9.2616 c 4.76037,5.09388 9.39263,9.24535 10.29392,9.2255 1.05287,-0.0232 1.84343,-1.19796 2.21135,-3.28609 C 393.97721,588.6906 422,388.00683 422,387.0749 422,386.75871 406.025,386.5 386.5,386.5 c -27.73322,0 -35.50005,0.27348 -35.50022,1.25 -2.5e-4,1.45336 -5.70551,43.9181 -6.44893,48 L 344.05,438.5 h 9.49405 c 9.32759,0 9.48526,0.0394 8.99262,2.25 -0.27579,1.2375 -3.23956,21.56463 -6.58617,45.17139 -6.44607,45.47024 -7.05489,47.96433 -12.9114,52.89226 -5.9639,5.01829 -17.63865,4.86393 -22.2891,-0.2947 -2.31849,-2.57184 -2.75,-3.94085 -2.75,-8.72466 0,-3.12078 9.46819,-72.97618 21.04042,-155.23422 22.8464,-162.39742 21.71161,-156.07376 28.85746,-160.80862 2.60823,-1.72822 4.83972,-2.25145 9.60212,-2.25145 7.81206,0 12.34915,2.69803 14.39188,8.55827 1.28434,3.68457 0.95581,7.04276 -4.25245,43.4674 -3.10437,21.71088 -5.64322,39.81183 -5.64187,40.22433 0.001,0.4125 10.91494,0.74964 24.25244,0.74921 l 24.25,-8e-4 5.78251,-40.2492 c 6.25398,-43.53084 7.10096,-57.55848 4.27914,-70.87121 -1.83585,-8.66109 -6.3227,-17.39837 -11.72079,-22.82396 -17.0933,-17.18037 -62.30429,-18.87621 -88.76766,-3.32963 -16.03652,9.42106 -27.31781,26.27101 -32.4739,48.50363 -0.8513,3.67074 -11.4594,76.90738 -23.57356,162.7481 -23.0931,163.63733 -23.51385,167.33945 -20.58739,181.14586 1.5524,7.32385 5.99941,16.65855 10.27869,21.57595 6.61323,7.59939 19.64951,13.64017 33.03762,15.30904 8.68643,1.0828 24.81414,0.27418 33.74534,-1.69194 z m 162.41602,1.64563 c 34.07316,-3.49657 54.57217,-21.17982 63.07021,-54.40684 1.02644,-4.01336 4.39277,-24.93861 7.48073,-46.50055 7.56336,-52.81183 7.61649,-64.2516 0.40306,-86.79177 C 569.76522,395.93501 560.80014,378.86363 544.32416,352.5 524.00048,319.97958 520,311.17234 520,298.9493 c 0,-9.0137 9.62672,-74.86041 11.53129,-78.874 2.67974,-5.64713 7.71653,-8.5753 14.7505,-8.5753 9.20684,0 13.71821,3.57983 13.71821,10.88555 0,1.5353 -2.4721,20.52663 -5.49357,42.20295 -3.02146,21.67633 -5.49646,39.524 -5.5,39.6615 -0.004,0.1375 11.24357,0.25 24.99357,0.25 17.54673,0 25,-0.32863 25,-1.1023 0,-0.60626 2.74703,-20.74376 6.10452,-44.75 5.55482,-39.71735 6.05676,-44.72827 5.57419,-55.6477 -0.72895,-16.49442 -3.21402,-23.78595 -10.9769,-32.20768 -4.83457,-5.24488 -12.41959,-9.30044 -22.20181,-11.87087 -10.58702,-2.78189 -38.92825,-2.53714 -50,0.43181 -13.57367,3.63985 -21.93925,8.36938 -31.03043,17.54326 -9.47621,9.56241 -14.9668,19.61573 -18.89859,34.60348 C 474.17951,224.42809 464,298.66901 464,310.47552 c 0,18.31666 6.17964,39.04868 17.74259,59.52448 3.10592,5.5 11.35158,19 18.32369,30 20.55784,32.43439 24.34585,41.38554 24.12165,57 -0.18622,12.96994 -9.38781,73.44763 -11.80227,77.57081 -2.77165,4.73313 -6.60296,7.14757 -12.19459,7.68485 -9.8181,0.9434 -16.17882,-3.7019 -16.18733,-11.82177 -0.003,-2.94893 10.62133,-79.93747 12.51438,-90.68389 l 0.57251,-3.25 H 471.04531 C 456.72039,436.5 445,436.666 445,436.86888 c 0,0.20288 -3.18703,22.36538 -7.08229,49.25 -6.44397,44.4755 -7.03313,49.87254 -6.53692,59.88112 0.83746,16.89136 4.09253,26.36118 12.13646,35.30796 11.09372,12.33888 32.81699,17.88052 59.39877,15.15272 z M 223.66235,404.5 c 14.45755,-103.125 26.29797,-187.8375 26.31205,-188.25 0.0141,-0.4125 9.4756,-0.75 21.0256,-0.75 12.36691,0 21,-0.38455 21,-0.93543 0,-0.51448 1.575,-12.30732 3.5,-26.2063 1.925,-13.89898 3.5,-25.62804 3.5,-26.06457 0,-0.68262 -137.8962,-1.22568 -138.06007,-0.5437 -0.0331,0.1375 -1.74645,12.2875 -3.80756,27 l -3.74748,26.75 h 21.10298 21.10298 l -26.26291,187.25 c -14.4446,102.9875 -26.27754,187.81973 -26.29542,188.51607 -0.0256,0.99753 5.73417,1.20964 27.15543,1 L 197.37591,592 Z"
+       id="path1"
+       transform="matrix(0.26458333,0,0,0.26458333,-0.79874203,0)" /><!-SCRIPT_REPLACE_TOKEN- --></g></svg>
diff --git a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
index 972ee6b33c..9ff1909f7f 100644
--- a/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
+++ b/src/Tgstation.Server.Common/Tgstation.Server.Common.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <!-- This is here because I know we have node as a build dep so this just works -->
-  <Target Name="IconGeneration" BeforeTargets="ResolveAssemblyReferences" Inputs="../../build/logo.svg" Outputs="../../artifacts/tgs.ico;../../artifacts/tgs.png">
+  <Target Name="IconGeneration" BeforeTargets="ResolveAssemblyReferences" Inputs="build_logo.js;../../build/logo.svg" Outputs="../../artifacts/tgs.ico;../../artifacts/tgs.png">
     <Message Text="Restoring yarn packages..." Importance="high" />
     <Exec Command="npx --yes yarn add svg-to-ico@1.0.14 svg2img@1.0.0-beta.2" />
     <Message Text="Generating icons from SVG..." Importance="high" />
@@ -24,6 +24,6 @@
 
   <Target Name="IconNodeCleanup" AfterTargets="IconGeneration;IconClean">
     <RemoveDir Directories="node_modules" />
-    <Delete Files="package.json;yarn.lock" />
+    <Delete Files="package.json;yarn.lock;logo_bg_white.svg;yarn-error.log" />
   </Target>
 </Project>
diff --git a/src/Tgstation.Server.Common/build_logo.js b/src/Tgstation.Server.Common/build_logo.js
index caf3f2eb7b..c79a46903c 100644
--- a/src/Tgstation.Server.Common/build_logo.js
+++ b/src/Tgstation.Server.Common/build_logo.js
@@ -1,6 +1,6 @@
 // Prereq packages: svg-to-ico@1.0.14 svg2img@1.0.0-beta.2
 // Usage: node ./build_logo.js
-// Generates ../../artifacts/tgs.ico and ../../artifacts/tgs.ico 
+// Generates ../../artifacts/tgs.ico and ../../artifacts/tgs.ico
 
 const svg_to_img = require("svg-to-ico");
 const svg2img = require('svg2img');
@@ -10,12 +10,19 @@ if (!fs.existsSync("../../artifacts")) {
     fs.mkdirSync("../../artifacts",'0777', true);
 }
 
+const svg_bytes = fs.readFileSync("../../build/logo.svg");
+const svg = svg_bytes.toString();
+const white_bg_svg = svg
+    .replace("<!-- DO NOT CHANGE THIS LINE, UNCOMMENTING IT ENABLES THE WHITE BACKGROUND FOR THE .ICO--><!--", "")
+    .replace("SCRIPT_REPLACE_TOKEN", "");
+fs.writeFileSync("logo_white_bg.svg", white_bg_svg);
+
 svg_to_img({
-   input_name: "../../build/logo.svg",
+   input_name: "logo_white_bg.svg",
    output_name: "../../artifacts/tgs.ico",
    sizes: [ 160 ]
 }).then(() => {
-    // this package sucks, path separators are fucked
+    fs.unlinkSync("logo_white_bg.svg");
     svg2img(
         "../../build/logo.svg",
         {
@@ -35,6 +42,7 @@ svg_to_img({
             fs.writeFileSync("../../artifacts/tgs.png", buffer);
         });
 }).catch((error) => {
-   console.error(`ICO conversion failed: ${error}`);
-   exit(1);
+    fs.unlinkSync("logo_white_bg.svg");
+    console.error(`ICO conversion failed: ${error}`);
+    exit(1);
 });