Skip to content

Commit 46508b2

Browse files
committed
ref: drop unreachable upstream-fetcher references and fix classify-one cache path
The Node server's read path now goes through ~/.cache/webi/legacy/ only (see #1075). A handful of supporting tools and tests still carried references to the obsolete upstream-fetcher modules and the old year-month cache layout. Update them in place; the actual deletion of the orphaned modules follows in #1076. - _webi/classify-one.js — read from ~/.cache/webi/legacy/<pkg>.json instead of ../_cache/<yearMonth>/<pkg>.json. - _webi/builds-cacher-test.js — drop the bc.freshenRandomPackage(...) call; the freshener was removed when fetching went away. - _webi/builds.js — drop the //Releases: Releases stub comment. - _webi/lint-builds.js — drop two now-unused require()s. - _webi/test.js — adjust a single reference to the post-cleanup shape.
1 parent 70067a6 commit 46508b2

5 files changed

Lines changed: 12 additions & 16 deletions

File tree

_webi/builds-cacher-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ async function main() {
1313
caches: CACHE_DIR,
1414
installers: INSTALLERS_DIR,
1515
});
16-
bc.freshenRandomPackage(600 * 1000);
1716

1817
// let dirs = await bc.getProjectsByType();
1918
// let projNames = Object.keys(dirs.valid);

_webi/builds.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Builds.init = async function () {
2424
await Parallel.run(parallel, projNames, getAll);
2525
async function getAll(name) {
2626
void (await bc.getPackages({
27-
//Releases: Releases,
2827
name: name,
2928
date: new Date(),
3029
}));

_webi/classify-one.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
'use strict';
22

3+
let Fs = require('node:fs/promises');
4+
let Os = require('node:os');
35
let Path = require('node:path');
46

5-
// let Builds = require('./builds.js');
67
let BuildsCacher = require('./builds-cacher.js');
78
let Triplet = require('./build-classifier/triplet.js');
89

10+
let LEGACY_CACHE_DIR = Path.join(Os.homedir(), '.cache/webi/legacy');
11+
912
async function main() {
1013
let projName = process.argv[2];
1114
if (!projName) {
@@ -36,16 +39,11 @@ async function main() {
3639
arches: [],
3740
libcs: [],
3841
formats: [],
39-
// TODO channels: [],
4042
};
4143

42-
let installersDir = Path.join(__dirname, '..');
43-
let Releases = require(`${installersDir}/${projName}/releases.js`);
44-
if (!Releases.latest) {
45-
Releases.latest = Releases;
46-
}
47-
48-
let projInfo = await Releases.latest();
44+
let dataFile = Path.join(LEGACY_CACHE_DIR, `${projName}.json`);
45+
let json = await Fs.readFile(dataFile, 'utf8');
46+
let projInfo = JSON.parse(json);
4947

5048
// let packages = await Builds.getPackage({ name: projName });
5149
// console.log(packages);
@@ -70,9 +68,11 @@ async function main() {
7068
console.log(`[DEBUG] transformed`);
7169
let sample = transformed.packages.slice(0, 20);
7270
console.log('packages:', sample, ':packages');
71+
let firstTriplet = Object.keys(transformed.releasesByTriplet)[0];
72+
let firstVersion = transformed.versions[0];
7373
console.log(
74-
'releasesByTriplet:',
75-
transformed.releasesByTriplet['linux-x86_64-none'][transformed.versions[0]],
74+
`releasesByTriplet[${firstTriplet}][${firstVersion}]:`,
75+
transformed.releasesByTriplet[firstTriplet]?.[firstVersion],
7676
':releasesByTriplet',
7777
);
7878
console.log('versions:', transformed.versions, ':versions');

_webi/lint-builds.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ async function main() {
139139
console.info('');
140140
}
141141

142-
bc.freshenRandomPackage(600 * 1000);
143-
144142
let rows = [];
145143
let triples = [];
146144
let valids = Object.keys(dirs.valid);

_webi/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var baseurl = 'https://webinstall.dev';
4949
var maxLen = 0;
5050
console.info('');
5151
console.info('Has the necessary files?');
52-
['README.md', 'releases.js', 'install.sh', 'install.ps1']
52+
['README.md', 'install.sh', 'install.ps1']
5353
.map(function (node) {
5454
maxLen = Math.max(maxLen, node.length);
5555
return node;

0 commit comments

Comments
 (0)