From afa01d20c1e03d6b4ecc1c31c377821188bdafc0 Mon Sep 17 00:00:00 2001 From: RangarNavia <43579415+RangarNavia@users.noreply.github.com> Date: Sat, 7 Nov 2026 18:13:06 +0800 Subject: [PATCH] Wardrobe: Load mod (.zip) can import several zips at once The file input now accepts multiple files. They are imported one at a time, because importZip rewrites the shared mod list and state and re-applies the textures each time. A zip that fails is skipped and the rest still load; the message shows how many loaded and which files failed and why. With a single file the messages are the same as before. Bumps ?v= to 32 for the wardrobe modules that import each other (mods/section.js, wardrobe/panel.js, tiles.js, looks.js, color-picker.js), and to 40 for wardrobe.js in wardrobe.html. --- webapp/js/mods/section.js | 42 +++++++++++++++++++++--------- webapp/js/wardrobe.js | 2 +- webapp/js/wardrobe/color-picker.js | 2 +- webapp/js/wardrobe/looks.js | 2 +- webapp/js/wardrobe/panel.js | 8 +++--- webapp/js/wardrobe/tiles.js | 4 +-- webapp/wardrobe.html | 2 +- 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/webapp/js/mods/section.js b/webapp/js/mods/section.js index 00e2c836..37fdc191 100644 --- a/webapp/js/mods/section.js +++ b/webapp/js/mods/section.js @@ -1,5 +1,5 @@ -import { makeItemColorButton } from '../wardrobe/color-picker.js?v=31'; -import { bindTileDrag } from '../wardrobe/tiles.js?v=31'; +import { makeItemColorButton } from '../wardrobe/color-picker.js?v=32'; +import { bindTileDrag } from '../wardrobe/tiles.js?v=32'; import { modItemKey } from '../wardrobe/worn.js?v=29'; import { itemThumbUrl } from './layers.js?v=18'; import { ensureLoaded, followsHerColors, importZip, isEquipped, modState, mods, removeMod, setColor, setEquipped, setFollowsHerColors } from './engine.js?v=28'; @@ -23,23 +23,39 @@ export function buildWardrobeSection(body) { bar.style.cssText = 'display:flex;gap:8px;align-items:center;margin:4px 0 8px'; bar.innerHTML = ` Mods stay in your browser - nothing is uploaded - `; + `; const input = bar.querySelector('input'); const msg = bar.querySelector('[data-mod-msg]'); bar.querySelector('[data-mod-load]').addEventListener('click', () => input.click()); input.addEventListener('change', async () => { - const f = input.files[0]; + // copy first: clearing the value also empties the live FileList + const files = [...input.files]; input.value = ''; - if (!f) return; - msg.textContent = 'Loading…'; - try { - const mod = await importZip(await f.arrayBuffer()); - msg.textContent = `Loaded "${mod.name}" - click an item to equip it`; - renderMods(); - } catch (e) { - console.error(e); - msg.textContent = 'Failed: ' + e.message; + if (!files.length) return; + const loaded = [], failed = []; + for (const [n, f] of files.entries()) { + msg.textContent = files.length > 1 ? `Loading ${n + 1}/${files.length}…` : 'Loading…'; + // one at a time: importZip rewrites the shared mod list and state, + // and one bad zip must not stop the rest + try { + const mod = await importZip(await f.arrayBuffer()); + loaded.push(mod.name); + renderMods(); + } catch (e) { + console.error(e); + failed.push({ file: f.name, error: e.message }); + } + } + if (files.length === 1) { + msg.textContent = loaded.length + ? `Loaded "${loaded[0]}" - click an item to equip it` + : 'Failed: ' + failed[0].error; + return; } + const parts = []; + if (loaded.length) parts.push(`Loaded ${loaded.length} mod${loaded.length > 1 ? 's' : ''} - click an item to equip it`); + if (failed.length) parts.push('Failed: ' + failed.map(x => `${x.file} (${x.error})`).join(', ')); + msg.textContent = parts.join('. '); }); const list = document.createElement('div'); list.dataset.modList = '1'; diff --git a/webapp/js/wardrobe.js b/webapp/js/wardrobe.js index 52811a88..eac2140d 100644 --- a/webapp/js/wardrobe.js +++ b/webapp/js/wardrobe.js @@ -7,7 +7,7 @@ import * as Scene from './trip/scene.js?v=1'; import { startSkybox } from './trip/skybox.js?v=2'; import * as TripLoader from './trip/trip-loader.js?v=1'; import { armCurtains } from './wardrobe/curtains.js?v=17'; -import { openWardrobe } from './wardrobe/panel.js?v=31'; +import { openWardrobe } from './wardrobe/panel.js?v=32'; const status = document.getElementById('stageStatus'); const HEAD_HOME_ICON = ''; diff --git a/webapp/js/wardrobe/color-picker.js b/webapp/js/wardrobe/color-picker.js index c36c0029..ad6fcc29 100644 --- a/webapp/js/wardrobe/color-picker.js +++ b/webapp/js/wardrobe/color-picker.js @@ -3,7 +3,7 @@ import * as MobileViewport from '../core/viewport.js?v=1'; import { colorGroup } from '../outfit/catalog.js?v=4'; import { colors } from '../outfit/current.js?v=4'; import { hexToHsv, hsvToHex, normalizeHex } from '../outfit/colors.js?v=1'; -import { optPopEl, positionOptionsPopup } from './tiles.js?v=31'; +import { optPopEl, positionOptionsPopup } from './tiles.js?v=32'; import { setColor } from '../outfit/apply.js?v=28'; function paintColorButton(button) { diff --git a/webapp/js/wardrobe/looks.js b/webapp/js/wardrobe/looks.js index f8e7ec8f..ac09aaab 100644 --- a/webapp/js/wardrobe/looks.js +++ b/webapp/js/wardrobe/looks.js @@ -1,5 +1,5 @@ import { Presets, applyPreset, decodeOutfitCode, encodeOutfitCode, endPreview, schedulePreview } from '../outfit/presets.js?v=28'; -import { clearWornHover, wdOverlay } from './panel.js?v=31'; +import { clearWornHover, wdOverlay } from './panel.js?v=32'; export const looksOpen = () => document.body.classList.contains('looks-open'); diff --git a/webapp/js/wardrobe/panel.js b/webapp/js/wardrobe/panel.js index 920d0eb5..6e65bab3 100644 --- a/webapp/js/wardrobe/panel.js +++ b/webapp/js/wardrobe/panel.js @@ -1,14 +1,14 @@ import * as Live2D from '../live2d/live2d.js?v=90'; import { BODY_VARIANTS, CLOTHING_VARIANTS, COLOR_GROUPS, ITEMS, ITEM_COLOR_GROUPS, ITEM_VARIANTS, VARIANTS } from '../outfit/catalog.js?v=4'; -import { fillTile, makeOptOrb, makeSwatch, makeTile, openTilePopup, syncOptionsPopup, wdMoveGhost, wdShowGhost } from './tiles.js?v=31'; +import { fillTile, makeOptOrb, makeSwatch, makeTile, openTilePopup, syncOptionsPopup, wdMoveGhost, wdShowGhost } from './tiles.js?v=32'; import { state, variantState } from '../outfit/current.js?v=4'; import { itemThumb, variantThumb } from './tile-bake.js?v=28'; -import { looksOpen, toggleLooks } from './looks.js?v=31'; +import { looksOpen, toggleLooks } from './looks.js?v=32'; import { reset, setItem } from '../outfit/apply.js?v=28'; import { wornDrawableMap, wornHitAt, wornLabel, wornRemove, wornWear } from './worn.js?v=29'; -import { buildWardrobeSection, syncModTiles } from '../mods/section.js?v=31'; +import { buildWardrobeSection, syncModTiles } from '../mods/section.js?v=32'; import { activate, playOutro } from './reactions.js?v=88'; -import { refreshColorButtons } from './color-picker.js?v=31'; +import { refreshColorButtons } from './color-picker.js?v=32'; import { hooks } from '../outfit/hooks.js?v=1'; export let clearWornHover = null; diff --git a/webapp/js/wardrobe/tiles.js b/webapp/js/wardrobe/tiles.js index 5fca7144..01cf444a 100644 --- a/webapp/js/wardrobe/tiles.js +++ b/webapp/js/wardrobe/tiles.js @@ -1,10 +1,10 @@ import * as Live2D from '../live2d/live2d.js?v=90'; -import { closeColorPicker, colorPickerEl, makeColorButton, phonePopupMode, pickerEmbedded, schedulePopupPosition, showColorPicker, visualViewportRect, watchPopupViewport } from './color-picker.js?v=31'; +import { closeColorPicker, colorPickerEl, makeColorButton, phonePopupMode, pickerEmbedded, schedulePopupPosition, showColorPicker, visualViewportRect, watchPopupViewport } from './color-picker.js?v=32'; import { colorGroup } from '../outfit/catalog.js?v=4'; import { colors, state, variantState } from '../outfit/current.js?v=4'; import { setItem, setVariant } from '../outfit/apply.js?v=28'; import { variantThumb } from './tile-bake.js?v=28'; -import { wdGhost } from './panel.js?v=31'; +import { wdGhost } from './panel.js?v=32'; export function wdMoveGhost(x, y) { wdGhost.style.left = (x + 10) + 'px'; diff --git a/webapp/wardrobe.html b/webapp/wardrobe.html index ecf2bb33..8c7bdd7a 100644 --- a/webapp/wardrobe.html +++ b/webapp/wardrobe.html @@ -21,6 +21,6 @@ - +