Skip to content

Commit 5a6440f

Browse files
committed
Server: More fixes!
1 parent 46389a8 commit 5a6440f

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

server/src/main/java/xyz/e3ndr/athena/service/special/InternalRoutes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
class InternalRoutes implements HttpProvider {
1010
private MediaStreamRoutes streamRoutes = new MediaStreamRoutes();
1111

12-
@HttpEndpoint(uri = "/_internal/media/:mediaId/stream")
12+
@HttpEndpoint(uri = "/_internal/media/:mediaId/stream/raw")
1313
public HttpResponse onStreamRAW(SoraHttpSession session) {
1414
return this.streamRoutes.onStreamRAW(session);
1515
}

server/src/main/java/xyz/e3ndr/athena/service/special/WiiMCRoutes.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package xyz.e3ndr.athena.service.special;
22

3+
import java.util.LinkedList;
34
import java.util.List;
45

56
import co.casterlabs.rhs.protocol.StandardHttpStatus;
@@ -40,24 +41,20 @@ public HttpResponse onSearch(SoraHttpSession session) {
4041
}
4142

4243
private static String generatePlaylistForMedia(String host, List<Media> mediaList) {
43-
StringBuilder playlistResponse = new StringBuilder();
44-
playlistResponse.append("[Playlist]\r\n");
44+
List<String> playlistResponse = new LinkedList<>();
45+
playlistResponse.add("#EXTM3U");
4546

46-
int idx = 1;
4747
for (Media media : mediaList) {
4848
String url = String.format(
49-
"http://%s/_internal/media/%s/stream/raw?quality=SD&format=MKV&videoCodec=H264&audioCodec=AAC",
49+
"http://%s/_internal/media/%s/stream/raw?quality=SD&format=MKV&videoCodec=H264_BASELINE&audioCodec=AAC&subtitleCodec=ASS",
5050
host, media.getId()
5151
);
5252

53-
playlistResponse.append(String.format("File%d=%s\r\n", idx, url));
54-
playlistResponse.append(String.format("Title%d=%s\r\n", idx, media.toString()));
55-
playlistResponse.append(String.format("Length%d=0\r\n", idx));
56-
playlistResponse.append("\r\n");
57-
idx++;
53+
playlistResponse.add(String.format("#EXTINF:-1=\"%s\",%s", media.getFiles().getImages().getPosterUrl(), media.toString()));
54+
playlistResponse.add(url);
5855
}
5956

60-
return playlistResponse.toString();
57+
return String.join("\r\n", playlistResponse);
6158
}
6259

6360
}

server/src/main/java/xyz/e3ndr/athena/types/SubtitleCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public enum SubtitleCodec {
88

99
// @formatter:off
1010
WEBVTT ("webvtt"),
11-
STR ("srt"),
11+
SRT ("srt"),
1212
ASS ("ass"),
1313
// @formatter:on
1414
;

0 commit comments

Comments
 (0)