Rename proxyLocal to proxy

pull/605/head
jhengazuji 5 months ago
parent 8ec4173285
commit 7fc7eb97c5
  1. 10
      app/src/main/java/com/fongmi/android/tv/api/loader/BaseLoader.java
  2. 2
      app/src/main/java/com/fongmi/android/tv/api/loader/JarLoader.java
  3. 4
      app/src/main/java/com/fongmi/android/tv/api/loader/JsLoader.java
  4. 4
      app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java
  5. 2
      app/src/main/java/com/fongmi/android/tv/server/process/Proxy.java
  6. 2
      catvod/src/main/java/com/github/catvod/crawler/Spider.java
  7. 2
      chaquo/src/main/java/com/fongmi/chaquo/Spider.java
  8. 2
      quickjs/src/main/java/com/fongmi/quickjs/crawler/Spider.java

@ -74,11 +74,11 @@ public class BaseLoader {
else if (csp) jarLoader.setRecent(Util.md5(jar));
}
public Object[] proxyLocal(Map<String, String> params) throws Exception {
if (params.containsKey("siteKey")) return getSpider(params.get("siteKey")).proxyLocal(params);
if ("js".equals(params.get("do"))) return jsLoader.proxyInvoke(params);
if ("py".equals(params.get("do"))) return pyLoader.proxyInvoke(params);
return jarLoader.proxyInvoke(params);
public Object[] proxy(Map<String, String> params) throws Exception {
if (params.containsKey("siteKey")) return getSpider(params.get("siteKey")).proxy(params);
if ("js".equals(params.get("do"))) return jsLoader.proxy(params);
if ("py".equals(params.get("do"))) return pyLoader.proxy(params);
return jarLoader.proxy(params);
}
public void parseJar(String jar, boolean recent) {

@ -136,7 +136,7 @@ public class JarLoader {
return (JSONObject) method.invoke(null, jxs, name, flag, url);
}
public Object[] proxyInvoke(Map<String, String> params) {
public Object[] proxy(Map<String, String> params) throws Exception {
if (recent == null) return tryOthers(params);
Object[] result = proxyInvoke(methods.get(recent), params);
return result != null ? result : tryOthers(params);

@ -42,7 +42,7 @@ public class JsLoader {
}
}
public Object[] proxyInvoke(Map<String, String> params) throws Exception {
return spiders.get(recent).proxyLocal(params);
public Object[] proxy(Map<String, String> params) throws Exception {
return spiders.get(recent).proxy(params);
}
}

@ -42,7 +42,7 @@ public class PyLoader {
}
}
public Object[] proxyInvoke(Map<String, String> params) throws Exception {
return spiders.get(recent).proxyLocal(params);
public Object[] proxy(Map<String, String> params) throws Exception {
return spiders.get(recent).proxy(params);
}
}

@ -25,7 +25,7 @@ public class Proxy implements Process {
Map<String, String> params = session.getParms();
params.putAll(session.getHeaders());
params.putAll(files);
Object[] rs = BaseLoader.get().proxyLocal(params);
Object[] rs = BaseLoader.get().proxy(params);
if (rs[0] instanceof Response) return (Response) rs[0];
Response response = NanoHTTPD.newChunkedResponse(Status.lookup((Integer) rs[0]), (String) rs[1], (InputStream) rs[2]);
if (rs.length > 3 && rs[3] != null) for (Map.Entry<String, String> entry : ((Map<String, String>) rs[3]).entrySet()) response.addHeader(entry.getKey(), entry.getValue());

@ -62,7 +62,7 @@ public abstract class Spider {
return false;
}
public Object[] proxyLocal(Map<String, String> params) throws Exception {
public Object[] proxy(Map<String, String> params) throws Exception {
return null;
}

@ -86,7 +86,7 @@ public class Spider extends com.github.catvod.crawler.Spider {
}
@Override
public Object[] proxyLocal(Map<String, String> params) {
public Object[] proxy(Map<String, String> params) throws Exception {
List<PyObject> list = app.callAttr("localProxy", obj, gson.toJson(params)).asList();
boolean base64 = list.size() > 4 && list.get(4).toInt() == 1;
boolean header = list.size() > 3 && list.get(3) != null;

@ -115,7 +115,7 @@ public class Spider extends com.github.catvod.crawler.Spider {
}
@Override
public Object[] proxyLocal(Map<String, String> params) throws Exception {
public Object[] proxy(Map<String, String> params) throws Exception {
if ("catvod".equals(params.get("from"))) return proxy2(params);
else return submit(() -> proxy1(params)).get();
}

Loading…
Cancel
Save