From ffa515ac025b902c8c80d1eb210cd101c720a1a3 Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Thu, 6 Nov 2025 19:43:53 +0800 Subject: [PATCH] Revert --- .../com/fongmi/android/tv/api/loader/PyLoader.java | 2 +- chaquo/src/main/java/com/fongmi/chaquo/Loader.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 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 e96a327b2..2bb6314ef 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 @@ -31,7 +31,7 @@ public class PyLoader { public Spider getSpider(String key, String api, String ext) { try { if (spiders.containsKey(key)) return spiders.get(key); - Spider spider = loader.spider(api); + Spider spider = loader.spider(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 69167c718..895059beb 100644 --- a/chaquo/src/main/java/com/fongmi/chaquo/Loader.java +++ b/chaquo/src/main/java/com/fongmi/chaquo/Loader.java @@ -1,21 +1,23 @@ package com.fongmi.chaquo; +import android.content.Context; + import com.chaquo.python.PyObject; import com.chaquo.python.Python; import com.chaquo.python.android.AndroidPlatform; -import com.github.catvod.Init; import com.github.catvod.utils.Path; public class Loader { - private final PyObject app; + private PyObject app; - public Loader() { - if (!Python.isStarted()) Python.start(new AndroidPlatform(Init.context())); + private void init(Context context) { + if (!Python.isStarted()) Python.start(new AndroidPlatform(context)); app = Python.getInstance().getModule("app"); } - public Spider spider(String api) { + public Spider spider(Context context, String api) { + if (app == null) init(context); PyObject obj = app.callAttr("spider", Path.py().getAbsolutePath(), api); return new Spider(app, obj, api); }