extract file operations

soryy708 · May 27, 2023 · 132e5a8 · 132e5a8
1 parent d1ceadc
commit 132e5a8
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/src/server/discord/command/draw.ts b/src/server/discord/command/draw.ts
@@ -7,6 +7,7 @@ import {
 } from 'discord.js';
 import { DiscordCommand, DiscordCommandOption } from './interface';
 import { randomInRange } from '../../entropy';
+import { getFilesInDirectory, getSubdirectories } from '../../file';
 
 export class DrawCommand implements DiscordCommand {
     public name = 'draw';
@@ -22,12 +23,8 @@ export class DrawCommand implements DiscordCommand {
                     cardsPath,
             );
         }
-        const cardsDirectoryContents = await fs.promises.readdir(
+        const games = await getSubdirectories(
             path.join(process.cwd(), 'cards'),
-            { withFileTypes: true },
-        );
-        const games = cardsDirectoryContents.filter((dirent) =>
-            dirent.isDirectory(),
         );
         const options = [
             {
@@ -36,11 +33,11 @@ export class DrawCommand implements DiscordCommand {
                 description: 'What game are we drawing from?',
                 options: await Promise.all(
                     games.map(async (game) => {
-                        const cards = await this.getCardsOfGame(game.name);
+                        const cards = await this.getCardsOfGame(game);
                         return {
                             type: ApplicationCommandOptionType.Subcommand,
-                            name: this.directoryToCommand(game.name),
-                            description: game.name,
+                            name: this.directoryToCommand(game),
+                            description: game,
                             options: cards.map((card) => ({
                                 type: ApplicationCommandOptionType.Number,
                                 name: this.directoryToCommand(card),
@@ -66,15 +63,8 @@ export class DrawCommand implements DiscordCommand {
         }
     }
 
-    private async getCardsOfGame(game: string): Promise<string[]> {
-        const subdirectoryContents = await fs.promises.readdir(
-            path.join(process.cwd(), 'cards', game),
-            { withFileTypes: true },
-        );
-        const cardTypes = subdirectoryContents.filter((dirent) =>
-            dirent.isDirectory(),
-        );
-        return cardTypes.map((cardType) => cardType.name);
+    private getCardsOfGame(game: string): Promise<string[]> {
+        return getSubdirectories(path.join(process.cwd(), 'cards', game));
     }
 
     private directoryToCommand(directory: string): string {
@@ -108,19 +98,15 @@ export class DrawCommand implements DiscordCommand {
 
     private async getCard(game: string, type: string): Promise<string> {
         const cardsDirectory = path.join(process.cwd(), 'cards', game, type);
-        const cardsDirectoryContents = await fs.promises.readdir(
-            cardsDirectory,
-            { withFileTypes: true },
-        );
-        const images = cardsDirectoryContents.filter(
-            (dirent) =>
-                dirent.isFile() && this.fileExtensionIsImage(dirent.name),
+        const cardFiles = await getFilesInDirectory(cardsDirectory);
+        const images = cardFiles.filter((file) =>
+            this.fileExtensionIsImage(file),
         );
         if (images.length === 0) {
             return null;
         }
         const index = randomInRange(0, images.length);
-        const imageName = images[index].name;
+        const imageName = images[index];
         return path.join(cardsDirectory, imageName);
     }
 

diff --git a/src/server/file.ts b/src/server/file.ts
@@ -0,0 +1,21 @@
+import fs from 'fs';
+
+export async function getSubdirectories(directory: string): Promise<string[]> {
+    const directoryContents = await fs.promises.readdir(directory, {
+        withFileTypes: true,
+    });
+    const subdirectories = directoryContents.filter((dirent) =>
+        dirent.isDirectory(),
+    );
+    return subdirectories.map((dirent) => dirent.name);
+}
+
+export async function getFilesInDirectory(
+    directory: string,
+): Promise<string[]> {
+    const subdirectoryContents = await fs.promises.readdir(directory, {
+        withFileTypes: true,
+    });
+    const files = subdirectoryContents.filter((dirent) => dirent.isFile());
+    return files.map((dirent) => dirent.name);
+}