use DiscordFilePath to represent CDN info

4 files changed, 18 insertions, 11 deletions

diff --git a/src/main/java/com/pinapelz/Database.java b/src/main/java/com/pinapelz/Database.java
index b52b45e..e43212d 100644
--- a/src/main/java/com/pinapelz/Database.java
+++ b/src/main/java/com/pinapelz/Database.java
@@ -215,7 +215,6 @@ public class Database {
     }
 
     public boolean deleteDirectory(int directoryId) throws SQLException {
-        // Check if directory has files
         String checkSql = """
         SELECT COUNT(*) as file_count
         FROM files
diff --git a/src/main/java/com/pinapelz/DiscordFilePath.java b/src/main/java/com/pinapelz/DiscordFilePath.java
new file mode 100644
index 0000000..1d2a689
--- /dev/null
+++ b/src/main/java/com/pinapelz/DiscordFilePath.java
@@ -0,0 +1,7 @@
+package com.pinapelz;
+
+public class DiscordFilePath{
+    public long channelId;
+    public long messageId;
+    public String fileName;
+}
diff --git a/src/main/java/com/pinapelz/FileSystem.java b/src/main/java/com/pinapelz/FileSystem.java
index d073691..297ca13 100644
--- a/src/main/java/com/pinapelz/FileSystem.java
+++ b/src/main/java/com/pinapelz/FileSystem.java
@@ -5,14 +5,20 @@ import net.dv8tion.jda.api.entities.Message;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+
 public class FileSystem {
     private Database database;
     public FileSystem(String dbHost, String dbUser, String dbPass, String dbName){
         database = new Database(dbHost, dbUser, dbPass, dbName);
     }
 
-    public String[] getFileById(int fileId){
-        return database.getFileById(fileId);
+    public DiscordFilePath getFileById(int fileId){
+        String[] rawDiscordFilePath = database.getFileById(fileId);
+        DiscordFilePath discPath = new DiscordFilePath();
+        discPath.channelId = Long.parseLong(rawDiscordFilePath[0]);
+        discPath.messageId = Long.parseLong(rawDiscordFilePath[1]);
+        discPath.fileName = rawDiscordFilePath[3];
+        return discPath;
     }
 
     public void createNewFile(String channelId, String messageId, int directoryId, String description, Message.Attachment attachment){
@@ -26,16 +32,11 @@ public class FileSystem {
         }
     }
 
-    // Backward compatibility - defaults to root directory (ID 1)
-    public void createNewFile(String channelId, String messageId, String description, Message.Attachment attachment){
-        createNewFile(channelId, messageId, 1, description, attachment);
-    }
     public ResultSet getFilesByDirectoryIdFiltered(int directoryId, String search, String mimeTypeFilter, String sortBy) {
         return database.getFilesByDirectoryId(directoryId, search, mimeTypeFilter, sortBy);
     }
 
     public int findOrCreateDirectory(String path) throws SQLException {
-        // Try to find existing directory
         ResultSet rs = getAllDirectories();
         while (rs.next()) {
             if (path.equals(rs.getString("path"))) {
@@ -46,7 +47,6 @@ public class FileSystem {
         }
         rs.close();
 
-        // Create new directory if not found
         return createDirectory(path);
     }
 
diff --git a/src/main/java/com/pinapelz/frontend/App.kt b/src/main/java/com/pinapelz/frontend/App.kt
index 66b19a4..26ce243 100644
--- a/src/main/java/com/pinapelz/frontend/App.kt
+++ b/src/main/java/com/pinapelz/frontend/App.kt
@@ -202,8 +202,9 @@ fun startFrontend(retriever: Retriever, fileSystem: FileSystem) {
     app.get("/fetch") { ctx ->
         val fileId = ctx.queryParam("fileId")
         val fileMetadata = fileSystem.getFileById(Integer.parseInt(fileId));
-        print(fileMetadata[1])
-        ctx.redirect(retriever.getFileUrl(fileMetadata[0], fileMetadata[1], fileMetadata[2]));
+        print("Retrieving: " + fileMetadata.fileName)
+        ctx.redirect(retriever.getFileUrl(fileMetadata.channelId.toString(),
+            fileMetadata.messageId.toString(), fileMetadata.fileName));
     }
     app.start(7070)
 }