Make patch script nicer

3 files changed, 37 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43ff2f1620df..6310237ab142 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = code-oss-marketplace
 	pkgdesc = Enable vscode marketplace in code-oss
-	pkgver = 1.77.0
+	pkgver = 1.77.1
 	pkgrel = 1
 	url = https://marketplace.visualstudio.com/vscode
 	install = code-oss-marketplace.install
@@ -9,7 +9,7 @@ pkgbase = code-oss-marketplace
 	source = code-oss-marketplace.hook
 	source = patch_code_oss_product.py
 	sha256sums = 138eb84d5e98b38f7d3cf8e38ff807dd6a6ea78e249c4f0fa96187d4db1f3528
-	sha256sums = 7f8566106add894c99670d7dbdc96b0883bdead2e595f3217a0eed975b3e8b2c
+	sha256sums = b5094739cc30beda5d677603352b005c8abe08e451037b1c4eea2ea74450ccf3
 
 pkgname = code-oss-marketplace
 	depends = code
diff --git a/PKGBUILD b/PKGBUILD
index ee0adccf43e1..1a5b3433f4e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Icelk <main at icelk.dev>
 
 pkgname=code-oss-marketplace
-pkgver=1.77.0
+pkgver=1.77.1
 pkgrel=1
 pkgdesc='Enable vscode marketplace in code oss'
 arch=('any')
@@ -12,7 +12,7 @@ license=('unknown')
 install="${pkgname}.install"
 source=('code-oss-marketplace.hook'
         'patch_code_oss_product.py')
- sha256sums=('138eb84d5e98b38f7d3cf8e38ff807dd6a6ea78e249c4f0fa96187d4db1f3528'
+ sha256sums=('b5094739cc30beda5d677603352b005c8abe08e451037b1c4eea2ea74450ccf3'
           '7f8566106add894c99670d7dbdc96b0883bdead2e595f3217a0eed975b3e8b2c')
 
 package() {
diff --git a/patch_code_oss_product.py b/patch_code_oss_product.py
index b67d7a39385c..5b1556c829f7 100755
--- a/patch_code_oss_product.py
+++ b/patch_code_oss_product.py
@@ -1,31 +1,41 @@
-#!/usr/bin/env python
-from sys import argv
-from json import load, dump, JSONDecodeError
+#!/usr/bin/env python3
 
-PRODUCT_JSON_LOCATION = "/usr/lib/code/product.json"
+import json
+import sys
+from pathlib import Path
 
+PRODUCT_JSON_PATH = Path("/usr/lib/code/product.json")
 
-if __name__ == "__main__":
+EXTENSION_GALLERY_CODE_OSS = {
+    "serviceUrl": "https://open-vsx.org/vscode/gallery",
+    "itemUrl": "https://open-vsx.org/vscode/item",
+}
+EXTENSION_GALLERY_VSCODE = {
+    "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
+    "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
+    "itemUrl": "https://marketplace.visualstudio.com/items",
+}
+
+
+def main():
     try:
-        with open(PRODUCT_JSON_LOCATION) as file:
-            product = load(file)
-    except JSONDecodeError:
-        print(
-            "error: couldn't parse local product.json or fetch a new one from the web")
-        exit(1)
-    if '-R' in argv:
-        product["extensionsGallery"] = {
-            "serviceUrl": "https://open-vsx.org/vscode/gallery",
-            "itemUrl": "https://open-vsx.org/vscode/item",
-        }
+        with PRODUCT_JSON_PATH.open() as file:
+            product = json.load(file)
+    except json.JSONDecodeError as exc:
+        sys.exit(
+            f"error: couldn't parse local product.json or fetch a new one from the web: {exc}"
+        )
+
+    if "-R" in sys.argv:
+        product["extensionsGallery"] = EXTENSION_GALLERY_CODE_OSS
         product["linkProtectionTrustedDomains"] = ["https://open-vsx.org"]
     else:
-        product["extensionsGallery"] = {
-            "serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery",
-            "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index",
-            "itemUrl": "https://marketplace.visualstudio.com/items"
-        }
+        product["extensionsGallery"] = EXTENSION_GALLERY_VSCODE
         product.pop("linkProtectionTrustedDomains", None)
 
-    with open(PRODUCT_JSON_LOCATION, mode='w') as file:
-        dump(product, file, indent=2)
+    with PRODUCT_JSON_PATH.open(mode="w") as file:
+        json.dump(product, file, indent=2)
+
+
+if __name__ == "__main__":
+    main()