From d636362acc46efd2ad68c62bfc7042e4dd2ddf92 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Sun, 18 Jun 2023 20:14:36 +0200 Subject: [PATCH] Don't precalculate item url. See #99 166 -> 159mb --- bundle.js | 2 +- site/model/{loader.js => items-loader.js} | 2 +- site/model/items.js | 4 ++-- site/views/items-list.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename site/model/{loader.js => items-loader.js} (99%) diff --git a/bundle.js b/bundle.js index 82bfd85..0177903 100755 --- a/bundle.js +++ b/bundle.js @@ -108,7 +108,7 @@ async function bundleJS(inputDir, outputDir, watch) { changes: `${inputDir}/changes.js`, settings: `${inputDir}/settings.js`, index: `${inputDir}/index.js`, - loader: `${inputDir}/model/loader.js`, + "items-loader": `${inputDir}/model/items-loader.js`, }, bundle: true, sourcemap: true, diff --git a/site/model/loader.js b/site/model/items-loader.js similarity index 99% rename from site/model/loader.js rename to site/model/items-loader.js index 65d27f1..6e78722 100644 --- a/site/model/loader.js +++ b/site/model/items-loader.js @@ -118,7 +118,7 @@ function decompress(compressedItems) { const quantity = data[i++]; const isWeighted = data[i++] == 1; const bio = data[i++] == 1; - const url = stores[store].getUrl({ id, name, url: data[i++] }); + const url = data[i++]; items[l] = { store, diff --git a/site/model/items.js b/site/model/items.js index 89f5a03..46014d2 100644 --- a/site/model/items.js +++ b/site/model/items.js @@ -1,6 +1,6 @@ const { Model } = require("./model"); const { Settings } = require("./settings"); -const { loadItems } = require("./loader"); +const { loadItems } = require("./items-loader"); class Items extends Model { constructor() { @@ -32,7 +32,7 @@ class Items extends Model { if (window.Worker && false) { const self = this; return new Promise((resolve, reject) => { - const loader = new Worker("loader.js"); + const loader = new Worker("items-loader.js"); loader.onmessage = (event) => { self._items = event.data.items; self._lookup = event.data.lookup; diff --git a/site/views/items-list.js b/site/views/items-list.js index eff53e5..1322ffa 100644 --- a/site/views/items-list.js +++ b/site/views/items-list.js @@ -132,7 +132,7 @@ class ItemsList extends View { unit: item.unit, quantity: item.quantity, bio: item.bio, - url: item.url, + url: stores[item.store].getUrl(item), }); }); downloadJSON("items.json", cleanedItems);