From e7d2e228f445994416c9d0cc961a44ded60c960d Mon Sep 17 00:00:00 2001
From: Moritz Warning <moritzwarning@web.de>
Date: Thu, 5 Mar 2020 00:51:50 +0100
Subject: [PATCH] change release to version

this makes the code more consistent
---
 README.md           |  2 +-
 i18n.js             |  6 +++---
 index.html          |  6 +++---
 index.js            | 31 ++++++++++++++++---------------
 misc/collect.py     | 23 +++++++++++------------
 names-18.06.7.json  |  4 ++--
 names-19.07.1.json  |  4 ++--
 names-SNAPSHOT.json |  2 +-
 8 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/README.md b/README.md
index 699e1ce..1959f1f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ image`.
 
 A [Python script](misc/collect.py) is included to create those json files:
 `./collect.py bin/ --url
-'https://downloads.openwrt.org/releases/{release}/targets/{target}' >
+'https://downloads.openwrt.org/releases/{version}/targets/{target}' >
 names-test.json`.
 
 For the OpenWrt 18.06 and 19.07 releases, you need to patch OpenWrt to output JSON files for collect.py (commit [openwrt/openwrt@881ed09](https://github.com/openwrt/openwrt/commit/881ed09ee6e23f6c224184bb7493253c4624fb9f)).
diff --git a/i18n.js b/i18n.js
index 07a700e..c977c14 100644
--- a/i18n.js
+++ b/i18n.js
@@ -4,7 +4,7 @@ var translations = {
 		'tr-load': 'Lade die OpenWrt Firmware für dein Gerät!',
 		'tr-title': 'OpenWrt Firmware Selector',
 		'tr-message': 'Bitte benutze die Eingabe um die passende Firmware zu finden!',
-		'tr-release-build': 'Release Build',
+		'tr-version-build': 'Release Build',
 		'tr-custom-build': 'Custom Build',
 		'tr-customize': 'Customize',
 		'tr-request-build': 'Request Build',
@@ -24,14 +24,14 @@ var translations = {
 		'tr-load': 'Download OpenWrt firmware for your device!',
 		'tr-title': 'OpenWrt Firmware Selector',
 		'tr-message': 'Please use the input below to download firmware for your device!',
-		'tr-release-build': 'Build',
+		'tr-version-build': 'Build',
 		'tr-custom-build': 'Custom Build',
 		'tr-customize': 'Customize',
 		'tr-request-build': 'Request Build',
 		'tr-model': 'Modell:',
 		'tr-target': 'Platform:',
 		'tr-version': 'Version:',
-		'tr-release-downloads': 'Downloads',
+		'tr-version-downloads': 'Downloads',
 		'tr-custom-downloads': 'Custom Downloads',
 		'tr-factory-help': 'Factory images are for flashing routers with OpenWrt for the first time. Usually via the web interface of the original firmware.',
 		'tr-sysupgrade-help': 'Sysupgrade images are for flashing routers that already run OpenWrt. The image can be applied using the web interface or the terminal.',
diff --git a/index.html b/index.html
index 6c43ea2..a32c932 100644
--- a/index.html
+++ b/index.html
@@ -29,7 +29,7 @@
 		<p class="tr-message">Please use the input below to download firmware for your device!</p>
 		<br>
 
-		<select id="releases" size="1"></select>
+		<select id="versions" size="1"></select>
 		<div class="autocomplete">
 			<input id="models" type="text" placeholder="Model" spellcheck="false" autocapitalize="off" autocorrect="off">
 		</div>
@@ -48,10 +48,10 @@
 			</div>
 
 			<div>
-				<h3 id="images-title" class="tr-release-build">Release Build</h3>
+				<h3 id="images-title" class="tr-version-build">Release Build</h3>
 				<div><span class="column tr-model">Model:</span> <span id="image-model"></span></div>
 				<div><span class="column tr-target">Target:</span> <span id="image-target"></span></div>
-				<div><span class="column tr-version">Version:</span> <span id="image-release"></span> (<span id="image-commit"></span>)</div>
+				<div><span class="column tr-version">Version:</span> <span id="image-version"></span> (<span id="image-code"></span>)</div>
 			</div>
 
 			<div id="download-links">
diff --git a/index.js b/index.js
index 0cce1bd..3aa8c9f 100644
--- a/index.js
+++ b/index.js
@@ -42,7 +42,7 @@ function build_asa_request() {
   var request_data = {
     'profile': current_model.id,
     'packages': split($('packages').value),
-    'version': $('releases').value
+    'version': $('versions').value
   }
 
   console.log('disable request button / show loading spinner')
@@ -62,7 +62,8 @@ function build_asa_request() {
         .then(mobj => {
           console.log(mobj)
           updateImages(
-            mobj.version_number, mobj.version_commit,
+            mobj.version_number,
+            mobj.version_code,
             get_model_titles(mobj.titles),
             mobj.url, mobj, true
           );
@@ -256,14 +257,14 @@ function setupAutocompleteList(input, items, onselection) {
   });
 }
 
-function updateImages(version, commit, model, url, mobj, is_custom) {
+function updateImages(version, code, model, url, mobj, is_custom) {
   // add download button for image
   function addLink(type, file) {
     var a = document.createElement('A');
     a.classList.add('download-link');
     a.href = url
       .replace('{target}', mobj.target)
-      .replace('{release}', version)
+      .replace('{version}', version)
       + '/' + file;
     var span = document.createElement('SPAN');
     span.appendChild(document.createTextNode(''));
@@ -310,17 +311,17 @@ function updateImages(version, commit, model, url, mobj, is_custom) {
   Array.from(document.getElementsByClassName('download-help'))
     .forEach(e => e.style.display = 'none');
 
-  if (version && commit && model && url && mobj) {
+  if (version && code && model && url && mobj) {
     var target = mobj.target;
     var images = mobj.images;
 
-    // change between "release" and "custom" title
+    // change between "version" and "custom" title
     if (is_custom) {
-      switchClass('images-title', 'tr-release-build', 'tr-custom-build');
-      switchClass('downloads-title', 'tr-release-downloads', 'tr-custom-downloads');
+      switchClass('images-title', 'tr-version-build', 'tr-custom-build');
+      switchClass('downloads-title', 'tr-version-downloads', 'tr-custom-downloads');
     } else {
-      switchClass('images-title', 'tr-custom-build', 'tr-release-build');
-      switchClass('downloads-title', 'tr-custom-downloads', 'tr-release-downloads');
+      switchClass('images-title', 'tr-custom-build', 'tr-version-build');
+      switchClass('downloads-title', 'tr-custom-downloads', 'tr-version-downloads');
     }
     // update title translation
     applyLanguage();
@@ -328,8 +329,8 @@ function updateImages(version, commit, model, url, mobj, is_custom) {
     // fill out build info
     $('image-model').innerText = model;
     $('image-target').innerText = target;
-    $('image-release').innerText = version;
-    $('image-commit').innerText = commit;
+    $('image-version').innerText = version;
+    $('image-code').innerText = code;
 
     images.sort((a, b) => a.name.localeCompare(b.name));
 
@@ -343,14 +344,14 @@ function updateImages(version, commit, model, url, mobj, is_custom) {
   }
 }
 
-setupSelectList($('releases'), Object.keys(config.versions), version => {
+setupSelectList($('versions'), Object.keys(config.versions), version => {
   loadFile(config.versions[version], obj => {
     setupAutocompleteList($('models'), Object.keys(obj['models']), model => {
       if (model in obj['models']) {
         var url = obj.url;
-        var commit = obj.version_commit;
+        var code = obj.version_code;
         var mobj = obj['models'][model];
-        updateImages(version, commit, model, url, mobj, false);
+        updateImages(version, code, model, url, mobj, false);
         current_model = mobj;
       } else {
         updateImages();
diff --git a/misc/collect.py b/misc/collect.py
index 16b9065..dd5c643 100755
--- a/misc/collect.py
+++ b/misc/collect.py
@@ -7,12 +7,12 @@ import sys
 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", dest="url", default="",
-            help="Link to get the image from. May contain {target}, {release} and {commit}")
-parser.add_argument('--formatted',
-            action="store_true", dest="formatted", help="Output formatted JSON data.")
+parser.add_argument("input_path", nargs='?',
+  help="Input folder that is traversed for OpenWrt JSON device files.")
+parser.add_argument('--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.")
 
 args = parser.parse_args()
 
@@ -41,19 +41,18 @@ for path in paths:
         sys.stderr.write('{} has unsupported metadata version: {} => skip\n'.format(path, obj['metadata_version']))
         continue
 
-      version = obj['version_number']
-      commit = obj['version_commit']
+      code = obj.get('version_code', obj.get('version_commit'))
 
-      if not 'version_commit' in output:
+      if not 'version_code' in output:
         output = {
-          'version_commit': commit,
+          'version_code': code,
           'url': args.url,
           'models' : {}
         }
 
       # only support a version_number with images of a single version_commit
-      if output['version_commit'] != commit:
-        sys.stderr.write('mixed revisions for a release ({} and {}) => abort\n'.format(output['version_commit'], commit))
+      if output['version_code'] != code:
+        sys.stderr.write('mixed revisions for a release ({} and {}) => abort\n'.format(output['version_code'], commit))
         exit(1)
 
       images = []
diff --git a/names-18.06.7.json b/names-18.06.7.json
index 8331411..94a0ffc 100644
--- a/names-18.06.7.json
+++ b/names-18.06.7.json
@@ -5792,6 +5792,6 @@
       "target": "x86/64"
     }
   },
-  "url": "https://downloads.openwrt.org/releases/{release}/targets/{target}",
-  "version_commit": "r7976-ca47026b7d"
+  "url": "https://downloads.openwrt.org/releases/{version}/targets/{target}",
+  "version_code": "r7976-ca47026b7d"
 }
\ No newline at end of file
diff --git a/names-19.07.1.json b/names-19.07.1.json
index 202d22e..ca0b04b 100644
--- a/names-19.07.1.json
+++ b/names-19.07.1.json
@@ -5340,6 +5340,6 @@
       "target": "x86/64"
     }
   },
-  "url": "https://downloads.openwrt.org/releases/{release}/targets/{target}",
-  "version_commit": "r10911-c155900f66"
+  "url": "https://downloads.openwrt.org/releases/{version}/targets/{target}",
+  "version_code": "r10911-c155900f66"
 }
\ No newline at end of file
diff --git a/names-SNAPSHOT.json b/names-SNAPSHOT.json
index fb2a658..c65e63e 100644
--- a/names-SNAPSHOT.json
+++ b/names-SNAPSHOT.json
@@ -12112,5 +12112,5 @@
     }
   },
   "url": "https://downloads.openwrt.org/snapshots/targets/{target}",
-  "version_commit": "r12145-4716c843d6"
+  "version_code": "r12145-4716c843d6"
 }
\ No newline at end of file
-- 
2.30.2