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

Use okhttp for all http connections

This commit is contained in:
0xboobface 2018-07-11 21:25:50 +02:00
parent 98cefacae3
commit 06d1630375
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/ctbrec/recorder/download/HlsDownload.java
View File

@ -38,6 +38,8 @@ import ctbrec.HttpClient;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.recorder.Chaturbate; import ctbrec.recorder.Chaturbate;
import ctbrec.recorder.StreamInfo; import ctbrec.recorder.StreamInfo;
import okhttp3.Request;
import okhttp3.Response;
public class HlsDownload implements Download { public class HlsDownload implements Download {
@ -82,7 +84,7 @@ public class HlsDownload implements Download {
for (int i = nextSegment; i < lsp.seq; i++) { for (int i = nextSegment; i < lsp.seq; i++) {
URL segmentUrl = new URL(first.replaceAll(Integer.toString(seq), Integer.toString(i))); URL segmentUrl = new URL(first.replaceAll(Integer.toString(seq), Integer.toString(i)));
LOG.debug("Reloading segment {} for model {}", i, model.getName()); LOG.debug("Reloading segment {} for model {}", i, model.getName());
threadPool.submit(new SegmentDownload(segmentUrl, downloadDir)); threadPool.submit(new SegmentDownload(segmentUrl, downloadDir, client));
} }
// TODO switch to a lower bitrate/resolution ?!? // TODO switch to a lower bitrate/resolution ?!?
} }
@ -92,7 +94,7 @@ public class HlsDownload implements Download {
skip--; skip--;
} else { } else {
URL segmentUrl = new URL(segment); URL segmentUrl = new URL(segment);
threadPool.submit(new SegmentDownload(segmentUrl, downloadDir)); threadPool.submit(new SegmentDownload(segmentUrl, downloadDir, client));
//new SegmentDownload(segment, downloadDir).call(); //new SegmentDownload(segment, downloadDir).call();
} }
} }
@ -142,7 +144,9 @@ public class HlsDownload implements Download {
private LiveStreamingPlaylist parseSegments(String segments) throws IOException, ParseException, PlaylistException { private LiveStreamingPlaylist parseSegments(String segments) throws IOException, ParseException, PlaylistException {
URL segmentsUrl = new URL(segments); URL segmentsUrl = new URL(segments);
InputStream inputStream = segmentsUrl.openStream(); Request request = new Request.Builder().url(segmentsUrl).addHeader("connection", "keep-alive").build();
Response response = client.execute(request);
InputStream inputStream = response.body().byteStream();
PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8); PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8);
Playlist playlist = parser.parse(); Playlist playlist = parser.parse();
if(playlist.hasMediaPlaylist()) { if(playlist.hasMediaPlaylist()) {
@ -168,8 +172,10 @@ public class HlsDownload implements Download {
} }
private String parseMaster(String url, int streamUrlIndex) throws IOException, ParseException, PlaylistException { private String parseMaster(String url, int streamUrlIndex) throws IOException, ParseException, PlaylistException {
URL masterUrl = new URL(url); Request request = new Request.Builder().url(url).addHeader("connection", "keep-alive").build();
InputStream inputStream = masterUrl.openStream(); Response response = client.execute(request);
InputStream inputStream = response.body().byteStream();
PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8); PlaylistParser parser = new PlaylistParser(inputStream, Format.EXT_M3U, Encoding.UTF_8);
Playlist playlist = parser.parse(); Playlist playlist = parser.parse();
if(playlist.hasMasterPlaylist()) { if(playlist.hasMasterPlaylist()) {
@ -182,9 +188,9 @@ public class HlsDownload implements Download {
} }
String uri = bestQuality.getUri(); String uri = bestQuality.getUri();
if(!uri.startsWith("http")) { if(!uri.startsWith("http")) {
String _masterUrl = masterUrl.toString(); String masterUrl = url;
_masterUrl = _masterUrl.substring(0, _masterUrl.lastIndexOf('/') + 1); String baseUri = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1);
String segmentUri = _masterUrl + uri; String segmentUri = baseUri + uri;
return segmentUri; return segmentUri;
} }
} }
@ -202,9 +208,11 @@ public class HlsDownload implements Download {
private static class SegmentDownload implements Callable<Boolean> { private static class SegmentDownload implements Callable<Boolean> {
private URL url; private URL url;
private Path file; private Path file;
private HttpClient client;
public SegmentDownload(URL url, Path dir) { public SegmentDownload(URL url, Path dir, HttpClient client) {
this.url = url; this.url = url;
this.client = client;
File path = new File(url.getPath()); File path = new File(url.getPath());
file = FileSystems.getDefault().getPath(dir.toString(), path.getName()); file = FileSystems.getDefault().getPath(dir.toString(), path.getName());
} }
@ -213,8 +221,11 @@ public class HlsDownload implements Download {
public Boolean call() throws Exception { public Boolean call() throws Exception {
LOG.trace("Downloading segment to " + file); LOG.trace("Downloading segment to " + file);
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
try( FileOutputStream fos = new FileOutputStream(file.toFile()); Request request = new Request.Builder().url(url).addHeader("connection", "keep-alive").build();
InputStream in = url.openStream()) Response response = client.execute(request);
try (
FileOutputStream fos = new FileOutputStream(file.toFile());
InputStream in = response.body().byteStream())
{ {
byte[] b = new byte[1024 * 100]; byte[] b = new byte[1024 * 100];
int length = -1; int length = -1;

2
src/main/resources/logback.xml
View File

@ -29,7 +29,7 @@
</appender> </appender>
--> -->
<root level="trace"> <root level="debug">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
<appender-ref ref="FILE" /> <appender-ref ref="FILE" />
<!-- <!--