From 8406a7c465db971c43717a8db327138e1e89deca Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Wed, 17 Jul 2024 14:40:04 +0800
Subject: [PATCH] Clean code

---
 .../android/tv/api/loader/PyLoader.java       |  4 ++--
 .../main/java/com/fongmi/chaquo/Loader.java   |  6 ++---
 chaquo/src/main/python/app.py                 | 23 ++++++++++++++-----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java
index 4979f1eb8..59c566d7f 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/loader/PyLoader.java
@@ -42,8 +42,8 @@ public class PyLoader {
     public Spider getSpider(String key, String api, String ext) {
         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(), key, api);
+            Method method = loader.getClass().getMethod("spider", Context.class, String.class);
+            Spider spider = (Spider) method.invoke(loader, App.get(), api);
             spider.init(App.get(), ext);
             spiders.put(key, spider);
             return spider;
diff --git a/chaquo/src/main/java/com/fongmi/chaquo/Loader.java b/chaquo/src/main/java/com/fongmi/chaquo/Loader.java
index d619c9bf4..b233f915a 100644
--- a/chaquo/src/main/java/com/fongmi/chaquo/Loader.java
+++ b/chaquo/src/main/java/com/fongmi/chaquo/Loader.java
@@ -12,19 +12,17 @@ import com.github.catvod.utils.Path;
 public class Loader {
 
     private PyObject app;
-    private String cache;
 
     @Keep
     private void init(Context context) {
         if (!Python.isStarted()) Python.start(new AndroidPlatform(context));
         app = Python.getInstance().getModule("app");
-        cache = Path.py().getAbsolutePath();
     }
 
     @Keep
-    public Spider spider(Context context, String key, String api) {
+    public Spider spider(Context context, String api) {
         if (app == null) init(context);
-        PyObject obj = app.callAttr("spider", cache, key, api);
+        PyObject obj = app.callAttr("spider", Path.py().getAbsolutePath(), api);
         return new Spider(app, obj);
     }
 }
diff --git a/chaquo/src/main/python/app.py b/chaquo/src/main/python/app.py
index 6e5db1fea..d2a7c5a59 100644
--- a/chaquo/src/main/python/app.py
+++ b/chaquo/src/main/python/app.py
@@ -4,22 +4,23 @@ from importlib.machinery import SourceFileLoader
 import json
 
 
-def spider(cache, key, api):
+def spider(cache, api):
     name = os.path.basename(api)
     path = cache + '/' + name
     downloadFile(path, api)
+    name = name.split('.')[0]
     return SourceFileLoader(name, path).load_module().Spider()
 
 
-def downloadFile(name, api):
+def downloadFile(path, api):
     if api.startswith('http'):
-        writeFile(name, redirect(api).content)
+        writeFile(path, redirect(api).content)
     else:
-        writeFile(name, str.encode(api))
+        writeFile(path, str.encode(api))
 
 
-def writeFile(name, content):
-    with open(name, 'wb') as f:
+def writeFile(path, content):
+    with open(path, 'wb') as f:
         f.write(content)
 
 
@@ -35,6 +36,16 @@ def str2json(content):
     return json.loads(content)
 
 
+def getDependence(ru):
+    result = ru.getDependence()
+    return result
+
+
+def getName(ru):
+    result = ru.getName()
+    return result
+
+
 def init(ru, extend):
     ru.init(extend)