Merge branch 'main' into better-error-handling

Author: marticliment

.github/workflows/update-icons.yaml

@@ -23,6 +23,15 @@ jobs:
           git commit WebBasedData/screenshot-database.json -m "Update icons and screenshots"
           exit 0
 
+      - name: Prepare PR Body with Images
+        id: prepare_pr_body
+        run: |
+          echo "## New Images" > pr_body.md
+          Get-Content WebBasedData/new_urls.txt | ForEach-Object {
+            if (![string]::IsNullOrWhiteSpace($_)) {
+              Add-Content pr_body.md "<a href='$_'><img src='$_' width='200' height='200' /></a>" -NoNewline
+            }
+          }
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
         with:
@@ -33,3 +42,4 @@ jobs:
           author: "Excel Bot <[email protected]>"
           commit-message: "Update icons and screenshots from the excel file"
           branch: pull-request/update-icons-and-screenshots
+          body-path: pr_body.md

.gitignore

@@ -14,7 +14,9 @@ unigetui_bin/
 APIKEY.txt
 *.pyc
 WebBasedData/screenshot_database.xlsx
+WebBasedData/new_urls.txt
 WebBasedData/screenshot-database.json.backup
+pr_body.md
 *.log
 UniGetUI/wingettest.py
 *.nupkg

README.md

@@ -1,10 +1,10 @@
 {
     "package_count": {
-        "total": 11867,
-        "done": 5366,
-        "packages_with_icon": 5366,
-        "packages_with_screenshot": 772,
-        "total_screenshots": 2386
+        "total": 11882,
+        "done": 5381,
+        "packages_with_icon": 5381,
+        "packages_with_screenshot": 785,
+        "total_screenshots": 2438
     },
     "icons_and_screenshots": {
         "__test_entry_DO_NOT_EDIT_PLEASE": {
@@ -2920,6 +2920,33 @@
                 "https://www.graebert.com/wp-content/uploads/2022/03/sheet_list_2023_2.jpg"
             ]
         },
+        "arescommander-2024": {
+            "icon": "https://cad.com.au/wp-content/uploads/2020/11/ares-logo-red.png",
+            "images": [
+                "https://www.graebert.com/wp-content/uploads/2021/02/ARES-Commander-2020-tower-transparent-with-logo-1.jpg",
+                "https://www.graebert.com/wp-content/uploads/2021/08/ARES_Kudo2.jpg",
+                "https://windows-cdn.softpedia.com/screenshots/ARES-Commander-Edition_3.png",
+                "https://www.graebert.com/wp-content/uploads/2022/03/sheet_list_2023_2.jpg"
+            ]
+        },
+        "arescommander-2025": {
+            "icon": "https://cad.com.au/wp-content/uploads/2020/11/ares-logo-red.png",
+            "images": [
+                "https://www.graebert.com/wp-content/uploads/2021/02/ARES-Commander-2020-tower-transparent-with-logo-1.jpg",
+                "https://www.graebert.com/wp-content/uploads/2021/08/ARES_Kudo2.jpg",
+                "https://windows-cdn.softpedia.com/screenshots/ARES-Commander-Edition_3.png",
+                "https://www.graebert.com/wp-content/uploads/2022/03/sheet_list_2023_2.jpg"
+            ]
+        },
+        "arescommander-2026": {
+            "icon": "https://cad.com.au/wp-content/uploads/2020/11/ares-logo-red.png",
+            "images": [
+                "https://www.graebert.com/wp-content/uploads/2021/02/ARES-Commander-2020-tower-transparent-with-logo-1.jpg",
+                "https://www.graebert.com/wp-content/uploads/2021/08/ARES_Kudo2.jpg",
+                "https://windows-cdn.softpedia.com/screenshots/ARES-Commander-Edition_3.png",
+                "https://www.graebert.com/wp-content/uploads/2022/03/sheet_list_2023_2.jpg"
+            ]
+        },
         "aresmap-2022": {
             "icon": "https://www.graebert.com/wp-content/uploads/2022/03/New_Prod_ARES_Map_256x256_183w_2x.png",
             "images": [
@@ -2954,6 +2981,22 @@
                 "https://www.graebert.com/wp-content/uploads/2017/11/aresmech_screen-1_2017.png"
             ]
         },
+        "aresmechanical-2024": {
+            "icon": "",
+            "images": []
+        },
+        "aresmechanical-2025": {
+            "icon": "",
+            "images": []
+        },
+        "aresmechanical-2026": {
+            "icon": "https://i.postimg.cc/xdj0j7hc/aresm2026.png",
+            "images": []
+        },
+        "areselectrical-2026": {
+            "icon": "",
+            "images": []
+        },
         "argo": {
             "icon": "",
             "images": []
@@ -3328,8 +3371,11 @@
             "images": []
         },
         "atlauncher": {
-            "icon": "",
-            "images": []
+            "icon": "https://atlauncher.com/assets/images/logo-named.png",
+            "images": [
+                "https://i.imgur.com/W06uViG.png",
+                "https://i.imgur.com/fTnYjus.png"
+            ]
         },
         "atnow": {
             "icon": "https://community.chocolatey.org/content/packageimages/atnow.1.1.png",
@@ -19072,15 +19118,25 @@
             "images": []
         },
         "hwinfo": {
-            "icon": "https://community.chocolatey.org/content/packageimages/hwinfo.install.8.0.0.png",
+            "icon": "https://i.postimg.cc/MKfynM2J/HWiNFO64.png",
             "images": [
-                "https://www.sqlskills.com/blogs/glenn/wp-content/uploads/2016/12/image_thumb.png"
+                "https://i.postimg.cc/6Qrcy7Zp/image.png",
+                "https://i.postimg.cc/3R3BpKjC/image.png",
+                "https://i.postimg.cc/D0ZPjBMS/image.png",
+                "https://i.postimg.cc/KjHrdB6J/image.png",
+                "https://i.postimg.cc/MGm0zCkc/image.png",
+                "https://i.postimg.cc/TPfmNtyT/image.png"
             ]
         },
         "hwinfo32": {
-            "icon": "https://community.chocolatey.org/content/packageimages/HWiNFO32.4.18.1930.1.png",
+            "icon": "https://i.postimg.cc/MKfynM2J/HWiNFO64.png",
             "images": [
-                "https://www.sqlskills.com/blogs/glenn/wp-content/uploads/2016/12/image_thumb.png"
+                "https://i.postimg.cc/6Qrcy7Zp/image.png",
+                "https://i.postimg.cc/3R3BpKjC/image.png",
+                "https://i.postimg.cc/D0ZPjBMS/image.png",
+                "https://i.postimg.cc/KjHrdB6J/image.png",
+                "https://i.postimg.cc/MGm0zCkc/image.png",
+                "https://i.postimg.cc/TPfmNtyT/image.png"
             ]
         },
         "hwmonitor": {
@@ -48448,7 +48504,7 @@
             "images": []
         },
         "wizfile": {
-            "icon": "",
+            "icon": "https://antibodysoftware-17031.kxcdn.com/wizfile/images/wizfile445x.png",
             "images": []
         },
         "wizkey": {
@@ -48473,7 +48529,9 @@
         },
         "wiztree": {
             "icon": "https://antibodysoftware-17031.kxcdn.com/images/wiztree445x.png",
-            "images": []
+            "images": [
+                "https://i.imgur.com/Sf1hKhj.png"
+            ]
         },
         "wkhtmltopdf": {
             "icon": "",
@@ -50415,23 +50473,23 @@
             ]
         },
         "radiantdicomviewer": {
-            "icon": "",
+            "icon": "https://i.postimg.cc/Ls5qXnZd/radiant.png",
             "images": [
                 "https://i.postimg.cc/C1Dzb0Lp/image.png",
                 "https://i.postimg.cc/zXYTtd9k/image.png",
                 "https://i.postimg.cc/X7KdTfW6/image.png"
             ]
         },
         "reqview": {
-            "icon": "",
+            "icon": "https://i.postimg.cc/RFcvVBG5/reqview.png",
             "images": [
                 "https://i.postimg.cc/rmYQRSmP/image.png",
                 "https://i.postimg.cc/tCGm3NkK/image.png",
                 "https://i.postimg.cc/J43YPHdG/image.png"
             ]
         },
         "unraidusbcreator": {
-            "icon": "",
+            "icon": "https://i.postimg.cc/h4TXfFhG/unraid.png",
             "images": [
                 "https://i.postimg.cc/g2QhhNqR/image.png",
                 "https://i.postimg.cc/26fBcytS/image.png",
@@ -50540,6 +50598,73 @@
                 "https://i.postimg.cc/4dcLLG10/image.png",
                 "https://i.postimg.cc/0jqth4Wy/image.png"
             ]
+        },
+        "wavepad": {
+            "icon": "",
+            "images": [
+                "https://i.postimg.cc/DzNLMYf4/image.png",
+                "https://i.postimg.cc/BQCD0vQ0/image.png"
+            ]
+        },
+        "xftp": {
+            "icon": "https://i.postimg.cc/y8s02ZmB/Xftp.png",
+            "images": [
+                "https://i.postimg.cc/TwYmhMks/image.png",
+                "https://i.postimg.cc/w3K7XSVg/image.png",
+                "https://i.postimg.cc/tRskzW5M/image.png",
+                "https://i.postimg.cc/FFwZCzCs/image.png"
+            ]
+        },
+        "xshell": {
+            "icon": "https://i.postimg.cc/Jz55hqrG/Xshell.png",
+            "images": [
+                "https://i.postimg.cc/bJCntCWw/image.png",
+                "https://i.postimg.cc/j55wt620/image.png",
+                "https://i.postimg.cc/mD5cDc1c/image.png",
+                "https://i.postimg.cc/NF2KrgRd/image.png"
+            ]
+        },
+        "xlightftp": {
+            "icon": "https://i.postimg.cc/zvBRg18V/image.png",
+            "images": [
+                "https://i.postimg.cc/wvzvhYc9/image.png",
+                "https://i.postimg.cc/K8Ys8162/image.png",
+                "https://i.postimg.cc/6p1b29KG/image.png",
+                "https://i.postimg.cc/W4FW0QpY/image.png"
+            ]
+        },
+        "talktype": {
+            "icon": "https://i.postimg.cc/g0fRtjdP/image.png",
+            "images": [
+                "https://i.postimg.cc/28zWKPp3/image.png",
+                "https://i.postimg.cc/L5vJS8d5/image.png"
+            ]
+        },
+        "zetaresourceeditor": {
+            "icon": "https://i.postimg.cc/T1mFZpZM/paint-brush.png",
+            "images": [
+                "https://i.postimg.cc/15rYwhSH/image.png",
+                "https://i.postimg.cc/L8yCQtng/image.png",
+                "https://i.postimg.cc/bvW6pq0z/image.png",
+                "https://i.postimg.cc/Y0wbL8yZ/image.png"
+            ]
+        },
+        "ultrastarworldparty": {
+            "icon": "https://i.postimg.cc/1t4ZYRms/World-Party.png",
+            "images": [
+                "https://i.postimg.cc/fyLkCQF9/image.png",
+                "https://i.postimg.cc/y8qYgRV9/image.png",
+                "https://i.postimg.cc/BZkJkFPy/image.png"
+            ]
+        },
+        "onewarestudio": {
+            "icon": "",
+            "images": [
+                "https://i.postimg.cc/pT0KRCMK/image.png",
+                "https://i.postimg.cc/JnRQ1tDC/image.png",
+                "https://i.postimg.cc/wTnc1wyV/image.png",
+                "https://i.postimg.cc/SKfWtqZT/image.png"
+            ]
         }
     }
 }

WebBasedData/screenshot-database-v2.json

@@ -1,28 +1,21 @@
 import json
 import os
 from urllib.request import urlopen
+import re
 
 import xlrd
 
 root_dir = os.path.join(os.path.dirname(__file__), "..")
 os.chdir(os.path.join(root_dir, "WebBasedData"))
 
-try:
-    os.remove("screenshot-database-v2.json")
-except FileNotFoundError:
-    pass
-try:
-    os.remove("screenshot_database.xlsx")
-except FileNotFoundError:
-    pass
 
 with open("screenshot_database.xlsx", "wb") as f:
     f.write(urlopen("https://docs.google.com/spreadsheets/d/1Zxgzs1BiTZipC7EiwNEb9cIchistIdr5/export?format=xlsx").read())
 
 try:
     workbook = xlrd.open_workbook('screenshot_database.xlsx')
 except:
-    os.system("python -m pip install xlrd==1.0.0")
+    os.system("python -m pip install xlrd==1.2.0")
     import xlrd
     workbook = xlrd.open_workbook('screenshot_database.xlsx')
 
@@ -104,9 +97,30 @@
 jsoncontent["package_count"]["packages_with_screenshot"] = packagesWithScreenshot
 jsoncontent["package_count"]["total_screenshots"] = screenshotCount
 
-with open("screenshot-database-v2.json", "w") as outfile:
-    json.dump(jsoncontent, outfile, indent=4)
+oldcontent = ""
+newcontent = ""
+
+FILE = "screenshot-database-v2.json"
+
+if os.path.exists(FILE):
+    with open(FILE, "r") as infile:
+        oldcontent = infile.read()
+    # Extract URLs from oldcontent for proper comparison
+    old_urls = re.findall(r'https?://[^\s",]+', oldcontent)
+else:
+    old_urls = []
+
+with open(FILE, "w") as outfile:
+    newcontent = json.dumps(jsoncontent, indent=4)
+    outfile.write(newcontent)
 
+new_urls = []
+# Find all URLs in newcontent
+new_urls = re.findall(r'https?://[^\s",]+', newcontent)
+diff_urls = [url for url in new_urls if url not in old_urls]
 
+with open("new_urls.txt", "w") as f:
+    for url in diff_urls:
+        f.write(url + "\n")
 
 os.system("pause")

scripts/generate_json_from_excel.py

@@ -5,7 +5,6 @@
   "bn": "61%",
   "cs": "90%",
   "da": "84%",
-  "de": "90%",
   "el": "90%",
   "es": "90%",
   "es-MX": "0%",
@@ -33,7 +32,7 @@
   "nl": "90%",
   "nn": "67%",
   "pl": "90%",
-  "pt_BR": "90%",
+  "pt_BR": "98%",
   "pt_PT": "90%",
   "ro": "90%",
   "ru": "90%",
@@ -47,9 +46,7 @@
   "tg": "12%",
   "th": "78%",
   "tr": "90%",
-  "ua": "90%",
+  "ua": "99%",
   "ur": "85%",
-  "vi": "94%",
-  "zh_CN": "90%",
   "zh_TW": "90%"
 }