Merge branch 'main' into develop

v0.1.6
Fix bug where card db would try to load non-images to the database
2023-10-21 17:50:11 +01:00 · 2023-10-21 17:49:57 +01:00 · 2023-10-21 17:47:14 +01:00
3 changed files with 5 additions and 5 deletions
--- a/cards.db
+++ b/cards.db
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "card-drop",
-  "version": "0.1.5",
+  "version": "0.1.6",
  "main": "./dist/bot.js",
  "typings": "./dist",
  "scripts": {
--- a/src/Functions/CardSetupFunction.ts
+++ b/src/Functions/CardSetupFunction.ts
@ -59,7 +59,7 @@ export default class CardSetupFunction {
            const cardDirLegendary = legendaryExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'LEGENDARY')) : [];
            const cardDirSilver = silverExists ? readdirSync(path.join(process.cwd(), 'cards', series.Path, 'SILVER')) : [];

-            for (let file of cardDirBronze) {
+            for (let file of cardDirBronze.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                const filePart = file.split('.');

                const cardId = filePart[0];
@ -70,7 +70,7 @@ export default class CardSetupFunction {
                cardsToSave.push(card);
            }

-            for (let file of cardDirGold) {
+            for (let file of cardDirGold.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                const filePart = file.split('.');

                const cardId = filePart[0];
@ -81,7 +81,7 @@ export default class CardSetupFunction {
                cardsToSave.push(card);
            }

-            for (let file of cardDirLegendary) {
+            for (let file of cardDirLegendary.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                const filePart = file.split('.');

                const cardId = filePart[0];
@ -92,7 +92,7 @@ export default class CardSetupFunction {
                cardsToSave.push(card);
            }

-            for (let file of cardDirSilver) {
+            for (let file of cardDirSilver.filter(x => !x.startsWith('.') && (x.endsWith('.png') || x.endsWith('.jpg') || x.endsWith('.gif')))) {
                const filePart = file.split('.');

                const cardId = filePart[0];
Author	SHA1	Message	Date
Ethan Lane	b1aab93fad	Merge branch 'main' into develop Some checks failed continuous-integration/drone/push Build is failing Details	2023-10-21 17:50:11 +01:00
Ethan Lane	a8062f20ae	v0.1.6 All checks were successful continuous-integration/drone/push Build is passing Details	2023-10-21 17:49:57 +01:00
Ethan Lane	7b73c66a3c	Fix bug where card db would try to load non-images to the database All checks were successful continuous-integration/drone/push Build is passing Details	2023-10-21 17:47:14 +01:00