From 6600e1d523305c05503d98c36c4cdad1a9fee030 Mon Sep 17 00:00:00 2001 From: FongMi Date: Mon, 11 Dec 2023 11:18:27 +0800 Subject: [PATCH] Update py config like js --- .../com/undcover/freedom/pyramid/Loader.java | 4 ++-- pyramid/src/main/python/app.py | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) 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 28b71ffec..c4b8071ba 100644 --- a/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java +++ b/pyramid/src/main/java/com/undcover/freedom/pyramid/Loader.java @@ -22,9 +22,9 @@ public class Loader { } @Keep - public Spider spider(Context context, String name, String api) { + public Spider spider(Context context, String key, String api) { if (app == null) init(context); - PyObject obj = app.callAttr("init_py", cache, name, api); + PyObject obj = app.callAttr("init_py", cache, key, api); return new Spider(app, obj); } } diff --git a/pyramid/src/main/python/app.py b/pyramid/src/main/python/app.py index ad5d33b2c..e3fa4b8c4 100644 --- a/pyramid/src/main/python/app.py +++ b/pyramid/src/main/python/app.py @@ -22,17 +22,18 @@ def redirect(url): return rsp -def download_file(name, ext): - if ext.startswith('http'): - write_file(name, redirect(ext).content) +def download_file(name, api): + if api.startswith('http'): + write_file(name, redirect(api).content) else: - write_file(name, str.encode(ext)) + write_file(name, str.encode(api)) -def init_py(path, name, ext): - py_name = path + '/' + name + '.py' - download_file(py_name, ext) - return SourceFileLoader(name, py_name).load_module().Spider() +def init_py(cache, key, api): + name = os.path.basename(api) + path = cache + '/' + name + download_file(path, api) + return SourceFileLoader(name, path).load_module().Spider() def str2json(content): @@ -40,7 +41,7 @@ def str2json(content): def init(ru, extend): - ru.init([""]) + ru.init(extend) def homeContent(ru, filter):