From: Sen Hastings <sen@phobosdpl.com>
To: buildroot@buildroot.org
Cc: Sen Hastings <sen@phobosdpl.com>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [Buildroot] [PATCH 2/2] support/scripts/pkg-stats: fixed sortGrid() performance
Date: Wed, 27 Jul 2022 21:14:44 -0500 [thread overview]
Message-ID: <20220728021444.135820-3-sen@phobosdpl.com> (raw)
In-Reply-To: <20220728021444.135820-1-sen@phobosdpl.com>
sortGrid() has been rewritten to dynamically generate stylesheets with
explicit grid-row properties to re-order the rows, instead of removing
and reinserting the cells.
Performance *should* now be comperable to sorttable.js.
Signed-off-by: Sen Hastings <sen@phobosdpl.com>
---
support/scripts/pkg-stats | 116 +++++++++++++++++++++-----------------
1 file changed, 64 insertions(+), 52 deletions(-)
diff --git a/support/scripts/pkg-stats b/support/scripts/pkg-stats
index d3ec65edbb..d795131cef 100755
--- a/support/scripts/pkg-stats
+++ b/support/scripts/pkg-stats
@@ -744,60 +744,72 @@ html_header = """
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<script>
+const triangleUp = String.fromCodePoint(32, 9652);
+const triangleDown = String.fromCodePoint(32, 9662);
+var lastColumnName = false;
+
function sortGrid(sortLabel){
+ let i = 0;
let pkgSortArray = [], sortedPkgArray = [], pkgStringSortArray = [], pkgNumSortArray = [];
- let columnValues = Array.from(document.getElementsByClassName(sortLabel));
-
- columnValues.shift();
- columnValues.forEach((listing) => {
- let sortArr = [];
- sortArr[0] = listing.id.replace(sortLabel+"_", "");
- if (!listing.innerText){
- sortArr[1] = -1;
- } else {
- sortArr[1] = listing.innerText;
- };
- pkgSortArray.push(sortArr);
- })
- pkgSortArray.forEach((listing) => {
- if ( isNaN(parseInt(listing[1], 10)) ){
- pkgStringSortArray.push(listing);
- } else {
- listing[1] = parseFloat(listing[1]);
- pkgNumSortArray.push(listing);
- };
- })
- sortedStringPkgArray = pkgStringSortArray.sort(function(a, b) {
- const nameA = a[1].toUpperCase(); // ignore upper and lowercase
- const nameB = b[1].toUpperCase(); // ignore upper and lowercase
- if (nameA < nameB) { return -1; };
- if (nameA > nameB) { return 1; };
- return 0; // names must be equal
- });
- sortedNumPkgArray = pkgNumSortArray.sort(function(a, b) {
- return a[1] - b[1];
- });
-
- let triangleUp = String.fromCodePoint(32, 9652);
- let triangleDown = String.fromCodePoint(32, 9662);
- let columnName = document.getElementById(sortLabel);
-
- if (columnName.lastElementChild.innerText == triangleDown) {
- columnName.lastElementChild.innerText = triangleUp;
- sortedStringPkgArray.reverse();
- sortedNumPkgArray.reverse();
- sortedPkgArray = sortedNumPkgArray.concat(sortedStringPkgArray)
- } else {
- columnName.lastElementChild.innerText = triangleDown;
- sortedPkgArray = sortedStringPkgArray.concat(sortedNumPkgArray)
- }
-
- sortedPkgArray.forEach((listing) => {
- let row = Array.from(document.getElementsByClassName(listing[0]));
- let packageGrid = document.getElementById("package-grid");
- row.forEach((element) => { packageGrid.append(element)});
- })
-}
+ const columnValues = Array.from(document.getElementsByClassName(sortLabel));
+ const columnName = document.getElementById(sortLabel);
+ let lastStyle = document.getElementById("sort-css");
+
+ if (lastStyle){
+ lastStyle.disable = true;
+ lastStyle.remove();
+ };
+ const styleElement = document.createElement('style');
+ styleElement.id = "sort-css";
+ document.head.appendChild(styleElement);
+ const styleSheet = styleElement.sheet;
+
+ columnValues.shift();
+ columnValues.forEach((listing) => {
+ let sortArr = [];
+ sortArr[0] = listing.id.replace(sortLabel+"_", "");
+ if (!listing.innerText){
+ sortArr[1] = -1;
+ } else {
+ sortArr[1] = listing.innerText;
+ };
+ pkgSortArray.push(sortArr);
+ });
+ pkgSortArray.forEach((listing) => {
+ if ( isNaN(parseInt(listing[1], 10)) ){
+ pkgStringSortArray.push(listing);
+ } else {
+ listing[1] = parseFloat(listing[1]);
+ pkgNumSortArray.push(listing);
+ };
+ });
+
+ let sortedStringPkgArray = pkgStringSortArray.sort((a, b) => {
+ if (a[1].toUpperCase() < b[1].toUpperCase()) { return -1; };
+ if (a[1].toUpperCase() > b[1].toUpperCase()) { return 1; };
+ return 0;
+ });
+ let sortedNumPkgArray = pkgNumSortArray.sort((a, b) => a[1] - b[1]);
+
+ if (columnName.lastElementChild.innerText == triangleDown) {
+ columnName.lastElementChild.innerText = triangleUp;
+ sortedStringPkgArray.reverse();
+ sortedNumPkgArray.reverse();
+ sortedPkgArray = sortedNumPkgArray.concat(sortedStringPkgArray);
+ } else {
+ columnName.lastElementChild.innerText = triangleDown;
+ sortedPkgArray = sortedStringPkgArray.concat(sortedNumPkgArray);
+ };
+
+ if (lastColumnName && lastColumnName != columnName){lastColumnName.lastElementChild.innerText = ""};
+ lastColumnName = columnName;
+ sortedPkgArray.unshift(["label"]);
+ sortedPkgArray.forEach((listing) => {
+ i++;
+ let rule = "." + listing[0] + " { grid-row: " + i + "; }";
+ styleSheet.insertRule(rule);
+ });
+};
</script>
<style>
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2022-07-28 2:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-28 2:14 [Buildroot] [PATCH 0/2] support/scripts/pkg-stats: fix row/column ordering issues Sen Hastings
2022-07-28 2:14 ` [Buildroot] [PATCH 1/2] support/scripts/pkg-stats: fix duplicate package class names across rows Sen Hastings
2022-07-28 2:14 ` Sen Hastings [this message]
2022-07-28 7:30 ` [Buildroot] [PATCH 0/2] support/scripts/pkg-stats: fix row/column ordering issues Thomas Petazzoni via buildroot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220728021444.135820-3-sen@phobosdpl.com \
--to=sen@phobosdpl.com \
--cc=buildroot@buildroot.org \
--cc=thomas.petazzoni@bootlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.