Merge pull request #59 from Alexander-Wilms/develop

Improve output of validate_json.py and validate_mod_json.py
vcmi · Jul 17, 2024 · fb23c6a · fb23c6a
2 parents 8416af0 + 1f9a075
commit fb23c6a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.github/validate_json.py b/.github/validate_json.py
@@ -15,9 +15,14 @@
 
         try:
             json.loads(filecontent)
+            print(f"✅ JSON valid")
         except Exception as err:
-            print("Error: " + str(err))
-            sys.exit(os.EX_SOFTWARE)
+            error = True
+            print(f"❌ JSON invalid:")
+            print(str(err))
 
-print("Everything is ok!")
-sys.exit(os.EX_OK)
+if error:
+    sys.exit(os.EX_SOFTWARE)
+else:
+    print("Everything is ok!")
+    sys.exit(os.EX_OK)
diff --git a/.github/validate_mod_json.py b/.github/validate_mod_json.py
@@ -15,20 +15,23 @@
         modlist = json.loads(filecontent)
         for mod, data in modlist.items():
             url = data["mod"].replace(" ", "%20")
-            print(f"Download {mod}: {url}")
+            print(f"{mod}: {url}")
             try:
                 response = urllib.request.urlopen(url)
+                print(f"✅ Download successful")
             except:
                 error = True
-                print("Error: download failed!")
+                print("❌ Download failed")
                 continue
             filecontent = response.read()
 
             try:
                 json.loads(filecontent)
+                print(f"✅ JSON valid")
             except Exception as err:
                 error = True
-                print("Error: " + str(err))
+                print(f"❌ JSON invalid:")
+                print(str(err))
                 continue
 if error:
     sys.exit(os.EX_SOFTWARE)