Atlas48/grungnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve checking for duplication on unprocessed assets

Browse Source
This commit is contained in:
nthouliss 2022-04-11 15:20:48 +10:00
parent 89ddbf7e5c
commit 1ea05e8686
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/modals/ImportExportModal.tsx
View File

@ -193,7 +193,7 @@ function ImportExportModal({
// Mapping of old asset ids to new asset ids // Mapping of old asset ids to new asset ids
let newAssetIds: Record<string, string> = {}; let newAssetIds: Record<string, string> = {};
// Mapping of old asset ids to old maps // Mapping of old asset ids to old maps
let oldAssetIds: Record<string, { itemName: string, item: "map" | "token", assetType: string }> = {}; let oldAssetIds: Record<string, { itemName: string, itemId: string, item: "map" | "token", assetType: "file" | "thumbnail" | "resolution", newId: string }> = {};
// Mapping of old maps ids to new map ids // Mapping of old maps ids to new map ids
let newMapIds: Record<string, string> = {}; let newMapIds: Record<string, string> = {};
@ -220,8 +220,8 @@ function ImportExportModal({
newAssetIds[token.file] = newFileId; newAssetIds[token.file] = newFileId;
newAssetIds[token.thumbnail] = newThumbnailId; newAssetIds[token.thumbnail] = newThumbnailId;
oldAssetIds[token.file] = { itemName: token.name, item: "token", assetType: "file" }; oldAssetIds[token.file] = { itemName: token.name, itemId: token.id, item: "token", assetType: "file", newId: newId };
oldAssetIds[token.thumbnail] = { itemName: token.name, item: "token", assetType: "thumbnail" }; oldAssetIds[token.thumbnail] = { itemName: token.name, itemId: token.id, item: "token", assetType: "thumbnail", newId: newId };
// Change ids and owner // Change ids and owner
if (userId) { if (userId) {
@ -277,14 +277,14 @@ function ImportExportModal({
newAssetIds[map.file] = newFileId; newAssetIds[map.file] = newFileId;
newAssetIds[map.thumbnail] = newThumbnailId; newAssetIds[map.thumbnail] = newThumbnailId;
oldAssetIds[map.file] = { itemName: map.name, item: "map", assetType: "file" }; oldAssetIds[map.file] = { itemName: map.name, itemId: map.id, item: "map", assetType: "file", newId: newId };
oldAssetIds[map.thumbnail] = { itemName: map.name, item: "map", assetType: "thumbnail" }; oldAssetIds[map.thumbnail] = { itemName: map.name, itemId: map.id, item: "map", assetType: "thumbnail", newId: newId };
const newResolutionIds: Record<string, string> = {}; const newResolutionIds: Record<string, string> = {};
for (let res of Object.keys(map.resolutions)) { for (let res of Object.keys(map.resolutions)) {
newResolutionIds[res] = uuid(); newResolutionIds[res] = uuid();
newAssetIds[map.resolutions[res]] = newResolutionIds[res]; newAssetIds[map.resolutions[res]] = newResolutionIds[res];
oldAssetIds[map.resolutions[res]] = { itemName: map.name, item: "map", assetType: "resolution" }; oldAssetIds[map.resolutions[res]] = { itemName: map.name, itemId: map.id, item: "map", assetType: "resolution", newId: newId };
} }
if (userId) { if (userId) {
@ -329,21 +329,26 @@ function ImportExportModal({
let unprocessedMaps = 0 let unprocessedMaps = 0
let unprocessedTokens = 0 let unprocessedTokens = 0
if (unprocessedAssets.length > 0) { if (unprocessedAssets.length > 0) {
const unprocessedItems: string[] = [] const unprocessedItems: { id: string, name: string }[] = []
for (let item of unprocessedAssets) { for (let item of unprocessedAssets) {
let unprocessedItem = oldAssetIds[item] let unprocessedItem = oldAssetIds[item]
if (!unprocessedItems.includes(unprocessedItem.itemName)) { if (!!!(unprocessedItems.some(value => value.id === unprocessedItem.itemId))) {
unprocessedItems.push(unprocessedItem.itemName) unprocessedItems.push({ id: unprocessedItem.itemId, name: unprocessedItem.itemName })
if (unprocessedItem.item === "map") { if (unprocessedItem.item === "map") {
unprocessedMaps += 1 unprocessedMaps += 1
const index = newMaps.findIndex(map => map.id === unprocessedItem.newId)
newMaps.splice(index, 1)
} else if (unprocessedItem.item === "token") { } else if (unprocessedItem.item === "token") {
unprocessedTokens += 1 unprocessedTokens += 1
const index = newTokens.findIndex(token => token.id === unprocessedItem.newId)
newTokens.splice(index, 1)
} }
} }
} }
addWarningToast("Could not import item(s)", unprocessedItems) const unprocessedItemNames = unprocessedItems.map(item => item.name)
addWarningToast("Could not import item(s)", unprocessedItemNames)
} }
// Add map groups with new ids // Add map groups with new ids