ctbrecuser
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Remove unused exceptions in HlsServlet

This commit is contained in:
0xboobface 2019-12-17 21:14:33 +01:00
parent e734d46e9c
commit 88735d93ee
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/src/main/java/ctbrec/recorder/server/HlsServlet.java
View File

@ -3,7 +3,6 @@ import static javax.servlet.http.HttpServletResponse.*;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.security.InvalidKeyException; import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
@ -15,9 +14,6 @@ import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.iheartradio.m3u8.ParseException;
import com.iheartradio.m3u8.PlaylistException;
import ctbrec.Config; import ctbrec.Config;
public class HlsServlet extends AbstractCtbrecServlet { public class HlsServlet extends AbstractCtbrecServlet {
@ -54,12 +50,7 @@ public class HlsServlet extends AbstractCtbrecServlet {
return; return;
} }
try {
servePlaylist(req, resp, requestedFile); servePlaylist(req, resp, requestedFile);
} catch (ParseException | PlaylistException e) {
LOG.error("Error while generating playlist file", e);
throw new IOException("Couldn't generate playlist file " + requestedFile, e);
}
} else { } else {
if (requestedFile.exists()) { if (requestedFile.exists()) {
serveSegment(req, resp, requestedFile); serveSegment(req, resp, requestedFile);
@ -77,15 +68,15 @@ public class HlsServlet extends AbstractCtbrecServlet {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND); resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
} }
private void serveSegment(HttpServletRequest req, HttpServletResponse resp, File requestedFile) throws FileNotFoundException, IOException { private void serveSegment(HttpServletRequest req, HttpServletResponse resp, File requestedFile) throws IOException {
serveFile(resp, requestedFile, "application/octet-stream"); serveFile(resp, requestedFile, "application/octet-stream");
} }
private void servePlaylist(HttpServletRequest req, HttpServletResponse resp, File requestedFile) throws FileNotFoundException, IOException, ParseException, PlaylistException { private void servePlaylist(HttpServletRequest req, HttpServletResponse resp, File requestedFile) throws IOException {
serveFile(resp, requestedFile, "application/x-mpegURL"); serveFile(resp, requestedFile, "application/x-mpegURL");
} }
private void serveFile(HttpServletResponse resp, File file, String contentType) throws FileNotFoundException, IOException { private void serveFile(HttpServletResponse resp, File file, String contentType) throws IOException {
LOG.trace("Serving segment {}", file.getAbsolutePath()); LOG.trace("Serving segment {}", file.getAbsolutePath());
resp.setStatus(200); resp.setStatus(200);
resp.setContentLength((int) file.length()); resp.setContentLength((int) file.length());