reorganize catculator

Pixaurora · Sep 28, 2024 · 62c84cb · 62c84cb
1 parent 8f0a6ef
commit 62c84cb
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/...tculator/impl/error/LibraryLoadError.java → ...atculator/api/error/LibraryLoadError.java b/...tculator/impl/error/LibraryLoadError.java → ...atculator/api/error/LibraryLoadError.java
@@ -1,4 +1,4 @@
-package net.pixaurora.catculator.impl.error;
+package net.pixaurora.catculator.api.error;
 
 public class LibraryLoadError extends Error {
     public LibraryLoadError(String message) {

diff --git a/...a/catculator/impl/http/server/Server.java → ...pixaurora/catculator/api/http/Server.java b/...a/catculator/impl/http/server/Server.java → ...pixaurora/catculator/api/http/Server.java
@@ -1,8 +1,10 @@
-package net.pixaurora.catculator.impl.http.server;
+package net.pixaurora.catculator.api.http;
 
 import java.io.Closeable;
 import java.io.IOException;
 
+import net.pixaurora.catculator.impl.http.ServerImpl;
+
 public interface Server extends Closeable {
     public static Server create() {
         return new ServerImpl();

diff --git a/...rora/catculator/impl/music/SoundFile.java → ...urora/catculator/api/music/SoundFile.java b/...rora/catculator/impl/music/SoundFile.java → ...urora/catculator/api/music/SoundFile.java
@@ -1,4 +1,4 @@
-package net.pixaurora.catculator.impl.music;
+package net.pixaurora.catculator.api.music;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/...tculator/impl/http/server/ServerImpl.java → ...rora/catculator/impl/http/ServerImpl.java b/...tculator/impl/http/server/ServerImpl.java → ...rora/catculator/impl/http/ServerImpl.java
@@ -1,4 +1,6 @@
-package net.pixaurora.catculator.impl.http.server;
+package net.pixaurora.catculator.impl.http;
+
+import net.pixaurora.catculator.api.http.Server;
 
 public class ServerImpl implements Server {
     private final long pointer;

diff --git a/projects/catculator/src/main/java/net/pixaurora/catculator/impl/util/NativeUtil.java b/projects/catculator/src/main/java/net/pixaurora/catculator/impl/util/NativeUtil.java
@@ -8,8 +8,8 @@
 import java.nio.file.Paths;
 import java.util.Properties;
 
+import net.pixaurora.catculator.api.error.LibraryLoadError;
 import net.pixaurora.catculator.impl.Constants;
-import net.pixaurora.catculator.impl.error.LibraryLoadError;
 
 public class NativeUtil {
     private static boolean isLoaded = false;

diff --git a/projects/catculator/src/main/rust/bridge/http/server.rs b/projects/catculator/src/main/rust/bridge/http/server.rs
@@ -37,17 +37,15 @@ fn drop<'local>(object: &JObject<'local>, env: &mut JNIEnv<'local>) -> Result<()
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl_create<'local>(
+pub extern "system" fn Java_net_pixaurora_catculator_impl_http_ServerImpl_create<'local>(
     mut _env: JNIEnv<'local>,
     _class: JClass<'local>,
 ) -> jlong {
     create()
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl_runServer0<
-    'local,
->(
+pub extern "system" fn Java_net_pixaurora_catculator_impl_http_ServerImpl_runServer0<'local>(
     mut env: JNIEnv<'local>,
     object: JObject<'local>,
 ) -> JString<'local> {
@@ -61,7 +59,7 @@ pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_catculator_impl_http_server_ServerImpl_drop<'local>(
+pub extern "system" fn Java_net_pixaurora_catculator_impl_http_ServerImpl_drop<'local>(
     mut env: JNIEnv<'local>,
     object: JObject<'local>,
 ) -> () {

diff --git a/projects/catculator/src/main/rust/bridge/sound_parsing.rs b/projects/catculator/src/main/rust/bridge/sound_parsing.rs
@@ -16,7 +16,7 @@ fn parse_duration<'local>(env: &mut JNIEnv<'local>, path: &JString<'local>) -> R
 }
 
 #[no_mangle]
-pub extern "system" fn Java_net_pixaurora_catculator_impl_music_SoundFile_parseDuration0<'local>(
+pub extern "system" fn Java_net_pixaurora_catculator_api_music_SoundFile_parseDuration0<'local>(
     mut env: JNIEnv<'local>,
     _class: JClass<'local>,
     path: JString<'local>,

diff --git a/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/EventHandling.java b/projects/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/EventHandling.java
@@ -10,7 +10,7 @@
 import java.util.function.Consumer;
 import java.util.Optional;
 
-import net.pixaurora.catculator.impl.music.SoundFile;
+import net.pixaurora.catculator.api.music.SoundFile;
 import net.pixaurora.kit_tunes.api.event.TrackEndEvent;
 import net.pixaurora.kit_tunes.api.event.TrackStartEvent;
 import net.pixaurora.kit_tunes.api.listener.MusicEventListener;

diff --git a/...s/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerSetup.java b/...s/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerSetup.java
@@ -6,7 +6,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
-import net.pixaurora.catculator.impl.http.server.Server;
+import net.pixaurora.catculator.api.http.Server;
 
 public class ScrobblerSetup<T extends Scrobbler> implements Closeable {
     private final Server server;

diff --git a/...ts/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerType.java b/...ts/kitten-heart/src/main/java/net/pixaurora/kitten_heart/impl/scrobble/ScrobblerType.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 
-import net.pixaurora.catculator.impl.http.server.Server;
+import net.pixaurora.catculator.api.http.Server;
 import net.pixaurora.kitten_heart.impl.config.dispatch.DispatchType;
 import net.pixaurora.kitten_heart.impl.error.KitTunesException;