updated PR conflict resolver script to match updates in metadata generation script

Author: keighrim

scripts/.resolve_pr_conflict.sh.swp

@@ -0,0 +1,20 @@
+import json
+import sys
+
+from pathlib import Path
+
+import deepdiff
+
+app_directory = sys.argv[1]
+vers = Path(app_directory).glob("v*")
+metadata_by_vers = {}
+for ver in vers:
+    metadata_by_vers[ver.name] = json.load(open(ver / "metadata.json"))
+
+
+print('###', app_directory)
+vs = sorted(metadata_by_vers.keys(), reverse=True)
+if len(vs) > 1:
+    for nv, ov in zip(vs[:-1], vs[1:]):
+        print('####', nv, ov)
+        print(deepdiff.DeepDiff(metadata_by_vers[nv], metadata_by_vers[ov], ignore_order=True).to_json(indent=2))

scripts/app_ver_diffs.py

@@ -0,0 +1,10 @@
+for app in $(dirname $BASH_SOURCE)/../docs/_apps/*; do 
+    if [ -d "$app" ] && [[ ! $(basename "$app") = _* ]]; then
+        for v in "$app"/*; do
+            if [ -d "$v" ]; then
+                echo "Regenerating markdown for $(basename "$app"):$(basename "$v")"
+                python $(dirname $BASH_SOURCE)/metadata_markdown.py "$v"
+            fi
+        done
+    fi
+done

scripts/regenerate_all_markdowns.sh

@@ -13,7 +13,7 @@ git checkout origin/main -- docs/_data
 # make an intermediate commit with semi-"merge" with main
 git commit --no-edit
 # regenerate submission files
-python3 scripts/index_page_data.py docs/_apps/$app_name_ver
+python3 scripts/index_page_data.py $(dirname $app_name_ver)
 git add docs/_data
 git commit -m 'regenerated aggregated metadata json files after conflict resolution'
 

scripts/resolve_pr_conflict.sh

@@ -0,0 +1,31 @@
+import json
+import sys
+
+from pathlib import Path
+
+app_directory = sys.argv[1]
+app_metadata_json = Path(app_directory) / "metadata.json"
+app_metadata = json.load(open(app_metadata_json))
+
+
+def validate_app_license(license_string):
+    if license_string in ["MIT", "GPLv3", "Apache 2.0"]:
+        return True
+    else:
+        print("Invalid license string: {}".format(license_string))
+        return False
+
+
+def validate_codebase_url(codebase_url, identifier_string):
+    gho_prefix = "https://github.com/clamsproject/"
+    apps_pref = "http://apps.clams.ai/"
+    if not codebase_url.startswith(gho_prefix):
+        print("Invalid GH org: {}".format(codebase_url))
+        return False
+    if codebase_url[len(gho_prefix):] != f'app-{identifier_string[len(apps_pref):].split("/")[0]}':
+        print(f"Invalid GH repo: {codebase_url} vs {identifier_string}")
+        return False
+
+print('===', app_metadata["name"])
+validate_codebase_url(app_metadata["url"], app_metadata["identifier"])
+validate_app_license(app_metadata["app_license"])