pull/142/head
FongMi 2 years ago
parent 5da9b869f3
commit afe73969d8
  1. 4
      app/build.gradle
  2. 6
      app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
  3. 4
      app/src/main/java/com/fongmi/android/tv/api/JarLoader.java
  4. 4
      app/src/main/java/com/fongmi/android/tv/api/JsLoader.java
  5. 4
      app/src/main/java/com/fongmi/android/tv/api/PyLoader.java

@ -21,12 +21,12 @@ android {
leanback {
dimension "mode"
versionCode 205
versionName "20230924#2"
versionName "20230924#3"
}
mobile {
dimension "mode"
versionCode 205
versionName "20230924#2"
versionName "20230924#3"
}
java {
dimension "api"

@ -232,9 +232,9 @@ public class ApiConfig {
boolean js = site.getApi().contains(".js");
boolean py = site.getApi().startsWith("py_");
boolean csp = site.getApi().startsWith("csp_");
if (py) return pyLoader.getSpider(site.getKey(), site.getApi(), site.getExt());
else if (js) return jsLoader.getSpider(site.getKey(), site.getApi(), site.getExt(), site.getJar());
else if (csp) return jarLoader.getSpider(site.getKey(), site.getApi(), site.getExt(), site.getJar());
if (py) return pyLoader.getSpider(site.getKey(), site.getApi(), site.getExt(), site.isProxy());
else if (js) return jsLoader.getSpider(site.getKey(), site.getApi(), site.getExt(), site.getJar(), site.isProxy());
else if (csp) return jarLoader.getSpider(site.getKey(), site.getApi(), site.getExt(), site.getJar(), site.isProxy());
else return new SpiderNull();
}

@ -101,14 +101,14 @@ public class JarLoader {
return loaders.get(key);
}
public Spider getSpider(String key, String api, String ext, String jar) {
public Spider getSpider(String key, String api, String ext, String jar, boolean proxy) {
try {
String jaKey = Util.md5(jar);
String spKey = jaKey + key;
if (spiders.containsKey(spKey)) return spiders.get(spKey);
if (!loaders.containsKey(jaKey)) parseJar(jaKey, jar);
Spider spider = (Spider) loaders.get(jaKey).loadClass("com.github.catvod.spider." + api.split("csp_")[1]).newInstance();
spider.init(App.get(), ext);
spider.proxy(proxy).init(App.get(), ext);
spiders.put(spKey, spider);
return spider;
} catch (Throwable e) {

@ -39,11 +39,11 @@ public class JsLoader {
}
}
public Spider getSpider(String key, String api, String ext, String jar) {
public Spider getSpider(String key, String api, String ext, String jar, boolean proxy) {
try {
if (spiders.containsKey(key)) return spiders.get(key);
Spider spider = new com.fongmi.quickjs.crawler.Spider(key, api, dex(key, jar));
spider.init(App.get(), ext);
spider.proxy(proxy).init(App.get(), ext);
spiders.put(key, spider);
return spider;
} catch (Throwable e) {

@ -37,12 +37,12 @@ public class PyLoader {
}
}
public Spider getSpider(String key, String api, String ext) {
public Spider getSpider(String key, String api, String ext, boolean proxy) {
try {
if (spiders.containsKey(key)) return spiders.get(key);
Method method = loader.getClass().getMethod("spider", Context.class, String.class, String.class);
Spider spider = (Spider) method.invoke(loader, App.get(), api.split("py_")[1], ext);
spider.init(App.get(), ext);
spider.proxy(proxy).init(App.get(), ext);
spiders.put(key, spider);
return spider;
} catch (Throwable e) {

Loading…
Cancel
Save