Skip to content

Commit

Permalink
Batch of fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@cswendrowski
cswendrowski committed May 5, 2023
1 parent c76396e commit db69460
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 18 deletions.
4 changes: 2 additions & 2 deletions commands/configuration.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function getCommand() {
yargs.positional("action", {
describe: "The action to perform",
type: "string",
choices: ["get", "set", "path"]
choices: ["get", "set", "path", "view"]
})
.positional("key", {
describe: "The configuration key",
Expand Down Expand Up @@ -55,7 +55,7 @@ export function getCommand() {

const dataPath = Config.instance.get("dataPath");
if ( !dataPath ) {
console.error("The data path is not set. Use `configure set dataPath <path>` to set it. Data paths look like `C:/Users/Example/AppData/Local/FoundryVTT/Data`");
console.error("The data path is not set. Use `configure set dataPath <path>` to set it. Data paths look like `C:/Users/Example/AppData/Local/FoundryVTT`");
}

// If both are set, configuration is complete
Expand Down
69 changes: 53 additions & 16 deletions commands/package.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,17 @@ export function getCommand() {

/* -------------------------------------------- */

/**
* Replace all non-alphanumeric characters with an underscore in a filename
* @param {string} filename The filename to sanitize
* @returns {string} The sanitized filename
*/
function getSafeFilename(filename) {
return filename.replace(/[^a-zA-Z0-9]/g, '_');
}

/* -------------------------------------------- */

/**
* Discover the list of all Packages in the dataPath
* @param {Object} argv The command line arguments
Expand All @@ -188,9 +199,9 @@ export function getCommand() {
return;
}

const modulesDir = normalizePath(`${dataPath}/modules`);
const systemsDir = normalizePath(`${dataPath}/systems`);
const worldsDir = normalizePath(`${dataPath}/worlds`);
const modulesDir = normalizePath(`${dataPath}/Data/modules`);
const systemsDir = normalizePath(`${dataPath}/Data/systems`);
const worldsDir = normalizePath(`${dataPath}/Data/worlds`);

const game = {
modules: new Map(),
Expand Down Expand Up @@ -307,15 +318,16 @@ export function getCommand() {
return;
}

const packDir = normalizePath(argv.inputDirectory ?? `${dataPath}/${typeDir}/${currentPackageId}/packs/${compendiumName}`);
const outputDir = normalizePath(argv.outputDirectory ?? `${dataPath}/${typeDir}/${currentPackageId}/packs/${compendiumName}/_source`);
let packDir = normalizePath(argv.inputDirectory ?? `${dataPath}/Data/${typeDir}/${currentPackageId}/packs`);
if ( dbMode === "classic-level" ) packDir += `/${compendiumName}`;
const outputDir = normalizePath(argv.outputDirectory ?? `${packDir}/_source`);

if ( isFileLocked(packDir + "/LOCK") ) {
if ( (dbMode === "classic-level") && isFileLocked( packDir + "/LOCK") ) {
console.error(chalk.red(`The pack "${chalk.blue(packDir)}" is currently in use by Foundry VTT. Please close Foundry VTT and try again.`));
return;
}

console.log(`[${dbMode}] Writing pack "${chalk.blue(packDir)}" to "${chalk.blue(outputDir)}"`);
console.log(`[${dbMode}] Writing pack ${chalk.blue(compendiumName)} from "${chalk.blue(packDir)}" to "${chalk.blue(outputDir)}"`);

try {
if ( dbMode === "nedb" ) {
Expand Down Expand Up @@ -343,23 +355,47 @@ export function getCommand() {
*/
async function _unpackNedb(packDir, outputDir, argv, compendiumName) {
// Load the directory as a Nedb
const db = Datastore.create(`${packDir}/${compendiumName}.db`);
const db = new Datastore({
filename: `${packDir}/${compendiumName}.db`,
autoload: true
});

// Iterate over all entries in the db, writing them as individual YAML files
if (!fs.existsSync(outputDir)) {
fs.mkdirSync(outputDir, {recursive: true});
}

// Load package manifests
let documentType = "Unknown";

const knownWorldTypes = [ "actors", "cards", "combats", "drawings", "fog", "folders", "items",
"journal", "macros", "messages", "playlists", "scenes", "tables" ];

if ( knownWorldTypes.includes(compendiumName) ) {
documentType = compendiumName;
}
else {
const game = discoverPackageDirectory(argv);
// Get all packs from world, system, and modules
const packs = [...game.modules, ...game.systems, ...game.worlds].map(p => p.packs).flat();
// Find the pack with the matching name
const pack = packs.find(p => p.name === compendiumName);
if ( pack ) {
documentType = pack.type ?? pack.entity;
}
}

const docs = await db.find({});
for (const doc of docs) {
const name = doc.name ? `${doc.name.toLowerCase().replaceAll(" ", "_")}_${doc._id}` : doc._id;
doc._key = `!${documentType}!${doc._id}`;
let fileName;
if ( argv.yaml ) {
fileName = `${outputDir}/${name}.yml`;
fileName = getSafeFilename(`${outputDir}/${name}.yml`);
fs.writeFileSync(fileName, yaml.dump(doc));
}
else {
fileName = `${outputDir}/${name}.json`;
fileName = getSafeFilename(`${outputDir}/${name}.json`);
fs.writeFileSync(fileName, JSON.stringify(doc, null, 2));
}
console.log(`Wrote ${chalk.blue(fileName)}`);
Expand Down Expand Up @@ -390,11 +426,11 @@ export function getCommand() {
value._key = key;
let fileName;
if ( argv.yaml ) {
fileName = `${outputDir}/${name}.yml`;
fileName = getSafeFilename(`${outputDir}/${name}.yml`);
fs.writeFileSync(fileName, yaml.dump(value));
}
else {
fileName = `${outputDir}/${name}.json`;
fileName = getSafeFilename(`${outputDir}/${name}.json`);
fs.writeFileSync(fileName, JSON.stringify(value, null, 2));
}
console.log(`Wrote ${chalk.blue(fileName)}`);
Expand Down Expand Up @@ -434,15 +470,16 @@ export function getCommand() {
console.error(chalk.red(`No dataPath configured. Call ${chalk.yellow(`configure set dataPath <path>`)} first.`));
return;
}
const packDir = normalizePath(argv.outputDirectory ?? `${dataPath}/${typeDir}/${currentPackageId}/packs/${compendiumName}`);
const inputDir = normalizePath(argv.inputDirectory ?? `${dataPath}/${typeDir}/${currentPackageId}/packs/${compendiumName}/_source`);
let packDir = normalizePath(argv.outputDirectory ?? `${dataPath}/Data/${typeDir}/${currentPackageId}/packs`);
if ( dbMode === "classic-level" ) packDir += `/${compendiumName}`;
const inputDir = normalizePath(argv.inputDirectory ?? `${packDir}/_source`);

if ( isFileLocked(packDir + "/LOCK") ) {
if ( (dbMode === "classic-level") && isFileLocked( packDir + "/LOCK") ) {
console.error(chalk.red(`The pack "${chalk.blue(packDir)}" is currently in use by Foundry VTT. Please close Foundry VTT and try again.`));
return;
}

console.log(`[${dbMode}] Packing "${chalk.blue(inputDir)}" into pack "${chalk.blue(packDir)}"`);
console.log(`[${dbMode}] Packing ${chalk.blue(compendiumName)} from "${chalk.blue(inputDir)}" into "${chalk.blue(packDir)}"`);

try {
if ( dbMode === "nedb" ) {
Expand Down

0 comments on commit db69460

Please sign in to comment.