From 264c01facbff199aab83fd723dcb166a3199eba3 Mon Sep 17 00:00:00 2001
From: Stefan Schallerl <stefan@schallerl.com>
Date: Thu, 13 Feb 2025 23:50:34 +0100
Subject: [PATCH] Fixes package mixup and adds runnable jar manifest.

---
 app/build.gradle.kts                            | 9 +++++++--
 app/src/main/kotlin/net/h34t/filemure/Server.kt | 4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index d477e1b..adc0a4b 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -24,6 +24,12 @@ application {
     mainClass = "net.h34t.filemure.ServerKt"
 }
 
+tasks.withType<Jar> {
+    manifest {
+        attributes["Main-Class"] = application.mainClass
+    }
+}
+
 sourceSets {
     main {
         kotlin {
@@ -70,8 +76,7 @@ sqldelight {
 
 // nixpacks looks in build/libs
 tasks.register<Copy>("copyJarToRoot") {
-    println("copy bopy")
-    from("build/libs")
+    from("./build/libs")
     into("../build/libs")
     include("*.jar")
     dependsOn(":app:build")
diff --git a/app/src/main/kotlin/net/h34t/filemure/Server.kt b/app/src/main/kotlin/net/h34t/filemure/Server.kt
index 289bf3c..08c92fd 100644
--- a/app/src/main/kotlin/net/h34t/filemure/Server.kt
+++ b/app/src/main/kotlin/net/h34t/filemure/Server.kt
@@ -1,9 +1,7 @@
-package net.h34t.app.net.h34t.filemure
+package net.h34t.filemure
 
 import io.javalin.Javalin
 import io.javalin.http.staticfiles.Location
-import net.h34t.filemure.ContentExtractor
-import net.h34t.filemure.FilemureApp
 import net.h34t.filemure.classification.AIClassifier
 import net.h34t.filemure.repository.SqliteRepository
 import org.eclipse.jetty.http.HttpCookie