Public/fifthgrid_browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Scott E. Graves
2025-09-13 22:04:15 -05:00
parent 26639e924d
commit d5f8b2d4ea
1 changed files with 82 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
src/api.js
View File

@@ -62,131 +62,113 @@ const getBucketFiles = async (folderName) => {
Prefix: folderKey, Prefix: folderKey,
}), }),
); );
const ret = data.Contents.filter((item) => item.Key !== folderKey)
const ret = (data.Contents || [])
.filter((item) => item.Key !== folderKey)
.map((item) => { .map((item) => {
const d =
item.LastModified instanceof Date
? item.LastModified
: new Date(item.LastModified);
return { return {
date: d date: item.LastModified.toLocaleDateString("en-US", {
.toLocaleDateString("en-US", { year: "numeric",
year: "numeric", month: "2-digit",
month: "2-digit", day: "2-digit",
day: "2-digit", hour: "2-digit",
hour: "2-digit", minute: "2-digit",
minute: "2-digit", second: "2-digit",
second: "2-digit", }).replace(/,/g, ""),
}) sort: item.LastModified.getTime(),
.replace(/,/g, ""),
sort: d.getTime(),
name: item.Key.replace(folderKey, ""), name: item.Key.replace(folderKey, ""),
key: item.Key, key: item.Key,
}; };
}) })
.sort((a, b) => (a.sort > b.sort ? -1 : a.sort < b.sort ? 1 : 0)); .sort((a, b) => {
return a.sort > b.sort ? -1 : a.sort < b.sort ? 1 : 0;
});
const itemCount = {}; const itemCount = {};
const ext = ".tar.gz"; const ext = ".tar.gz";
// ----- choose which tars to keep (apply nightly retention) ----- const filteredItems = ret
const baseTars = ret.filter((item) => item.name.endsWith(ext)); .filter((item) => item.name.endsWith(ext))
const keepTarKeys = new Set(); .filter((item) => {
if (folderName === "nightly") {
for (const t of baseTars) { const parts = item.name.split("_");
if (folderName === "nightly") { const groupId = `${parts[0]}_${parts[3]}_${parts[4]}`;
const parts = t.name.split("_"); itemCount[groupId] = itemCount[groupId] || 0;
// parts[0]=product, parts[3]=platform, parts[4]=arch if (++itemCount[groupId] <= 3) {
const groupId = `${parts[0]}_${parts[3]}_${parts[4]}`; return true;
itemCount[groupId] = itemCount[groupId] || 0;
if (++itemCount[groupId] <= 3) {
keepTarKeys.add(t.key);
} else {
// mark old: tar + sidecars
if (!oldItems.includes(t.key)) {
oldItems.push(t.key, t.key + ".sha256", t.key + ".sig");
} }
// windows companion if (!oldItems.find((key) => key === item.key)) {
if (parts[3] === "windows") { oldItems.push(item.key);
const setup_key = oldItems.push(item.key + ".sha256");
t.key.substring(0, t.key.length - ext.length) + "_setup.exe"; oldItems.push(item.key + ".sig");
const setup_item = ret.find((x) => x.key === setup_key);
if (setup_item && !oldItems.includes(setup_key)) { if (parts[3] === "windows") {
oldItems.push( const setup_key =
setup_key, item.key.substring(0, item.key.length - ext.length) +
setup_key + ".sha256", "_setup.exe";
setup_key + ".sig",
); const setup_item = ret.find((item) => item.key == setup_key);
} if (setup_item) {
} oldItems.push(setup_key);
// darwin companion (.dmg) oldItems.push(setup_key + ".sha256");
if (parts[3] === "darwin") { oldItems.push(setup_key + ".sig");
const dmg_key = }
t.key.substring(0, t.key.length - ext.length) + ".dmg";
const dmg_item = ret.find((x) => x.key === dmg_key);
if (dmg_item && !oldItems.includes(dmg_key)) {
oldItems.push(dmg_key, dmg_key + ".sha256", dmg_key + ".sig");
} }
} }
return false;
} }
} else { return true;
keepTarKeys.add(t.key); });
}
}
// ----- build final output without splicing while iterating ----- const totalCount = filteredItems.length * 3;
const byKey = Object.fromEntries(ret.map((r) => [r.key, r])); const setup_items = [];
const out = []; let setup_offset = 0;
for (let i = 0; i < totalCount && i < filteredItems.length; i += 3) {
const parts = filteredItems[i].name.split("_");
let item = ret.filter(
(item) => item.name === filteredItems[i].name + ".sha256",
);
filteredItems.splice(i + 1, 0, ...item);
item = ret.filter((item) => item.name === filteredItems[i].name + ".sig");
filteredItems.splice(i + 2, 0, ...item);
for (const t of baseTars) {
if (!keepTarKeys.has(t.key)) continue;
const parts = t.name.split("_");
// 1) tar + sidecars
out.push(t);
const tarSha = byKey[t.key + ".sha256"];
if (tarSha) out.push(tarSha);
const tarSig = byKey[t.key + ".sig"];
if (tarSig) out.push(tarSig);
// 2) windows companion: _setup.exe + sidecars
if (parts[3] === "windows") { if (parts[3] === "windows") {
const setup_key = const setup_key =
t.key.substring(0, t.key.length - ext.length) + "_setup.exe"; filteredItems[i].key.substring(
const setup = byKey[setup_key]; 0,
if (setup) { filteredItems[i].key.length - ext.length,
out.push(setup); ) + "_setup.exe";
const setupSha = byKey[setup_key + ".sha256"];
if (setupSha) out.push(setupSha);
const setupSig = byKey[setup_key + ".sig"];
if (setupSig) out.push(setupSig);
}
}
// 3) darwin companion: .dmg + sidecars const setup_item = ret.find((item) => item.key == setup_key);
if (parts[3] === "darwin") { if (setup_item) {
const dmg_key = t.key.substring(0, t.key.length - ext.length) + ".dmg"; const setup_item2 = ret.find(
const dmg = byKey[dmg_key]; (item) => item.key == setup_key + ".sha256",
if (dmg) { );
out.push(dmg); const setup_item3 = ret.find(
const dmgSha = byKey[dmg_key + ".sha256"]; (item) => item.key == setup_key + ".sig",
if (dmgSha) out.push(dmgSha); );
const dmgSig = byKey[dmg_key + ".sig"]; setup_items.push([
if (dmgSig) out.push(dmgSig); { idx: i + 3 + setup_offset },
setup_item,
setup_item2,
setup_item3,
]);
setup_offset += 3;
} }
} }
} }
return out; if (setup_items.length > 0) {
setup_items.forEach((items) => {
filteredItems.splice(items[0].idx, 0, items[1]);
filteredItems.splice(items[0].idx + 1, 0, items[2]);
filteredItems.splice(items[0].idx + 2, 0, items[3]);
});
}
return filteredItems;
} catch (err) { } catch (err) {
console.error(err); console.error(err);
// make sure we always return an array for callers
return [];
} }
return [];
}; };
export { cleanOldItems, createDownloadLink, getBucketFiles }; export { cleanOldItems, createDownloadLink, getBucketFiles };