diff --git a/server/src/main/java/ctbrec/recorder/server/HlsServlet.java b/server/src/main/java/ctbrec/recorder/server/HlsServlet.java index 51f89745..af04c95b 100644 --- a/server/src/main/java/ctbrec/recorder/server/HlsServlet.java +++ b/server/src/main/java/ctbrec/recorder/server/HlsServlet.java @@ -3,7 +3,6 @@ import static javax.servlet.http.HttpServletResponse.*; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; @@ -15,9 +14,6 @@ import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.iheartradio.m3u8.ParseException; -import com.iheartradio.m3u8.PlaylistException; - import ctbrec.Config; public class HlsServlet extends AbstractCtbrecServlet { @@ -54,12 +50,7 @@ public class HlsServlet extends AbstractCtbrecServlet { return; } - try { - 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); - } + servePlaylist(req, resp, requestedFile); } else { if (requestedFile.exists()) { serveSegment(req, resp, requestedFile); @@ -77,15 +68,15 @@ public class HlsServlet extends AbstractCtbrecServlet { 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"); } - 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"); } - 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()); resp.setStatus(200); resp.setContentLength((int) file.length());