rename url => download_url (#51)

this is more descriptive about the url is used for

diff --git a/README.md b/README.md
index 2021cb33a103e94c3c3da23e3a0c61804cbd9497..b2e135c318c62d73422fe9d8b977e48f9d664f05 100644 (file)
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ The `overview.json` files are based on JSON files created by OpenWrt
 image`.
 
 A [Python script](misc/collect.py) is included to merge the JSON files:
-`./collect.py bin/ --url
+`./collect.py bin/ --download-url
 'https://downloads.openwrt.org/releases/{version}/targets/{target}' >
 overview.json`.
 

diff --git a/misc/18.06.7/overview.json b/misc/18.06.7/overview.json
index 94a0ffcea3af0e0caf7aa2466063002293921b1f..f78177b0af54731f6d05b9faf7636d680cf707dd 100644 (file)
--- a/misc/18.06.7/overview.json
+++ b/misc/18.06.7/overview.json
@@ -5792,6 +5792,6 @@
       "target": "x86/64"
     }
   },
-  "url": "https://downloads.openwrt.org/releases/{version}/targets/{target}",
+  "download_url": "https://downloads.openwrt.org/releases/{version}/targets/{target}",
   "version_code": "r7976-ca47026b7d"
 }
\ No newline at end of file

diff --git a/misc/19.07.1/overview.json b/misc/19.07.1/overview.json
index ca0b04be0dbb2dc64643350d4068d3eff109ffc3..3f33404b81be8d6d1b09b3b73aeca7af7a863bf6 100644 (file)
--- a/misc/19.07.1/overview.json
+++ b/misc/19.07.1/overview.json
@@ -5340,6 +5340,6 @@
       "target": "x86/64"
     }
   },
-  "url": "https://downloads.openwrt.org/releases/{version}/targets/{target}",
+  "download_url": "https://downloads.openwrt.org/releases/{version}/targets/{target}",
   "version_code": "r10911-c155900f66"
 }
\ No newline at end of file

diff --git a/misc/collect.py b/misc/collect.py
index e9b91d2a1a004cca05d425d407300854e81deced..74c76faa1d2425e90eb49a9dc81376121d5baca3 100755 (executable)
--- a/misc/collect.py
+++ b/misc/collect.py
@@ -9,7 +9,7 @@ import os
 parser = argparse.ArgumentParser()
 parser.add_argument("input_path", nargs='+',
   help="Input folder that is traversed for OpenWrt JSON device files.")
-parser.add_argument('--url', action="store", default="",
+parser.add_argument('--download-url', action="store", default="",
   help="Link to get the image from. May contain {target}, {version} and {commit}")
 parser.add_argument('--formatted', action="store_true",
   help="Output formatted JSON data.")
@@ -80,7 +80,7 @@ for path in paths:
     if not 'version_code' in output:
       output = {
         'version_code': code,
-        'url': args.url,
+        'download_url': args.download_url,
         'models' : {}
       }
 

diff --git a/misc/snapshot/overview.json b/misc/snapshot/overview.json
index 27aa6596823c8e199c309495582703865f27e382..53c30e8c996374f187c6e3ea93ebe1335d46c2c3 100644 (file)
--- a/misc/snapshot/overview.json
+++ b/misc/snapshot/overview.json
@@ -11697,6 +11697,6 @@
       "target": "lantiq/xrx200"
     }
   },
-  "url": "https://downloads.openwrt.org/snapshots/targets/{target}",
+  "download_url": "https://downloads.openwrt.org/snapshots/targets/{target}",
   "version_code": "r13342-e35e40ad82"
 }
\ No newline at end of file

diff --git a/www/index.js b/www/index.js
index e6082fb3564eebcd2c68b206068210be5d7cf23b..5787f8d592fe728eb36a14f10c1261373f69a30a 100644 (file)
--- a/www/index.js
+++ b/www/index.js
@@ -418,7 +418,7 @@ function init() {
       setupAutocompleteList($('models'), Object.keys(obj['models']), false, updateImages, models => {
         var model = models.value;
         if (model in obj['models']) {
-          var url = obj.url || 'unknown';
+          var url = obj.download_url || 'unknown';
           var code = obj.version_code || 'unknown';
           var mobj = obj['models'][model];
           updateImages(version, code, build_date, model, url, mobj, false);