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: Small adjustments

Browse source
This commit is contained in:
Brennan Wilkes (Text Groove) 2026-01-29 11:59:02 -08:00
parent f1b5b7d36a
commit 7254acb946
4 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/stores/coop.js
View file

@ -1,6 +1,6 @@
"use strict"; "use strict";
const { normalizeCspc } = require("../utils/sku"); const { normalizeSkuKey } = require("../utils/sku");
const { humanBytes } = require("../utils/bytes"); const { humanBytes } = require("../utils/bytes");
const { padLeft, padRight } = require("../utils/string"); const { padLeft, padRight } = require("../utils/string");
@ -163,10 +163,9 @@ function productFromApi(p) {
(Number.isFinite(p?.Price) ? `$${Number(p.Price).toFixed(2)}` : ""); (Number.isFinite(p?.Price) ? `$${Number(p.Price).toFixed(2)}` : "");
const upc = String(p.UPC || "").trim(); const upc = String(p.UPC || "").trim();
const sku = const rawKey = upc || String(p.ProductStoreID || "").trim() || String(p.ProductID || "").trim();
upc || // use UPC if present const sku = normalizeSkuKey(rawKey, { storeLabel: "Co-op World of Whisky", url });
String(p.ProductStoreID); // fallback to store-specific ID
const img = normalizeAbsUrl(p.ImageURL); const img = normalizeAbsUrl(p.ImageURL);
return { return {

20
src/tracker/merge.js
View file

@ -1,7 +1,7 @@
// src/tracker/merge.js // src/tracker/merge.js
"use strict"; "use strict";
const { normalizeCspc } = require("../utils/sku"); const { normalizeSkuKey } = require("../utils/sku");
const { normPrice } = require("../utils/price"); const { normPrice } = require("../utils/price");
function normImg(v) { function normImg(v) {
@ -15,12 +15,10 @@ function isRealSku(v) {
return Boolean(normalizeCspc(v)); return Boolean(normalizeCspc(v));
} }
function normalizeSkuPreserve(raw) { function normalizeSkuForDb(raw, { storeLabel, url } = {}) {
const s = String(raw || "").trim(); return normalizeSkuKey(raw, { storeLabel, url });
const c = normalizeCspc(s);
return c || s; // CSPC if present, else keep UPC/ProductStoreID/etc
} }
function mergeDiscoveredIntoDb(prevDb, discovered) { function mergeDiscoveredIntoDb(prevDb, discovered) {
const merged = new Map(prevDb.byUrl); const merged = new Map(prevDb.byUrl);
@ -108,7 +106,7 @@ function mergeDiscoveredIntoDb(prevDb, discovered) {
if (!prev) { if (!prev) {
const now = { const now = {
...nowRaw, ...nowRaw,
sku: normalizeSkuPreserve(nowRaw.sku), sku: normalizeSkuForDb(nowRaw.sku, { storeLabel: nowRaw.storeLabel, url }),
img: normImg(nowRaw.img), img: normImg(nowRaw.img),
removed: false, removed: false,
}; };
@ -121,7 +119,7 @@ function mergeDiscoveredIntoDb(prevDb, discovered) {
if (prevUrlForThisItem === url && prev.removed) { if (prevUrlForThisItem === url && prev.removed) {
const now = { const now = {
...nowRaw, ...nowRaw,
sku: normalizeSkuPreserve(nowRaw.sku) || normalizeSkuPreserve(prev.sku), sku: normalizeSkuForDb(nowRaw.sku, { storeLabel: nowRaw.storeLabel, url }) || normalizeSkuForDb(prev.sku, { storeLabel: prev.storeLabel, url: prev.url }),
img: normImg(nowRaw.img) || normImg(prev.img), img: normImg(nowRaw.img) || normImg(prev.img),
removed: false, removed: false,
}; };
@ -139,9 +137,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 = normalizeSkuPreserve(prev.sku); const prevSku = normalizeSkuForDb(prev.sku, { storeLabel: prev.storeLabel, url: prev.url });
const nowSku = normalizeSkuPreserve(nowRaw.sku) || prevSku; const nowSku = normalizeSkuForDb(nowRaw.sku, { storeLabel: nowRaw.storeLabel, 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;

5
src/utils/sku_map.js
View file

@ -56,8 +56,9 @@ function isNumericSku(k) {
} }
function isUpcSku(k) { function isUpcSku(k) {
// UPC-A/EAN/GTIN-ish (most common: 12 or 13; sometimes 14) const s = String(k || "").trim();
return /^\d{12,14}$/.test(String(k || "").trim()); if (s.startsWith("upc:")) return true;
return /^\d{12,14}$/.test(s); // keep legacy support
} }

5
viz/app/linker_page.js
View file

@ -233,8 +233,9 @@ function isSoftSkuKey(k) {
function isUpcSkuKey(k) { function isUpcSkuKey(k) {
return /^\d{12,14}$/.test(String(k || "").trim()); const s = String(k || "").trim();
} return s.startsWith("upc:") || /^\d{12,14}$/.test(s);
}
function isABStoreLabel(label) { function isABStoreLabel(label) {