Skip to content

fix(import): keep a new phone's own name out of its model numbers #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NotAFlightRisk merged 1 commit into from
Oct 21, 2026
Merged

fix(import): keep a new phone's own name out of its model numbers #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions scripts/import/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ const claim = (brand, names) =>
names.forEach((name) => claimed.add(`${brand}/${name.toLowerCase()}`));
const unclaimed = (brand, names = []) =>
[...new Set(names)].filter((name) => !claimed.has(`${brand}/${name.toLowerCase()}`));
const aliasesFor = (brand, name, aliases) =>
unclaimed(brand, aliases).filter((alias) => alias.toLowerCase() !== name.toLowerCase());

function track(entry) {
const { brand, device } = entry;
Expand Down Expand Up @@ -98,7 +100,7 @@ const deviceFields = ({ released, soc, type, hardware }) => ({

function createDevice(brand, { name, codenames, aliases, bootloader, ...rest }) {
const slug = slugify(name);
const newAliases = unclaimed(brand, aliases);
const newAliases = aliasesFor(brand, name, aliases);
const entry = {
brand,
key: codenames[0],
Expand Down Expand Up @@ -128,9 +130,7 @@ function fillBootloader(current, { unlock, notes, source }) {
function fillGaps(brand, current, { aliases, bootloader = {}, ...rest }) {
for (const [key, value] of Object.entries(deviceFields(rest))) current[key] ??= value;
fillBootloader(current.bootloader, bootloader);
const newAliases = unclaimed(brand, aliases).filter(
(alias) => alias.toLowerCase() !== current.name.toLowerCase(),
);
const newAliases = aliasesFor(brand, current.name, aliases);
if (newAliases.length) current.aliases = [...(current.aliases ?? []), ...newAliases];
claim(brand, newAliases);
}
Expand Down
7 changes: 5 additions & 2 deletions tests/import/store.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,11 @@ test('a name that opens with another brand we list goes to that brand', () => {
test("a device's own name never turns up as one of its aliases", () => {
upsertDevice('Acme', { name: 'Comet', codenames: ['c1'] });
upsertDevice('Acme', { name: 'Comet Max', codenames: ['c1'], aliases: ['COMET', 'Comet Max'] });
const file = join(process.env.DATA_DIR, 'devices/acme/c1.yml');
assert.deepEqual(parse(readFileSync(file, 'utf8')).aliases, ['Comet Max']);
upsertDevice('Acme', { name: 'Nova 3', codenames: ['n3'], aliases: ['Nova 3', 'N-3'] });
const aliasesOf = (file) =>
parse(readFileSync(join(process.env.DATA_DIR, 'devices/acme', file), 'utf8')).aliases;
assert.deepEqual(aliasesOf('c1.yml'), ['Comet Max']);
assert.deepEqual(aliasesOf('n3.yml'), ['N-3']);
});

test('a source that loses a fifth of its devices fails and leaves the file alone', () => {
Expand Down
Loading