From da4097887104721c50b6f51030e6785898cdd679 Mon Sep 17 00:00:00 2001 From: Moritz Warning Date: Thu, 25 Jun 2020 20:54:53 +0200 Subject: [PATCH] rename url => download_url (#51) this is more descriptive about the url is used for --- README.md | 2 +- misc/18.06.7/overview.json | 2 +- misc/19.07.1/overview.json | 2 +- misc/collect.py | 4 ++-- misc/snapshot/overview.json | 2 +- www/index.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2021cb3..b2e135c 100644 --- 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 94a0ffc..f78177b 100644 --- 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 ca0b04b..3f33404 100644 --- 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 e9b91d2..74c76fa 100755 --- 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 27aa659..53c30e8 100644 --- 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 e6082fb..5787f8d 100644 --- 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); -- 2.30.2