From 87bbdf8cb22e4dd653d9489555baa4472e685c64 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 13:45:25 +0200 Subject: [PATCH 01/18] Update devices.js --- views/devices/devices.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 777c756..bc96f06 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -2,6 +2,7 @@ import { siteURL, container, showSpinner } from '../../js/const.js' var devicesList = [] const gerritURL = 'https://gerrit.omnirom.org' +const githubAPIURL = 'https://api.github.com' const rawURL = 'https://raw.githubusercontent.com/omnirom/' var currentVersion = 'android-15' var branchMapping = { @@ -12,7 +13,7 @@ var branchMapping = { class DevicesView { - async loadGithubRepos() { + async loadGithubReposFromGerrit() { try { let url = gerritURL + "/projects/?b=" + currentVersion + "&p=android_device"; let response = await axios.get(url, {}); @@ -27,6 +28,24 @@ class DevicesView { } } + async loadGithubReposFromGithub() { + try { + // TODO filter for branch + let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom"; + let response = await axios.get(url, {}); + let repos = response.data; + let s = await JSON.parse(repos); + var repo_dict = {}; + for (val r in s) { + repo_dict.set(r["name"], 1) + } + console.log("loadGithubReposFromGithub repo_dict " + repo_dict); + this.loadDevice(repo_dict); + + } catch (error) { + console.log("loadGithubRepos error " + error); + } + } async loadDevice(devices) { var requests = Object.keys(devices).map(repo => axios.get(rawURL + repo + "/" + currentVersion + "/meta/config.json")); await Promise.allSettled(requests).then(results => { From ac7c531958a47ce7802af095fa62356ebd65f1dc Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 13:47:59 +0200 Subject: [PATCH 02/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index bc96f06..117da0a 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -36,7 +36,7 @@ class DevicesView { let repos = response.data; let s = await JSON.parse(repos); var repo_dict = {}; - for (val r in s) { + for (var r in s) { repo_dict.set(r["name"], 1) } console.log("loadGithubReposFromGithub repo_dict " + repo_dict); From 7ad7b684a9f4a164e00f040e7f2eae0477230abe Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 13:49:07 +0200 Subject: [PATCH 03/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 117da0a..6c91e3d 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -36,7 +36,7 @@ class DevicesView { let repos = response.data; let s = await JSON.parse(repos); var repo_dict = {}; - for (var r in s) { + for (var r in s["items"]) { repo_dict.set(r["name"], 1) } console.log("loadGithubReposFromGithub repo_dict " + repo_dict); From 90ae83977d65d6220c6809ac17552e6f56175fba Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 13:52:39 +0200 Subject: [PATCH 04/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 6c91e3d..61a6c05 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -146,7 +146,7 @@ class DevicesView { d['image'] = "/images/default_phone_omni.png"; d['changelog'] = gerritURL + "/q/status:merged+android_device" devicesList.push(d) - await this.loadGithubRepos(); + await this.loadGithubReposFromGithub(); } catch (error) { console.log("display device view error: " + error); } From 742bb28c1967d824a1079dc3d90407f6373f2a32 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 13:55:09 +0200 Subject: [PATCH 05/18] Update devices.js --- views/devices/devices.js | 1 + 1 file changed, 1 insertion(+) diff --git a/views/devices/devices.js b/views/devices/devices.js index 61a6c05..ed937fb 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -35,6 +35,7 @@ class DevicesView { let response = await axios.get(url, {}); let repos = response.data; let s = await JSON.parse(repos); + console.log(s["items"]) var repo_dict = {}; for (var r in s["items"]) { repo_dict.set(r["name"], 1) From 1835cf329f17bbfa86144c26a97adb5cb6b74544 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 13:58:19 +0200 Subject: [PATCH 06/18] Update devices.js --- views/devices/devices.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/devices/devices.js b/views/devices/devices.js index ed937fb..08fd070 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -32,8 +32,10 @@ class DevicesView { try { // TODO filter for branch let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom"; + console.log(url); let response = await axios.get(url, {}); let repos = response.data; + console.log(repos); let s = await JSON.parse(repos); console.log(s["items"]) var repo_dict = {}; From a265112da33e154f1bf7586fda29c9f7a8307255 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:02:05 +0200 Subject: [PATCH 07/18] Update devices.js --- views/devices/devices.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 08fd070..367ada1 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -34,9 +34,7 @@ class DevicesView { let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom"; console.log(url); let response = await axios.get(url, {}); - let repos = response.data; - console.log(repos); - let s = await JSON.parse(repos); + let s = response.data; console.log(s["items"]) var repo_dict = {}; for (var r in s["items"]) { From 326c6d51459a16fc599302aa443655303f76ba78 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:10:03 +0200 Subject: [PATCH 08/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 367ada1..43016d9 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -38,7 +38,7 @@ class DevicesView { console.log(s["items"]) var repo_dict = {}; for (var r in s["items"]) { - repo_dict.set(r["name"], 1) + repo_dict[r["name"]] = 1; } console.log("loadGithubReposFromGithub repo_dict " + repo_dict); this.loadDevice(repo_dict); From e5a63c42f15739b6c31da9953c5f780d05fbc9b6 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:14:09 +0200 Subject: [PATCH 09/18] Update devices.js --- views/devices/devices.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 43016d9..d096731 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -32,15 +32,15 @@ class DevicesView { try { // TODO filter for branch let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom"; - console.log(url); let response = await axios.get(url, {}); let s = response.data; - console.log(s["items"]) var repo_dict = {}; for (var r in s["items"]) { + console.log(r); + console.log(r["name"]); repo_dict[r["name"]] = 1; } - console.log("loadGithubReposFromGithub repo_dict " + repo_dict); + console.log("loadGithubReposFromGithub repo_dict " + Object.keys(repo_dict)); this.loadDevice(repo_dict); } catch (error) { From 421cdfddab3033fc0f537c38f4cf4393788cb7cc Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:18:25 +0200 Subject: [PATCH 10/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index d096731..c53df23 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -35,7 +35,7 @@ class DevicesView { let response = await axios.get(url, {}); let s = response.data; var repo_dict = {}; - for (var r in s["items"]) { + for (var r in Object.values(s["items"])) { console.log(r); console.log(r["name"]); repo_dict[r["name"]] = 1; From 5828de9b8977e7da9965b4adbc9f5d8e9990a64b Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:20:58 +0200 Subject: [PATCH 11/18] Update devices.js --- views/devices/devices.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/views/devices/devices.js b/views/devices/devices.js index c53df23..632dca2 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -35,6 +35,8 @@ class DevicesView { let response = await axios.get(url, {}); let s = response.data; var repo_dict = {}; + console.log(Object.keys(s["items"]); + console.log(Object.values(s["items"]); for (var r in Object.values(s["items"])) { console.log(r); console.log(r["name"]); From c1f467a4765e7b544091334d7aefa327b7000a48 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:22:36 +0200 Subject: [PATCH 12/18] Update devices.js --- views/devices/devices.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 632dca2..2e55663 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -35,8 +35,8 @@ class DevicesView { let response = await axios.get(url, {}); let s = response.data; var repo_dict = {}; - console.log(Object.keys(s["items"]); - console.log(Object.values(s["items"]); + console.log(Object.keys(s["items"])); + console.log(Object.values(s["items"])); for (var r in Object.values(s["items"])) { console.log(r); console.log(r["name"]); From 571ad8f9591cff4e2c3385238d2cc4297186aaa6 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:27:19 +0200 Subject: [PATCH 13/18] Update devices.js --- views/devices/devices.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 2e55663..79dc308 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -35,11 +35,9 @@ class DevicesView { let response = await axios.get(url, {}); let s = response.data; var repo_dict = {}; - console.log(Object.keys(s["items"])); - console.log(Object.values(s["items"])); - for (var r in Object.values(s["items"])) { - console.log(r); - console.log(r["name"]); + for (const [key, value] of Object.entries(s["items"])) + console.log(`${key}: ${value}`); + console.log(value["name"]); repo_dict[r["name"]] = 1; } console.log("loadGithubReposFromGithub repo_dict " + Object.keys(repo_dict)); From df7b27af8f1832b4f15b9469aa34f56a59894525 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:28:44 +0200 Subject: [PATCH 14/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 79dc308..c029943 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -35,7 +35,7 @@ class DevicesView { let response = await axios.get(url, {}); let s = response.data; var repo_dict = {}; - for (const [key, value] of Object.entries(s["items"])) + for (const [key, value] of Object.entries(s["items"])){ console.log(`${key}: ${value}`); console.log(value["name"]); repo_dict[r["name"]] = 1; From ae98442d154b639277850c6b7d79e7d38d56b8b5 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:30:28 +0200 Subject: [PATCH 15/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index c029943..21cd326 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -38,7 +38,7 @@ class DevicesView { for (const [key, value] of Object.entries(s["items"])){ console.log(`${key}: ${value}`); console.log(value["name"]); - repo_dict[r["name"]] = 1; + repo_dict[value["name"]] = 1; } console.log("loadGithubReposFromGithub repo_dict " + Object.keys(repo_dict)); this.loadDevice(repo_dict); From cc4dae130fe71f377d7f37f63b9c7ab9d5dac053 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:40:45 +0200 Subject: [PATCH 16/18] Update devices.js --- views/devices/devices.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 21cd326..00fd991 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -31,13 +31,11 @@ class DevicesView { async loadGithubReposFromGithub() { try { // TODO filter for branch - let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom"; + let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom&per_page=100"; let response = await axios.get(url, {}); let s = response.data; var repo_dict = {}; for (const [key, value] of Object.entries(s["items"])){ - console.log(`${key}: ${value}`); - console.log(value["name"]); repo_dict[value["name"]] = 1; } console.log("loadGithubReposFromGithub repo_dict " + Object.keys(repo_dict)); From 622c20d11d90bb7ca5a1622024eea3a8477d3750 Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:48:59 +0200 Subject: [PATCH 17/18] Update devices.js --- views/devices/devices.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 00fd991..6a7ab77 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -10,6 +10,14 @@ var branchMapping = { 'android-14_0': 'android-14.0', 'android-15_0': 'android-15' } +// temporary +repo_dict = { + "android_device_google_raven" : 1, + "android_device_google_oriole" : 1, + "android_device_asus_zenfone7" : 1, + "android_device_asus_zenfone8" : 1, + "android_device_asus_zenfone9" : 1, +} class DevicesView { @@ -31,13 +39,13 @@ class DevicesView { async loadGithubReposFromGithub() { try { // TODO filter for branch - let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom&per_page=100"; - let response = await axios.get(url, {}); - let s = response.data; - var repo_dict = {}; - for (const [key, value] of Object.entries(s["items"])){ - repo_dict[value["name"]] = 1; - } + //let url = githubAPIURL + "/search/repositories?q=android_device+owner:omnirom&per_page=100"; + //let response = await axios.get(url, {}); + //let s = response.data; + //var repo_dict = {}; + //for (const [key, value] of Object.entries(s["items"])){ + // repo_dict[value["name"]] = 1; + //} console.log("loadGithubReposFromGithub repo_dict " + Object.keys(repo_dict)); this.loadDevice(repo_dict); From 459d995f49e4145d372c7b365ce39514f2c19ecd Mon Sep 17 00:00:00 2001 From: maxwen Date: Sun, 4 May 2025 14:50:20 +0200 Subject: [PATCH 18/18] Update devices.js --- views/devices/devices.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/devices/devices.js b/views/devices/devices.js index 6a7ab77..1648da5 100644 --- a/views/devices/devices.js +++ b/views/devices/devices.js @@ -11,7 +11,7 @@ var branchMapping = { 'android-15_0': 'android-15' } // temporary -repo_dict = { +var repo_dict = { "android_device_google_raven" : 1, "android_device_google_oriole" : 1, "android_device_asus_zenfone7" : 1,