open.source/stylus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

identify by UUID when importing

Browse Source
This commit is contained in:
tophf 2022-02-10 09:53:02 +03:00
parent de5eb32d2d
commit ae6f7024ce
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manage/import-export.js
View File

@ -104,6 +104,7 @@ async function importFromString(jsonString) {
const json = tryJSONparse(jsonString); const json = tryJSONparse(jsonString);
const oldStyles = Array.isArray(json) && json.length ? await API.styles.getAll() : []; const oldStyles = Array.isArray(json) && json.length ? await API.styles.getAll() : [];
const oldStylesById = new Map(oldStyles.map(style => [style.id, style])); const oldStylesById = new Map(oldStyles.map(style => [style.id, style]));
const oldStylesByUuid = new Map(oldStyles.map(style => [style._id, style]));
const oldStylesByName = new Map(oldStyles.map(style => [style.name.trim(), style])); const oldStylesByName = new Map(oldStyles.map(style => [style.name.trim(), style]));
const oldOrder = await API.styles.getOrder(); const oldOrder = await API.styles.getOrder();
const items = []; const items = [];
@ -144,10 +145,11 @@ async function importFromString(jsonString) {
} }
item.name = item.name.trim(); item.name = item.name.trim();
const byId = oldStylesById.get(item.id); const byId = oldStylesById.get(item.id);
const byUuid = oldStylesByUuid.get(item._id);
const byName = oldStylesByName.get(item.name); const byName = oldStylesByName.get(item.name);
oldStylesByName.delete(item.name); oldStylesByName.delete(item.name);
let oldStyle; let oldStyle = byUuid;
if (byId) { if (!oldStyle && byId) {
if (sameStyle(byId, item)) { if (sameStyle(byId, item)) {
oldStyle = byId; oldStyle = byId;
} else { } else {