${l}
`, "") } + _caseInsensitiveSystem() { + return navigator.appVersion.indexOf("Win") != -1 || navigator.appVersion.indexOf("Mac") != -1; + } + + _testListingPath(target, path) { + if (this._caseInsensitiveSystem()) { + target = target.toLowerCase(); + path = path.toLowerCase(); + } + return target === path; + } + + async _getFilePickerFiles(path, options = {}) { + const listing = await FilePicker.browse("data", path, options); + if (!this._testListingPath(listing.target, path)) return false; + if (this._caseInsensitiveSystem()) { + listing.dirs = listing.dirs.map(d => d.toLowerCase()); + listing.files = listing.files.map(d => d.toLowerCase()); + } + return listing; + } + async _doesDirectoryExist(path, directory) { - const listing = this._cachedBrowse[path] || await FilePicker.browse("data", path); - if (listing.target !== path) return false; - this._cachedBrowse[path] = listing; - return listing.dirs.includes(path ? `${path}/${directory}` : directory); + if (this._caseInsensitiveSystem()) { + path = (path ?? "").toLowerCase(); + directory = (directory ?? "").toLowerCase(); + } + let listing = this._cachedBrowse[path]; + if (listing == undefined) { + this._cachedBrowse[path] = listing = await this._getFilePickerFiles(path); + } + + let targetPath = path ? `${path}/${directory}` : directory; + return listing.dirs.includes(targetPath); } async _doesFileExist(path, filename) { + if (this._caseInsensitiveSystem()) { + path = (path ?? "").toLowerCase(); + filename = (filename ?? "").toLowerCase(); + } // Foundry does not include files with no extensions in the listing, so need to use a trick to make it happen, and keep two caches let listing; if (filename.includes(".")) { - listing = this._cachedBrowse[path] || await FilePicker.browse("data", path); - if (listing.target !== path) return false; - this._cachedBrowse[path] = listing; + listing = this._cachedBrowse[path]; + if (listing == undefined) { + this._cachedBrowse[path] = listing = await this._getFilePickerFiles(path); + } + } else { - listing = this._cachedBrowseNoExt[path] || await FilePicker.browse("data", path, {extensions: [""]}); - if (listing.target !== path) return false; - this._cachedBrowseNoExt[path] = listing; + listing = this._cachedBrowseNoExt[path]; + if (listing == undefined) { + this._cachedBrowseNoExt[path] = listing = await this._getFilePickerFiles(path, {extensions: [""]}); + } } - return listing.files.includes(path ? `${path}/${filename}` : filename); + const targetPath = path ? `${path}/${filename}` : filename; + return listing.files.includes(targetPath); } async _createDir(path, directory) { - const ret = await FilePicker.createDirectory("data", path ? `${path}/${directory}` : directory); + let ret; + try { + ret = await FilePicker.createDirectory("data", path ? `${path}/${directory}` : directory); + } catch(error) { + const message = error.message ?? error; + // Ignore the error if the folder already exists, throw all others + if (!message.includes("EEXIST:")) { + throw error; + } + } this._cachedBrowse[path] = null; this._cachedBrowseNoExt[path] = null; return ret; @@ -1098,7 +1181,7 @@ class WorldMigration { return fetch(getRoute("setup"), { method: "POST", headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({action: "editWorld", name: this.name, ...data}) + body: JSON.stringify({action: "editWorld", id: this.name, name: this.name, ...data}) }).then(r => r.json()); } // Creates directories in the path for an asset file but safely renames a folder if a file with @@ -1134,8 +1217,8 @@ class WorldMigration { } async migrateWorld() { - const manifest = duplicate(game.world.data || game.world); - this.name = manifest.name; + const manifest = duplicate(isNewerVersion(game.version, "10") ? game.world : game.world.data); + this.name = manifest.id || manifest.name; // v10 vs 0.9.x const background = await this._migrateEntityPath(manifest.background); const description = await this.migrator._migrateHTML(manifest.description); @@ -1168,10 +1251,20 @@ class WorldMigration { for (let pack of game.packs) { const dbType = pack.documentName || pack.entity; // 0.8.x vs 0.7.x if (!dbType) continue; + // If the package type is either system or module, then presumably we need not migrate it. Only world dcompendiums need to be addressed + if (pack.metadata.packageType !== undefined && pack.metadata.packageType !== "world") continue; + this.app.updateProgress({current: idx++, name: pack.title}); try { + const oldLock = pack.locked; + if (oldLock) { + await pack.configure({ locked: false }); + } const entities = await (pack.getDocuments || pack.getEntities).call(pack); await this._migrateDatabase(entities, dbType, {pack: pack.collection}); + if (oldLock) { + await pack.configure({ locked: true }); + } } catch (err) { console.error(`Error migrating ${dbType}s compendium : `, err); } @@ -1188,12 +1281,13 @@ class WorldMigration { async _migrateDatabase(entities, type, options) { const migrated = await EntityMigration.mapAsync(entities, async (entity) => { try { - const dataJson = JSON.stringify(entity.data); + const original = isNewerVersion(game.version, "10") ? entity : entity.data + const dataJson = JSON.stringify(original); const migrated = await this._migrateEntity(type, JSON.parse(dataJson)); // Instead of trying to recursively compare the entity before/after migration // we just compare their string representation if (JSON.stringify(migrated) === dataJson) return null; - const diff = diffObject(entity.data, migrated); + const diff = diffObject(original, migrated); diff._id = migrated._id; return diff; } catch (err) { @@ -1362,10 +1456,12 @@ class EntityMigration { } if (data.effects) data.effects = await this.constructor.mapAsync(data.effects, effect => this._migrateEntityPath(effect)); - if (data.actor) { - data.actor = await this.migrateEntity('actors', data.actor); + if (data.delta) { + data.delta = await this.migrateEntity('actors', data.delta); } else if (data.actorData) { data.actorData = await this.migrateEntity('actors', data.actorData); + } else if (data.actor) { + data.actor = await this.migrateEntity('actors', data.actor); } break; case 'JournalEntry': @@ -1403,6 +1499,12 @@ class EntityMigration { case 'macros': case 'RollTableResult': data.img = await this._migrateEntityPath(data.img); + /* + Technically a macro could have src/img/href embedded in the command + if (data.command) { + data.command = await this._migrateHTML(data.command); + } + */ break; case 'chat': case 'Message': diff --git a/styles/forgevtt.css b/styles/forgevtt.css index 59fb06d..75bd2fe 100644 --- a/styles/forgevtt.css +++ b/styles/forgevtt.css @@ -81,6 +81,10 @@ button img.forge-vtt-icon { #forgevtt-asset-sync div.options { margin-top: 10px; } + +#forgevtt-asset-sync div.options .form-group label span { + vertical-align: top; +} @keyframes spin { to { -webkit-transform: rotate(360deg); } diff --git a/templates/asset-sync-form.hbs b/templates/asset-sync-form.hbs index 9879fc7..4d0e269 100644 --- a/templates/asset-sync-form.hbs +++ b/templates/asset-sync-form.hbs @@ -42,8 +42,9 @@ + this.checked}} {{#if this.disabled}}disabled{{/if}} {{#if ../isSyncing}}disabled{{/if}} /> + {{this.label}} + {{/each}}