From c40adcdf5df1a9c77f7429ed648537837909d2d0 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 13 Oct 2022 13:28:37 +0800 Subject: [PATCH] Clean code --- .../src/main/java/com/undcover/freedom/pyramid/Loader.java | 5 ++--- .../undcover/freedom/pyramid/{PySpider.java => Spider.java} | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) rename pyramid/src/main/java/com/undcover/freedom/pyramid/{PySpider.java => Spider.java} (91%) diff --git a/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java b/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java index 842564b59..adc47e1f6 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java +++ b/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java @@ -5,7 +5,6 @@ import android.content.Context; import com.chaquo.python.PyObject; import com.chaquo.python.Python; import com.chaquo.python.android.AndroidPlatform; -import com.github.catvod.crawler.Spider; public class Loader { @@ -18,9 +17,9 @@ public class Loader { app = Python.getInstance().getModule("app"); } - public Spider spider(Context context, String ext) { + public com.github.catvod.crawler.Spider spider(Context context, String ext) { if (app == null) init(context); String path = app.callAttr("downloadPlugin", cache, ext).toString(); - return new PySpider(app, app.callAttr("loadFromDisk", path)); + return new Spider(app, app.callAttr("loadFromDisk", path)); } } diff --git a/pyramid/src/main/java/com/undcover/freedom/pyramid/PySpider.java b/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java similarity index 91% rename from pyramid/src/main/java/com/undcover/freedom/pyramid/PySpider.java rename to pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java index 8907357cb..4fcd06d32 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/PySpider.java +++ b/pyramid/src/main/java/com/undcover/freedom/pyramid/Spider.java @@ -3,19 +3,18 @@ package com.undcover.freedom.pyramid; import android.content.Context; import com.chaquo.python.PyObject; -import com.github.catvod.crawler.Spider; import com.google.gson.Gson; import java.util.HashMap; import java.util.List; -public class PySpider extends Spider { +public class Spider extends com.github.catvod.crawler.Spider { private final PyObject app; private final PyObject obj; private final Gson gson; - public PySpider(PyObject app, PyObject obj) { + public Spider(PyObject app, PyObject obj) { this.gson = new Gson(); this.app = app; this.obj = obj;