split npm compatibility tests into npm/npx tests (icloud-photos-downl…

…oader#818)

npm/@icloudpd/darwin-arm64/package.json

@@ -8,7 +8,7 @@
     },
     "license": "MIT",
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "preferUnplugged": true,
     "os": [

npm/@icloudpd/darwin-x64/package.json

@@ -8,7 +8,7 @@
     },
     "license": "MIT",
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "preferUnplugged": true,
     "os": [

npm/@icloudpd/linux-arm/package.json

@@ -8,7 +8,7 @@
     },
     "license": "MIT",
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "preferUnplugged": true,
     "os": [

npm/@icloudpd/linux-arm64/package.json

@@ -8,7 +8,7 @@
     },
     "license": "MIT",
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "preferUnplugged": true,
     "os": [

npm/@icloudpd/linux-ia32/package.json

@@ -8,7 +8,7 @@
     },
     "license": "MIT",
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "preferUnplugged": true,
     "os": [

npm/@icloudpd/linux-x64/package.json

@@ -8,7 +8,7 @@
     },
     "license": "MIT",
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "preferUnplugged": true,
     "os": [

npm/@icloudpd/win32-x64/package.json

@@ -9,7 +9,7 @@
     "license": "MIT",
     "preferUnplugged": true,
     "engines": {
-      "node": ">=12"
+      "node": ">=6"
     },
     "os": [
       "win32"

npm/icloudpd/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "description": "iCloud Photo Downloader",
   "engines": {
-    "node": ">=12"
+    "node": ">=6"
   },
   "bin": {
     "icloudpd": "bin/icloudpd.js"

scripts/compile_compatibility

@@ -5,9 +5,13 @@ import os
 import sys
 import itertools
 
+def normalize(files):
+    presort = [ "pass", "fail", "na" ]
+    return [(list(g) + [ [0, k.split('.')[0], k.split('.')[1], k.split('.')[2], 'na'] ])[0] for (k, g) in itertools.groupby(sorted(files, key = lambda k: f"{k[1]}.{k[2]}.{k[3]}.{presort.index(k[4]) if k[4] in presort else 9}"), key = lambda k: f"{k[1]}.{k[2]}.{k[3]}")]
+
 def stats(files):
     """ Print statistics """
-    total = len(files)
+    total = len([f for f in files if f[4] != 'na'])
     passed = len([f for f in files if f[4] == 'pass'])
     print(f"Compatibility rate: {round(100*passed/total,1) if total > 0 else 0}% ({passed} passed out of {total})")
     print("")
@@ -25,7 +29,7 @@ def matrix(files):
     oses = [k for k, _ in itertools.groupby(sorted(files, key = lambda ft: ft[2]), key = lambda ft: ft[2])]
     for o in oses:
         results_raw = [list(filter(lambda ft: ft[2] == o and ft[3] == a, files)) for a in archs_sorted]
-        results = ["N/A" if len(r) == 0 else (r[0][4] + ("" if r[0][0] == 0 else " (src)")) for r in results_raw]
+        results = ["N/A" if len(r) == 0 or r[0][4] == "na" else (r[0][4] + ("" if r[0][0] == 0 else " (src)")) for r in results_raw]
         print('|'.join([o] + results))
 
 def main():

scripts/npx_optional

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -euo pipefail
+
+if [ `which npx` ]; then
+    echo "test icloudpd..." &&
+    npx ${@:3} &&
+    touch $1
+else
+    echo "No npx available"
+    touch $2
+fi