Server: Move this into a shared package.

e3ndr · Oct 2, 2023 · 8ea0053 · 8ea0053
1 parent b3f74fc
commit 8ea0053
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/...ndr/athena/service/http/StreamRoutes.java → ...ndr/athena/service/MediaStreamRoutes.java b/...ndr/athena/service/http/StreamRoutes.java → ...ndr/athena/service/MediaStreamRoutes.java
@@ -1,4 +1,4 @@
-package xyz.e3ndr.athena.service.http;
+package xyz.e3ndr.athena.service;
 
 import java.io.File;
 import java.io.IOException;
@@ -21,8 +21,8 @@
 import xyz.e3ndr.athena.types.VideoQuality;
 import xyz.e3ndr.athena.types.media.Media;
 
-// Shared with Web UI
-public class StreamRoutes implements HttpProvider {
+// Used by Http, Simple UI, & Special
+public class MediaStreamRoutes implements HttpProvider {
 
     private MediaSession startSession(Media media, Map<String, String> query) throws IOException {
         VideoQuality videoQuality = VideoQuality.valueOf(query.getOrDefault("quality", VideoQuality.UHD.name()).toUpperCase());

diff --git a/server/src/main/java/xyz/e3ndr/athena/service/http/AthenaHttpService.java b/server/src/main/java/xyz/e3ndr/athena/service/http/AthenaHttpService.java
@@ -9,6 +9,7 @@
 import lombok.NonNull;
 import xyz.e3ndr.athena.Athena;
 import xyz.e3ndr.athena.service.AthenaService;
+import xyz.e3ndr.athena.service.MediaStreamRoutes;
 import xyz.e3ndr.fastloggingframework.logging.FastLogger;
 import xyz.e3ndr.fastloggingframework.logging.LogLevel;
 
@@ -46,7 +47,7 @@ static class AthenaSoraAdapter extends SoraPlugin {
         public void onInit(Sora sora) {
             sora.addProvider(this, new MetaRoutes());
             sora.addProvider(this, new MediaRoutes());
-            sora.addProvider(this, new StreamRoutes());
+            sora.addProvider(this, new MediaStreamRoutes());
             sora.addProvider(this, new SessionRoutes());
             sora.addProvider(this, new IngestApiRoutes());
         }

diff --git a/server/src/main/java/xyz/e3ndr/athena/service/simple_ui/InternalRoutes.java b/server/src/main/java/xyz/e3ndr/athena/service/simple_ui/InternalRoutes.java
@@ -4,10 +4,10 @@
 import co.casterlabs.sora.api.http.HttpProvider;
 import co.casterlabs.sora.api.http.SoraHttpSession;
 import co.casterlabs.sora.api.http.annotations.HttpEndpoint;
-import xyz.e3ndr.athena.service.http.StreamRoutes;
+import xyz.e3ndr.athena.service.MediaStreamRoutes;
 
 class InternalRoutes implements HttpProvider {
-    private StreamRoutes streamRoutes = new StreamRoutes();
+    private MediaStreamRoutes streamRoutes = new MediaStreamRoutes();
 
     @HttpEndpoint(uri = "/_internal/media/:mediaId/stream")
     public HttpResponse onStreamRAW(SoraHttpSession session) {

diff --git a/server/src/main/java/xyz/e3ndr/athena/service/special/InternalRoutes.java b/server/src/main/java/xyz/e3ndr/athena/service/special/InternalRoutes.java
@@ -4,10 +4,10 @@
 import co.casterlabs.sora.api.http.HttpProvider;
 import co.casterlabs.sora.api.http.SoraHttpSession;
 import co.casterlabs.sora.api.http.annotations.HttpEndpoint;
-import xyz.e3ndr.athena.service.http.StreamRoutes;
+import xyz.e3ndr.athena.service.MediaStreamRoutes;
 
 class InternalRoutes implements HttpProvider {
-    private StreamRoutes streamRoutes = new StreamRoutes();
+    private MediaStreamRoutes streamRoutes = new MediaStreamRoutes();
 
     @HttpEndpoint(uri = "/_internal/media/:mediaId/stream")
     public HttpResponse onStreamRAW(SoraHttpSession session) {