From f045dbe823d5865cede2448f88e10f83bd80f1cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=9A=E9=A3=8E=E6=8B=82=E6=9F=B3=E9=A2=9C?= <434857005@qq.com> Date: Wed, 10 Jan 2024 03:07:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9py=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- txt/hipy/base_spider.py | 33 +++++++++++++++++++++------------ txt/hipy/两个BT.json | 2 +- txt/hipy/两个BT.py | 19 +++++++++++-------- txt/hipy/樱花动漫.py | 24 +++++++++++++++++++++--- 4 files changed, 54 insertions(+), 24 deletions(-) diff --git a/txt/hipy/base_spider.py b/txt/hipy/base_spider.py index 7d84948..ca6dec5 100644 --- a/txt/hipy/base_spider.py +++ b/txt/hipy/base_spider.py @@ -91,19 +91,28 @@ class Spider(BaseSpider): # 元类 默认的元类 type except Exception as e: print(f'更新扩展筛选条件发生错误:{e}') + ext = self.extend print(f"============{extend}============") - if extend.startswith('./'): - ext_file = os.path.join(os.path.dirname(__file__), extend) - init_file(ext_file) - elif extend.startswith('http'): - try: - r = self.fetch(extend) - self.config['filter'].update(r.json()) - except Exception as e: - print(f'更新扩展筛选条件发生错误:{e}') - elif extend and not extend.startswith('./') and not extend.startswith('http'): - ext_file = os.path.join(os.path.dirname(__file__), './' + extend + '.json') - init_file(ext_file) + if isinstance(ext, str) and ext: + if ext.startswith('./'): + ext_file = os.path.join(os.path.dirname(__file__), ext) + init_file(ext_file) + elif ext.startswith('http'): + try: + r = self.fetch(ext) + self.config['filter'].update(r.json()) + except Exception as e: + print(f'更新扩展筛选条件发生错误:{e}') + elif not ext.startswith('./') and not ext.startswith('http'): + ext_file = os.path.join(os.path.dirname(__file__), './' + ext + '.json') + init_file(ext_file) + + # 装载模块，这里只要一个就够了 + if isinstance(extend, list): + for lib in extend: + if '.Spider' in str(type(lib)): + self.module = lib + break def isVideoFormat(self, url): pass diff --git a/txt/hipy/两个BT.json b/txt/hipy/两个BT.json index 0b5e9c6..13b3497 100644 --- a/txt/hipy/两个BT.json +++ b/txt/hipy/两个BT.json @@ -1 +1 @@ -{"movie_bt": [{"key": "cat", "name": "地区", "value": [{"n": "全部", "v": ""}, {"n": "不丹", "v": "/movie_bt_cat/%e4%b8%8d%e4%b8%b9"}, {"n": "东南亚", "v": "/movie_bt_cat/ny"}, {"n": "中国", "v": "/movie_bt_cat/zhonji"}, {"n": "中国台湾", "v": "/movie_bt_cat/zhogngtw"}, {"n": "中国大陆", "v": "/movie_bt_cat/dl"}, {"n": "中国香港", "v": "/movie_bt_cat/zhongguoxg"}, {"n": "丹麦", "v": "/movie_bt_cat/dm"}, {"n": "乌克兰", "v": "/movie_bt_cat/wuklan"}, {"n": "以色列", "v": "/movie_bt_cat/yisl"}, {"n": "伊朗", "v": "/movie_bt_cat/yl"}, {"n": "俄罗斯", "v": "/movie_bt_cat/els"}, {"n": "保加利亚", "v": "/movie_bt_cat/baojialiya"}, {"n": "克罗地亚", "v": "/movie_bt_cat/%e5%85%8b%e7%bd%97%e5%9c%b0%e4%ba%9a"}, {"n": "冰岛", "v": "/movie_bt_cat/bingda"}, {"n": "加拿大", "v": "/movie_bt_cat/jnd"}, {"n": "匈牙利", "v": "/movie_bt_cat/%e5%8c%88%e7%89%99%e5%88%a9"}, {"n": "南斯拉夫", "v": "/movie_bt_cat/nasilafu"}, {"n": "南非", "v": "/movie_bt_cat/nanfei"}, {"n": "卡塔尔", "v": "/movie_bt_cat/kaer"}, {"n": "卢森堡", "v": "/movie_bt_cat/luob"}, {"n": "印度", "v": "/movie_bt_cat/yindu"}, {"n": "印度尼西亚", "v": "/movie_bt_cat/%e5%8d%b0%e5%ba%a6%e5%b0%bc%e8%a5%bf%e4%ba%9a"}, {"n": "台湾", "v": "/movie_bt_cat/taiwan"}, {"n": "哥伦比亚", "v": "/movie_bt_cat/gelunbiya"}, {"n": "土耳其", "v": "/movie_bt_cat/tuerqi"}, {"n": "塞尔维亚", "v": "/movie_bt_cat/saierweiya"}, {"n": "墨西哥", "v": "/movie_bt_cat/moxige"}, {"n": "奥地利", "v": "/movie_bt_cat/aodili"}, {"n": "尼日利亚", "v": "/movie_bt_cat/nirily"}, {"n": "巴西", "v": "/movie_bt_cat/bx"}, {"n": "希腊", "v": "/movie_bt_cat/xl"}, {"n": "德国", "v": "/movie_bt_cat/%e5%be%b7%e5%9b%bd"}, {"n": "意大利", "v": "/movie_bt_cat/ydl"}, {"n": "挪威", "v": "/movie_bt_cat/nw"}, {"n": "捷克", "v": "/movie_bt_cat/jirker"}, {"n": "摩洛哥", "v": "/movie_bt_cat/%e6%91%a9%e6%b4%9b%e5%93%a5"}, {"n": "斯洛伐克", "v": "/movie_bt_cat/siluofake"}, {"n": "新加坡", "v": "/movie_bt_cat/xinjip"}, {"n": "新西兰", "v": "/movie_bt_cat/xinxilan"}, {"n": "日本", "v": "/movie_bt_cat/rb"}, {"n": "日韩", "v": "/movie_bt_cat/rihan"}, {"n": "欧美", "v": "/movie_bt_cat/omei"}, {"n": "比利时", "v": "/movie_bt_cat/bilishi"}, {"n": "法国", "v": "/movie_bt_cat/fg"}, {"n": "波兰", "v": "/movie_bt_cat/bolan"}, {"n": "波多黎各", "v": "/movie_bt_cat/%e6%b3%a2%e5%a4%9a%e9%bb%8e%e5%90%84"}, {"n": "泰国", "v": "/movie_bt_cat/taigyo"}, {"n": "港台", "v": "/movie_bt_cat/gangtai"}, {"n": "澳大利亚", "v": "/movie_bt_cat/adly"}, {"n": "爱尔兰", "v": "/movie_bt_cat/arl"}, {"n": "爱沙尼亚", "v": "/movie_bt_cat/asny"}, {"n": "瑞典", "v": "/movie_bt_cat/%e7%91%9e%e5%85%b8"}, {"n": "瑞士", "v": "/movie_bt_cat/ruishi"}, {"n": "白俄罗斯", "v": "/movie_bt_cat/baierls"}, {"n": "秘鲁", "v": "/movie_bt_cat/%e7%a7%98%e9%b2%81"}, {"n": "突尼斯", "v": "/movie_bt_cat/tunisi"}, {"n": "立陶宛", "v": "/movie_bt_cat/ltwan"}, {"n": "罗马尼亚", "v": "/movie_bt_cat/lmny"}, {"n": "美国", "v": "/movie_bt_cat/mg"}, {"n": "芬兰", "v": "/movie_bt_cat/%e8%8a%ac%e5%85%b0"}, {"n": "英国", "v": "/movie_bt_cat/yg"}, {"n": "荷兰", "v": "/movie_bt_cat/hl"}, {"n": "荷属安的列斯", "v": "/movie_bt_cat/lsadlsi"}, {"n": "菲律宾", "v": "/movie_bt_cat/feilb"}, {"n": "葡萄牙", "v": "/movie_bt_cat/pty"}, {"n": "西德", "v": "/movie_bt_cat/dide"}, {"n": "西班牙", "v": "/movie_bt_cat/xby"}, {"n": "越南", "v": "/movie_bt_cat/yeun"}, {"n": "阿根廷", "v": "/movie_bt_cat/ageiting"}, {"n": "阿联酋", "v": "/movie_bt_cat/alq"}, {"n": "韩国", "v": "/movie_bt_cat/hg"}, {"n": "香港", "v": "/movie_bt_cat/xiangg"}, {"n": "马来西亚", "v": "/movie_bt_cat/malaxy"}, {"n": "马耳他", "v": "/movie_bt_cat/%e9%a9%ac%e8%80%b3%e4%bb%96"}]}, {"key": "year", "name": "年份", "value": [{"n": "全部", "v": ""}, {"n": "1921", "v": "/year/1921"}, {"n": "1925", "v": "/year/1925"}, {"n": "1931", "v": "/year/1931"}, {"n": "1938", "v": "/year/1938"}, {"n": "1949", "v": "/year/1949"}, {"n": "1952", "v": "/year/1952"}, {"n": "1953", "v": "/year/1953"}, {"n": "1954", "v": "/year/1954"}, {"n": "1955", "v": "/year/1955"}, {"n": "1956", "v": "/year/1956"}, {"n": "1957", "v": "/year/1957"}, {"n": "1958", "v": "/year/1958"}, {"n": "1959", "v": "/year/1959"}, {"n": "1960", "v": "/year/1960"}, {"n": "1961", "v": "/year/1961"}, {"n": "1962", "v": "/year/1962"}, {"n": "1963", "v": "/year/1963"}, {"n": "1969", "v": "/year/1969"}, {"n": "1970", "v": "/year/1970"}, {"n": "1972", "v": "/year/1972"}, {"n": "1973", "v": "/year/1973"}, {"n": "1974", "v": "/year/1974"}, {"n": "1975", "v": "/year/1975"}, {"n": "1976", "v": "/year/1976"}, {"n": "1977", "v": "/year/1977"}, {"n": "1978", "v": "/year/1978"}, {"n": "1980", "v": "/year/1980"}, {"n": "1982", "v": "/year/1982"}, {"n": "1983", "v": "/year/1983"}, {"n": "1984", "v": "/year/1984"}, {"n": "1985", "v": "/year/1985"}, {"n": "1986", "v": "/year/1986"}, {"n": "1987", "v": "/year/1987"}, {"n": "1988", "v": "/year/1988"}, {"n": "1989", "v": "/year/1989"}, {"n": "1990", "v": "/year/1990"}, {"n": "1991", "v": "/year/1991"}, {"n": "1992", "v": "/year/1992"}, {"n": "1993", "v": "/year/1993"}, {"n": "1994", "v": "/year/1994"}, {"n": "1995", "v": "/year/1995"}, {"n": "1996", "v": "/year/1996"}, {"n": "1997", "v": "/year/1997"}, {"n": "1998", "v": "/year/1998"}, {"n": "1999", "v": "/year/1999"}, {"n": "2000", "v": "/year/2000"}, {"n": "2001", "v": "/year/2001"}, {"n": "2002", "v": "/year/2002"}, {"n": "2003", "v": "/year/2003"}, {"n": "2004", "v": "/year/2004"}, {"n": "2005", "v": "/year/2005"}, {"n": "2006", "v": "/year/2006"}, {"n": "2007", "v": "/year/2007"}, {"n": "2008", "v": "/year/2008"}, {"n": "2009", "v": "/year/2009"}, {"n": "2010", "v": "/year/2010"}, {"n": "2011", "v": "/year/2011"}, {"n": "2012", "v": "/year/2012"}, {"n": "2013", "v": "/year/2013"}, {"n": "2014", "v": "/year/2014"}, {"n": "2015", "v": "/year/2015"}, {"n": "2016", "v": "/year/2016"}, {"n": "20165", "v": "/year/20165"}, {"n": "2017", "v": "/year/2017"}, {"n": "2018", "v": "/year/2018"}, {"n": "2019", "v": "/year/2019"}, {"n": "2020", "v": "/year/2020"}, {"n": "2021", "v": "/year/2021"}, {"n": "2022", "v": "/year/2022"}, {"n": "2023", "v": "/year/2023"}]}, {"key": "tags", "name": "影片类型", "value": [{"n": "全部", "v": ""}, {"n": "传记", "v": "/movie_bt_tags/zj"}, {"n": "儿童", "v": "/movie_bt_tags/ertong"}, {"n": "冒险", "v": "/movie_bt_tags/adt"}, {"n": "剧情", "v": "/movie_bt_tags/juqing"}, {"n": "动作", "v": "/movie_bt_tags/at"}, {"n": "动画", "v": "/movie_bt_tags/donghua"}, {"n": "历史", "v": "/movie_bt_tags/lishi"}, {"n": "古装", "v": "/movie_bt_tags/guzhuang"}, {"n": "同性", "v": "/movie_bt_tags/tongxing"}, {"n": "喜剧", "v": "/movie_bt_tags/xiju"}, {"n": "奇幻", "v": "/movie_bt_tags/qihuan"}, {"n": "家庭", "v": "/movie_bt_tags/jiating"}, {"n": "恐怖", "v": "/movie_bt_tags/kongbu"}, {"n": "悬疑", "v": "/movie_bt_tags/xuanni"}, {"n": "情色", "v": "/movie_bt_tags/qingse"}, {"n": "惊悚", "v": "/movie_bt_tags/jingsong"}, {"n": "戏曲", "v": "/movie_bt_tags/%e6%88%8f%e6%9b%b2"}, {"n": "战争", "v": "/movie_bt_tags/zhanzheng"}, {"n": "歌舞", "v": "/movie_bt_tags/gw"}, {"n": "武侠", "v": "/movie_bt_tags/wuxia"}, {"n": "灾难", "v": "/movie_bt_tags/zhannan"}, {"n": "爱情", "v": "/movie_bt_tags/aiqing"}, {"n": "犯罪", "v": "/movie_bt_tags/fanzui"}, {"n": "短片", "v": "/movie_bt_tags/%e7%9f%ad%e7%89%87"}, {"n": "科幻", "v": "/movie_bt_tags/kehuan"}, {"n": "纪录片", "v": "/movie_bt_tags/jilu"}, {"n": "西部", "v": "/movie_bt_tags/xibu"}, {"n": "运动", "v": "/movie_bt_tags/yd"}, {"n": "音乐", "v": "/movie_bt_tags/yinyue"}, {"n": "黑色电影", "v": "/movie_bt_tags/%e9%bb%91%e8%89%b2%e7%94%b5%e5%bd%b1"}]}]} \ No newline at end of file +{"movie_bt": [{"key": "cat", "name": "地区", "value": [{"n": "全部", "v": ""}, {"n": "不丹", "v": "/movie_bt_cat/%e4%b8%8d%e4%b8%b9"}, {"n": "东南亚", "v": "/movie_bt_cat/ny"}, {"n": "中国", "v": "/movie_bt_cat/zhonji"}, {"n": "中国台湾", "v": "/movie_bt_cat/zhogngtw"}, {"n": "中国大陆", "v": "/movie_bt_cat/dl"}, {"n": "中国香港", "v": "/movie_bt_cat/zhongguoxg"}, {"n": "丹麦", "v": "/movie_bt_cat/dm"}, {"n": "乌克兰", "v": "/movie_bt_cat/wuklan"}, {"n": "以色列", "v": "/movie_bt_cat/yisl"}, {"n": "伊朗", "v": "/movie_bt_cat/yl"}, {"n": "俄罗斯", "v": "/movie_bt_cat/els"}, {"n": "保加利亚", "v": "/movie_bt_cat/baojialiya"}, {"n": "克罗地亚", "v": "/movie_bt_cat/%e5%85%8b%e7%bd%97%e5%9c%b0%e4%ba%9a"}, {"n": "冰岛", "v": "/movie_bt_cat/bingda"}, {"n": "加拿大", "v": "/movie_bt_cat/jnd"}, {"n": "匈牙利", "v": "/movie_bt_cat/%e5%8c%88%e7%89%99%e5%88%a9"}, {"n": "南斯拉夫", "v": "/movie_bt_cat/nasilafu"}, {"n": "南非", "v": "/movie_bt_cat/nanfei"}, {"n": "卡塔尔", "v": "/movie_bt_cat/kaer"}, {"n": "卢森堡", "v": "/movie_bt_cat/luob"}, {"n": "印度", "v": "/movie_bt_cat/yindu"}, {"n": "印度尼西亚", "v": "/movie_bt_cat/%e5%8d%b0%e5%ba%a6%e5%b0%bc%e8%a5%bf%e4%ba%9a"}, {"n": "台湾", "v": "/movie_bt_cat/taiwan"}, {"n": "哥伦比亚", "v": "/movie_bt_cat/gelunbiya"}, {"n": "土耳其", "v": "/movie_bt_cat/tuerqi"}, {"n": "塞尔维亚", "v": "/movie_bt_cat/saierweiya"}, {"n": "墨西哥", "v": "/movie_bt_cat/moxige"}, {"n": "奥地利", "v": "/movie_bt_cat/aodili"}, {"n": "尼日利亚", "v": "/movie_bt_cat/nirily"}, {"n": "巴西", "v": "/movie_bt_cat/bx"}, {"n": "希腊", "v": "/movie_bt_cat/xl"}, {"n": "德国", "v": "/movie_bt_cat/%e5%be%b7%e5%9b%bd"}, {"n": "意大利", "v": "/movie_bt_cat/ydl"}, {"n": "挪威", "v": "/movie_bt_cat/nw"}, {"n": "捷克", "v": "/movie_bt_cat/jirker"}, {"n": "摩洛哥", "v": "/movie_bt_cat/%e6%91%a9%e6%b4%9b%e5%93%a5"}, {"n": "斯洛伐克", "v": "/movie_bt_cat/siluofake"}, {"n": "新加坡", "v": "/movie_bt_cat/xinjip"}, {"n": "新西兰", "v": "/movie_bt_cat/xinxilan"}, {"n": "日本", "v": "/movie_bt_cat/rb"}, {"n": "日韩", "v": "/movie_bt_cat/rihan"}, {"n": "欧美", "v": "/movie_bt_cat/omei"}, {"n": "比利时", "v": "/movie_bt_cat/bilishi"}, {"n": "法国", "v": "/movie_bt_cat/fg"}, {"n": "波兰", "v": "/movie_bt_cat/bolan"}, {"n": "波多黎各", "v": "/movie_bt_cat/%e6%b3%a2%e5%a4%9a%e9%bb%8e%e5%90%84"}, {"n": "泰国", "v": "/movie_bt_cat/taigyo"}, {"n": "港台", "v": "/movie_bt_cat/gangtai"}, {"n": "澳大利亚", "v": "/movie_bt_cat/adly"}, {"n": "爱尔兰", "v": "/movie_bt_cat/arl"}, {"n": "爱沙尼亚", "v": "/movie_bt_cat/asny"}, {"n": "瑞典", "v": "/movie_bt_cat/%e7%91%9e%e5%85%b8"}, {"n": "瑞士", "v": "/movie_bt_cat/ruishi"}, {"n": "白俄罗斯", "v": "/movie_bt_cat/baierls"}, {"n": "秘鲁", "v": "/movie_bt_cat/%e7%a7%98%e9%b2%81"}, {"n": "突尼斯", "v": "/movie_bt_cat/tunisi"}, {"n": "立陶宛", "v": "/movie_bt_cat/ltwan"}, {"n": "罗马尼亚", "v": "/movie_bt_cat/lmny"}, {"n": "美国", "v": "/movie_bt_cat/mg"}, {"n": "芬兰", "v": "/movie_bt_cat/%e8%8a%ac%e5%85%b0"}, {"n": "英国", "v": "/movie_bt_cat/yg"}, {"n": "荷兰", "v": "/movie_bt_cat/hl"}, {"n": "荷属安的列斯", "v": "/movie_bt_cat/lsadlsi"}, {"n": "菲律宾", "v": "/movie_bt_cat/feilb"}, {"n": "葡萄牙", "v": "/movie_bt_cat/pty"}, {"n": "西德", "v": "/movie_bt_cat/dide"}, {"n": "西班牙", "v": "/movie_bt_cat/xby"}, {"n": "越南", "v": "/movie_bt_cat/yeun"}, {"n": "阿根廷", "v": "/movie_bt_cat/ageiting"}, {"n": "阿联酋", "v": "/movie_bt_cat/alq"}, {"n": "韩国", "v": "/movie_bt_cat/hg"}, {"n": "香港", "v": "/movie_bt_cat/xiangg"}, {"n": "马来西亚", "v": "/movie_bt_cat/malaxy"}, {"n": "马耳他", "v": "/movie_bt_cat/%e9%a9%ac%e8%80%b3%e4%bb%96"}]}, {"key": "year", "name": "年份", "value": [{"n": "全部", "v": ""}, {"n": "1921", "v": "/year/1921"}, {"n": "1925", "v": "/year/1925"}, {"n": "1931", "v": "/year/1931"}, {"n": "1938", "v": "/year/1938"}, {"n": "1949", "v": "/year/1949"}, {"n": "1952", "v": "/year/1952"}, {"n": "1953", "v": "/year/1953"}, {"n": "1954", "v": "/year/1954"}, {"n": "1955", "v": "/year/1955"}, {"n": "1956", "v": "/year/1956"}, {"n": "1957", "v": "/year/1957"}, {"n": "1958", "v": "/year/1958"}, {"n": "1959", "v": "/year/1959"}, {"n": "1960", "v": "/year/1960"}, {"n": "1961", "v": "/year/1961"}, {"n": "1962", "v": "/year/1962"}, {"n": "1963", "v": "/year/1963"}, {"n": "1969", "v": "/year/1969"}, {"n": "1970", "v": "/year/1970"}, {"n": "1972", "v": "/year/1972"}, {"n": "1973", "v": "/year/1973"}, {"n": "1974", "v": "/year/1974"}, {"n": "1975", "v": "/year/1975"}, {"n": "1976", "v": "/year/1976"}, {"n": "1977", "v": "/year/1977"}, {"n": "1978", "v": "/year/1978"}, {"n": "1980", "v": "/year/1980"}, {"n": "1982", "v": "/year/1982"}, {"n": "1983", "v": "/year/1983"}, {"n": "1984", "v": "/year/1984"}, {"n": "1985", "v": "/year/1985"}, {"n": "1986", "v": "/year/1986"}, {"n": "1987", "v": "/year/1987"}, {"n": "1988", "v": "/year/1988"}, {"n": "1989", "v": "/year/1989"}, {"n": "1990", "v": "/year/1990"}, {"n": "1991", "v": "/year/1991"}, {"n": "1992", "v": "/year/1992"}, {"n": "1993", "v": "/year/1993"}, {"n": "1994", "v": "/year/1994"}, {"n": "1995", "v": "/year/1995"}, {"n": "1996", "v": "/year/1996"}, {"n": "1997", "v": "/year/1997"}, {"n": "1998", "v": "/year/1998"}, {"n": "1999", "v": "/year/1999"}, {"n": "2000", "v": "/year/2000"}, {"n": "2001", "v": "/year/2001"}, {"n": "2002", "v": "/year/2002"}, {"n": "2003", "v": "/year/2003"}, {"n": "2004", "v": "/year/2004"}, {"n": "2005", "v": "/year/2005"}, {"n": "2006", "v": "/year/2006"}, {"n": "2007", "v": "/year/2007"}, {"n": "2008", "v": "/year/2008"}, {"n": "2009", "v": "/year/2009"}, {"n": "2010", "v": "/year/2010"}, {"n": "2011", "v": "/year/2011"}, {"n": "2012", "v": "/year/2012"}, {"n": "2013", "v": "/year/2013"}, {"n": "2014", "v": "/year/2014"}, {"n": "2015", "v": "/year/2015"}, {"n": "2016", "v": "/year/2016"}, {"n": "20165", "v": "/year/20165"}, {"n": "2017", "v": "/year/2017"}, {"n": "2018", "v": "/year/2018"}, {"n": "2019", "v": "/year/2019"}, {"n": "2020", "v": "/year/2020"}, {"n": "2021", "v": "/year/2021"}, {"n": "2022", "v": "/year/2022"}, {"n": "2023", "v": "/year/2023"}, {"n": "2024", "v": "/year/2024"}]}, {"key": "tags", "name": "影片类型", "value": [{"n": "全部", "v": ""}, {"n": "传记", "v": "/movie_bt_tags/zj"}, {"n": "儿童", "v": "/movie_bt_tags/ertong"}, {"n": "冒险", "v": "/movie_bt_tags/adt"}, {"n": "剧情", "v": "/movie_bt_tags/juqing"}, {"n": "动作", "v": "/movie_bt_tags/at"}, {"n": "动画", "v": "/movie_bt_tags/donghua"}, {"n": "历史", "v": "/movie_bt_tags/lishi"}, {"n": "古装", "v": "/movie_bt_tags/guzhuang"}, {"n": "同性", "v": "/movie_bt_tags/tongxing"}, {"n": "喜剧", "v": "/movie_bt_tags/xiju"}, {"n": "奇幻", "v": "/movie_bt_tags/qihuan"}, {"n": "家庭", "v": "/movie_bt_tags/jiating"}, {"n": "恐怖", "v": "/movie_bt_tags/kongbu"}, {"n": "悬疑", "v": "/movie_bt_tags/xuanni"}, {"n": "情色", "v": "/movie_bt_tags/qingse"}, {"n": "惊悚", "v": "/movie_bt_tags/jingsong"}, {"n": "戏曲", "v": "/movie_bt_tags/%e6%88%8f%e6%9b%b2"}, {"n": "战争", "v": "/movie_bt_tags/zhanzheng"}, {"n": "歌舞", "v": "/movie_bt_tags/gw"}, {"n": "武侠", "v": "/movie_bt_tags/wuxia"}, {"n": "灾难", "v": "/movie_bt_tags/zhannan"}, {"n": "爱情", "v": "/movie_bt_tags/aiqing"}, {"n": "犯罪", "v": "/movie_bt_tags/fanzui"}, {"n": "短片", "v": "/movie_bt_tags/%e7%9f%ad%e7%89%87"}, {"n": "科幻", "v": "/movie_bt_tags/kehuan"}, {"n": "纪录片", "v": "/movie_bt_tags/jilu"}, {"n": "西部", "v": "/movie_bt_tags/xibu"}, {"n": "运动", "v": "/movie_bt_tags/yd"}, {"n": "音乐", "v": "/movie_bt_tags/yinyue"}, {"n": "黑色电影", "v": "/movie_bt_tags/%e9%bb%91%e8%89%b2%e7%94%b5%e5%bd%b1"}]}]} \ No newline at end of file diff --git a/txt/hipy/两个BT.py b/txt/hipy/两个BT.py index f507c1b..e4dde6f 100644 --- a/txt/hipy/两个BT.py +++ b/txt/hipy/两个BT.py @@ -145,21 +145,24 @@ class Spider(BaseSpider): # 元类 默认的元类 type except Exception as e: print(f'更新扩展筛选条件发生错误:{e}') + ext = self.extend print(f"============{extend}============") - if isinstance(extend, str): - if extend.startswith('./'): - ext_file = os.path.join(os.path.dirname(__file__), extend) + if isinstance(ext, str): + if ext.startswith('./'): + ext_file = os.path.join(os.path.dirname(__file__), ext) init_file(ext_file) - elif extend.startswith('http'): + elif ext.startswith('http'): try: - r = self.fetch(extend) + r = self.fetch(ext) self.config['filter'].update(r.json()) except Exception as e: print(f'更新扩展筛选条件发生错误:{e}') - elif extend and not extend.startswith('./') and not extend.startswith('http'): - ext_file = os.path.join(os.path.dirname(__file__), './' + extend + '.json') + elif not ext.startswith('./') and not ext.startswith('http'): + ext_file = os.path.join(os.path.dirname(__file__), './' + ext + '.json') init_file(ext_file) - elif isinstance(extend, list): + + # 装载模块，这里只要一个就够了 + if isinstance(extend, list): for lib in extend: if '.Spider' in str(type(lib)): self.module = lib diff --git a/txt/hipy/樱花动漫.py b/txt/hipy/樱花动漫.py index 4c29112..aa88707 100644 --- a/txt/hipy/樱花动漫.py +++ b/txt/hipy/樱花动漫.py @@ -29,7 +29,17 @@ api里会自动含有ext参数是base64编码后的选中的筛选条件 "quickSearch":1, "filterable":1, "ext":"https://jihulab.com/qiaoji/open/-/raw/main/yinghua" -} +}, +{ + "key": "hipy_t3_樱花动漫", + "name": "樱花动漫(hipy_t3)", + "type": 3, + "api": "{{host}}/txt/hipy/樱花动漫.py", + "searchable": 1, + "quickSearch": 0, + "filterable": 1, + "ext": "https://jihulab.com/qiaoji/open/-/raw/main/yinghua" +}, """ @@ -109,11 +119,19 @@ class Spider(BaseSpider): # 元类 默认的元类 type @param extend: @return: """ - if extend.startswith('http'): - self.init_extend(extend) + ext = self.extend + if ext.startswith('http'): + self.init_extend(ext) else: self.init_extend(self.api_qj) + # 装载模块，这里只要一个就够了 + if isinstance(extend, list): + for lib in extend: + if '.Spider' in str(type(lib)): + self.module = lib + break + def isVideoFormat(self, url): pass