dongge
/
AndroidCatVodSpider
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #55 from okcaptain/main 

goroutine video proxy
This commit is contained in:
FongMi 2023-12-13 11:26:07 +08:00 committed by GitHub
parent 9af4edfae3 88d2784d47
commit 390f76b1b7
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/github/catvod/api/AliYun.java
View File

@ -34,7 +34,7 @@ import com.github.catvod.net.OkHttp;
import com.github.catvod.net.OkResult; import com.github.catvod.net.OkResult;
import com.github.catvod.spider.Init; import com.github.catvod.spider.Init;
import com.github.catvod.spider.Proxy; import com.github.catvod.spider.Proxy;
import com.github.catvod.utils.MultiThreadedDownloader; import com.github.catvod.utils.MultiThread;
import com.github.catvod.utils.Path; import com.github.catvod.utils.Path;
import com.github.catvod.utils.ProxyVideo; import com.github.catvod.utils.ProxyVideo;
import com.github.catvod.utils.QRCode; import com.github.catvod.utils.QRCode;
@ -67,8 +67,6 @@ public class AliYun {
private final List<String> tempIds; private final List<String> tempIds;
private final ReentrantLock lock; private final ReentrantLock lock;
private final Cache cache; private final Cache cache;
private MultiThreadedDownloader downloader;
private ScheduledExecutorService service; private ScheduledExecutorService service;
private String refreshToken; private String refreshToken;
private AlertDialog dialog; private AlertDialog dialog;
@ -516,9 +514,7 @@ public class AliYun {
if (thread == 1) { if (thread == 1) {
return new Object[]{ProxyVideo.proxy(downloadUrl, headers)}; return new Object[]{ProxyVideo.proxy(downloadUrl, headers)};
} else { } else {
if (downloader != null) downloader.destory(); return new Object[]{ProxyVideo.proxy(MultiThread.go(downloadUrl, thread), headers)};
downloader = new MultiThreadedDownloader(downloadUrl, headers, thread);
return new Object[]{downloader.start()};
} }
} }

4
app/src/main/java/com/github/catvod/utils/MultiThread.java
View File

@ -12,6 +12,10 @@ public class MultiThread {
return String.format(Proxy.getUrl() + "?do=multi&url=%s&thread=%d", URLEncoder.encode(url), thread); return String.format(Proxy.getUrl() + "?do=multi&url=%s&thread=%d", URLEncoder.encode(url), thread);
} }
public static String go(String url, int thread) {
return String.format("http://127.0.0.1:7777/?url=%s&thread=%d", URLEncoder.encode(url), thread);
}
public static Object[] proxy(Map<String, String> params) throws Exception { public static Object[] proxy(Map<String, String> params) throws Exception {
String url = params.get("url"); String url = params.get("url");
int thread = Integer.parseInt(params.get("thread")); int thread = Integer.parseInt(params.get("thread"));

4
app/src/main/java/com/github/catvod/utils/ProxyVideo.java
View File

@ -23,6 +23,8 @@ public class ProxyVideo {
String contentDisposition = response.headers().get("Content-Disposition"); String contentDisposition = response.headers().get("Content-Disposition");
long contentLength = hContentLength != null ? Long.parseLong(hContentLength) : 0; long contentLength = hContentLength != null ? Long.parseLong(hContentLength) : 0;
if (contentDisposition != null) contentType = Utils.getMimeType(contentDisposition); if (contentDisposition != null) contentType = Utils.getMimeType(contentDisposition);
return newFixedLengthResponse(status, contentType, response.body().byteStream(), contentLength); NanoHTTPD.Response resp = newFixedLengthResponse(status, contentType, response.body().byteStream(), contentLength);
for (String key : response.headers().names()) resp.addHeader(key, response.headers().get(key));
return resp;
} }
} }