sjs/spirit-tracker
1
0
Fork 0
mirror of https://github.com/samsonjs/spirit-tracker.git synced 2026-04-27 15:07:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: adjusted store label

Browse source
This commit is contained in:
Brennan Wilkes (Text Groove) 2026-01-29 13:27:42 -08:00
parent b9cb92cf5d
commit 5dd38fe6be
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/tracker/merge.js
View file

@ -15,11 +15,21 @@ function isRealSku(v) {
return Boolean(normalizeCspc(v)); return Boolean(normalizeCspc(v));
} }
function normalizeSkuForDb(raw, { storeLabel, url } = {}) { function dbStoreLabel(prevDb) {
const lab = storeLabel || ""; return String(prevDb?.storeLabel || prevDb?.store || "").trim();
}
function itemStoreLabel(prevDb, it) {
return String(it?.storeLabel || it?.store || dbStoreLabel(prevDb)).trim();
}
function normalizeSkuForDb(prevDb, raw, { storeLabel, url } = {}) {
const lab = String(storeLabel || dbStoreLabel(prevDb)).trim();
// IMPORTANT: if we still don't have a label, don't accidentally use "store"
// (but in practice dbStoreLabel(prevDb) should always exist)
return normalizeSkuKey(raw, { storeLabel: lab, url }); return normalizeSkuKey(raw, { storeLabel: lab, url });
} }
function mergeDiscoveredIntoDb(prevDb, discovered) { function mergeDiscoveredIntoDb(prevDb, discovered) {
const merged = new Map(prevDb.byUrl); const merged = new Map(prevDb.byUrl);
@ -107,10 +117,7 @@ function mergeDiscoveredIntoDb(prevDb, discovered) {
if (!prev) { if (!prev) {
const now = { const now = {
...nowRaw, ...nowRaw,
sku: normalizeSkuForDb(nowRaw.sku, { sku: normalizeSkuForDb(prevDb, nowRaw.sku, { storeLabel: itemStoreLabel(prevDb, nowRaw), url }),
storeLabel: nowRaw.storeLabel || nowRaw.store || "",
url,
}),
img: normImg(nowRaw.img), img: normImg(nowRaw.img),
removed: false, removed: false,
}; };
@ -124,11 +131,8 @@ function mergeDiscoveredIntoDb(prevDb, discovered) {
const now = { const now = {
...nowRaw, ...nowRaw,
sku: sku:
normalizeSkuForDb(nowRaw.sku, { normalizeSkuForDb(prevDb, nowRaw.sku, { storeLabel: itemStoreLabel(prevDb, nowRaw), url }) ||
storeLabel: nowRaw.storeLabel || nowRaw.store || prev.storeLabel || prev.store || "", normalizeSkuForDb(prevDb, prev.sku, { storeLabel: itemStoreLabel(prevDb, prev), url: prev.url }),
url,
}) ||
normalizeSkuForDb(prev.sku, { storeLabel: prev.storeLabel || prev.store || "", url: prev.url }),
img: normImg(nowRaw.img) || normImg(prev.img), img: normImg(nowRaw.img) || normImg(prev.img),
removed: false, removed: false,
}; };
@ -146,13 +150,9 @@ function mergeDiscoveredIntoDb(prevDb, discovered) {
const prevPrice = normPrice(prev.price); const prevPrice = normPrice(prev.price);
const nowPrice = normPrice(nowRaw.price); const nowPrice = normPrice(nowRaw.price);
const prevSku = normalizeSkuForDb(prev.sku, { storeLabel: prev.storeLabel || prev.store || "", url: prev.url }); const prevSku = normalizeSkuForDb(prevDb, prev.sku, { storeLabel: itemStoreLabel(prevDb, prev), url: prev.url });
const nowSku = const nowSku = normalizeSkuForDb(prevDb, nowRaw.sku, { storeLabel: itemStoreLabel(prevDb, nowRaw), url }) || prevSku;
normalizeSkuForDb(nowRaw.sku, {
storeLabel: nowRaw.storeLabel || nowRaw.store || prev.storeLabel || prev.store || "",
url,
}) || prevSku;
const prevImg = normImg(prev.img); const prevImg = normImg(prev.img);
let nowImg = normImg(nowRaw.img); let nowImg = normImg(nowRaw.img);
if (!nowImg) nowImg = prevImg; if (!nowImg) nowImg = prevImg;