From a5630c28373d7f580e0b107c9476041a197296c3 Mon Sep 17 00:00:00 2001
From: 2Shirt <1923621+2Shirt@users.noreply.github.com>
Date: Wed, 21 Feb 2018 18:08:47 -0700
Subject: [PATCH] Updated HWiNFO download sections

---
 .bin/Scripts/build_pe.ps1        | 9 ++++-----
 .bin/Scripts/functions/update.py | 8 +++++++-
 .bin/Scripts/settings/sources.py | 2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.bin/Scripts/build_pe.ps1 b/.bin/Scripts/build_pe.ps1
index 61d43bf4..255d3f0e 100644
--- a/.bin/Scripts/build_pe.ps1
+++ b/.bin/Scripts/build_pe.ps1
@@ -139,8 +139,7 @@ if ($MyInvocation.InvocationName -ne ".") {
             @("fastcopy64.zip", "http://ftp.vector.co.jp/69/76/2323/FastCopy340_x64.zip"),
             @("fastcopy32.zip", "http://ftp.vector.co.jp/69/76/2323/FastCopy340.zip"),
             # HWiNFO
-            @("hwinfo64.zip", "http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip"),
-            @("hwinfo32.zip", "http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip"),
+            @("hwinfo.zip", "ftp://ftp.sac.sk/sac/utildiag/hwi_572.zip"),
             # Killer Network Drivers
             @(
                 "killerinf.zip",
@@ -295,14 +294,14 @@ if ($MyInvocation.InvocationName -ne ".") {
         Write-Host "Extracting: HWiNFO"
         try {
             $ArgumentList = @(
-                "e", "$Temp\hwinfo64.zip", "-o$Build\bin\amd64\HWiNFO",
+                "e", "$Temp\hwinfo.zip", "-o$Build\bin\amd64\HWiNFO",
                 "-aoa", "-bso0", "-bse0", "-bsp0", "HWiNFO64.exe")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
             $ArgumentList = @(
-                "e", "$Temp\hwinfo32.zip", "-o$Build\bin\x86\HWiNFO",
+                "e", "$Temp\hwinfo.zip", "-o$Build\bin\x86\HWiNFO",
                 "-aoa", "-bso0", "-bse0", "-bsp0", "HWiNFO32.exe")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
-            Remove-Item "$Temp\hwinfo*"
+            # Remove-Item "$Temp\hwinfo.zip"
             Move-Item "$Build\bin\amd64\HWiNFO\HWiNFO64.exe" "$Build\bin\amd64\HWiNFO\HWiNFO.exe" -Force
             Move-Item "$Build\bin\x86\HWiNFO\HWiNFO32.exe" "$Build\bin\x86\HWiNFO\HWiNFO.exe" -Force
         }
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index 6825f9ba..fec3209d 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -411,8 +411,14 @@ def update_hwinfo():
     for exe in ['HWiNFO32.exe', 'HWiNFO64.exe']:
         kill_process(exe)
     
+    # Get url
+    url = resolve_dynamic_url(
+        SOURCE_URLS['HWiNFO'],
+        '.*download.fosshub.*HWiNFO/hwi.*zip')
+    url = re.sub(r'.*src="([^"]+)".*', r'\1', url)
+    
     # Download
-    download_to_temp('HWiNFO.zip', SOURCE_URLS['HWiNFO'])
+    download_to_temp('HWiNFO.zip', url)
     
     # Extract files
     extract_temp_to_bin('HWiNFO.zip', 'HWiNFO')
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 8a67abd3..f25ccf66 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -17,7 +17,7 @@ SOURCE_URLS = {
     'FastCopy32': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip',
     'FastCopy64': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip',
     'Firefox uBO': 'https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.15.10-an+fx.xpi?filehash=sha256%3A30b258803fd6cd988c5ba479f2f6ff5b4e9b40110c81e3421a6867b20ec718a6',
-    'HWiNFO': 'https://www.hwinfo.com/files/hwi_572.zip',
+    'HWiNFO': 'https://www.fosshub.com/HWiNFO.html/hwi_572.zip',
     'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
     'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
     'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.3.0.13.paf.exe',