External/card-drop
4
0
Fork 0
Code Issues 44 Pull requests 7 Projects 1 Releases 28 Packages Wiki Activity Actions

Update card metadata logic so that the card directory can be put anywhere
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Ethan Lane 2023-12-26 14:56:51 +00:00
parent 09bf821be9
commit 44b423f889
8 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.dev.env
View file

@ -16,6 +16,8 @@ BOT_ENV=4
ABOUT_FUNDING= ABOUT_FUNDING=
ABOUT_REPO= ABOUT_REPO=
DATA_DIR=
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3301 DB_PORT=3301
DB_NAME=carddrop DB_NAME=carddrop

2
.prod.env
View file

@ -16,6 +16,8 @@ BOT_ENV=1
ABOUT_FUNDING= ABOUT_FUNDING=
ABOUT_REPO= ABOUT_REPO=
DATA_DIR=/home/vylpes/appdata/card-drop/card-drop_prod
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3321 DB_PORT=3321
DB_NAME=carddrop DB_NAME=carddrop

2
.stage.env
View file

@ -16,6 +16,8 @@ BOT_ENV=2
ABOUT_FUNDING= ABOUT_FUNDING=
ABOUT_REPO= ABOUT_REPO=
DATA_DIR=/home/vylpes/appdata/card-drop/card-drop_stage
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3311 DB_PORT=3311
DB_NAME=carddrop DB_NAME=carddrop

2
src/Functions/CardMetadataFunction.ts
View file

@ -26,7 +26,7 @@ export default class CardMetadataFunction {
private static async FindMetadataJSONs(): Promise<SeriesMetadata[]> { private static async FindMetadataJSONs(): Promise<SeriesMetadata[]> {
const res: SeriesMetadata[] = []; const res: SeriesMetadata[] = [];
const seriesJSONs = await glob(path.join(process.cwd(), 'cards', '/**/*.json')); const seriesJSONs = await glob(path.join(process.env.DATA_DIR!, 'cards', '/**/*.json'));
for (let jsonPath of seriesJSONs) { for (let jsonPath of seriesJSONs) {
console.log(`Reading file ${jsonPath}`); console.log(`Reading file ${jsonPath}`);

3
src/bot.ts
View file

@ -14,6 +14,7 @@ const requiredConfigs: string[] = [
"BOT_OWNERID", "BOT_OWNERID",
"BOT_CLIENTID", "BOT_CLIENTID",
"BOT_ENV", "BOT_ENV",
"DATA_DIR",
"DB_HOST", "DB_HOST",
"DB_PORT", "DB_PORT",
"DB_AUTH_USER", "DB_AUTH_USER",
@ -39,7 +40,7 @@ Registry.RegisterCommands();
Registry.RegisterEvents(); Registry.RegisterEvents();
Registry.RegisterButtonEvents(); Registry.RegisterButtonEvents();
if (!existsSync(`${process.cwd()}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') { if (!existsSync(`${process.env.DATA_DIR}/cards`) && process.env.GDRIVESYNC_AUTO && process.env.GDRIVESYNC_AUTO == 'true') {
console.log("Card directory not found, syncing..."); console.log("Card directory not found, syncing...");
CoreClient.AllowDrops = false; CoreClient.AllowDrops = false;

2
src/buttonEvents/Reroll.ts
View file

@ -31,7 +31,7 @@ export default class Reroll extends ButtonEvent {
let image: Buffer; let image: Buffer;
const imageFileName = randomCard.card.path.split("/").pop()!; const imageFileName = randomCard.card.path.split("/").pop()!;
image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path)); image = readFileSync(path.join(process.env.DATA_DIR!, 'cards', randomCard.card.path));
await interaction.deferReply(); await interaction.deferReply();

2
src/commands/drop.ts
View file

@ -39,7 +39,7 @@ export default class Drop extends Command {
let image: Buffer; let image: Buffer;
const imageFileName = randomCard.card.path.split("/").pop()!; const imageFileName = randomCard.card.path.split("/").pop()!;
image = readFileSync(path.join(process.cwd(), 'cards', randomCard.card.path)); image = readFileSync(path.join(process.env.DATA_DIR!, 'cards', randomCard.card.path));
await interaction.deferReply(); await interaction.deferReply();

2
src/commands/gdrivesync.ts
View file

@ -29,7 +29,7 @@ export default class Gdrivesync extends Command {
CoreClient.AllowDrops = false; CoreClient.AllowDrops = false;
exec(`rclone sync card-drop-gdrive: ${process.cwd()}/cards`, async (error: ExecException | null) => { exec(`rclone sync card-drop-gdrive: ${process.env.DATA_DIR}/cards`, async (error: ExecException | null) => {
if (error) { if (error) {
await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`); await interaction.editReply(`Error while running sync command. Safe Mode has been activated. Code: ${error.code}`);
await Config.SetValue('safemode', 'true'); await Config.SetValue('safemode', 'true');