diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/SettingActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/SettingActivity.java index aaf4ef10..7da52acf 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/activity/SettingActivity.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/activity/SettingActivity.java @@ -184,8 +184,10 @@ public class SettingActivity extends BaseActivity { AppManager.getInstance().finishAllActivity(); jumpActivity(HomeActivity.class, createBundle()); } - else if ((homeSourceKey != null && !homeSourceKey.equals(Hawk.get(HawkConfig.HOME_API, ""))) || homeRec != Hawk.get(HawkConfig.HOME_REC, 0) || !currentLiveApi.equals(Hawk.get(HawkConfig.LIVE_API_URL, ""))) { + else if ((homeSourceKey != null && !homeSourceKey.equals(Hawk.get(HawkConfig.HOME_API, ""))) || homeRec != Hawk.get(HawkConfig.HOME_REC, 0)) { jumpActivity(HomeActivity.class, createBundle()); + }else if(!currentLiveApi.equals(Hawk.get(HawkConfig.LIVE_API_URL, ""))){ + jumpActivity(HomeActivity.class); } } else { AppManager.getInstance().finishAllActivity(); diff --git a/pyramid/src/python/app.py b/pyramid/src/python/app.py index 05f03044..740b51d2 100644 --- a/pyramid/src/python/app.py +++ b/pyramid/src/python/app.py @@ -84,7 +84,7 @@ def init(ru,extend): if sp != None: sp.setExtendInfo(sParam[key]) spoList.append(sp) - ru.setExtendInfo(extend) +# ru.setExtendInfo(extend) ru.init(extend) def homeContent(ru,filter): diff --git a/pyramid/src/python/base/localProxy.py b/pyramid/src/python/base/localProxy.py new file mode 100644 index 00000000..fc7eb022 --- /dev/null +++ b/pyramid/src/python/base/localProxy.py @@ -0,0 +1,6 @@ +class Proxy: + def getUrl(self, local): + return 'http://127.0.0.1:9978' + + def getPort(self): + return 9978 \ No newline at end of file diff --git a/pyramid/src/python/base/spider.py b/pyramid/src/python/base/spider.py index 4bfb5aa1..80ab9d5c 100644 --- a/pyramid/src/python/base/spider.py +++ b/pyramid/src/python/base/spider.py @@ -1,86 +1,151 @@ -#coding=utf-8 -#!/usr/bin/python import re +import os import json +import time import requests from lxml import etree -from abc import abstractmethod,ABCMeta +from abc import abstractmethod, ABCMeta from importlib.machinery import SourceFileLoader -class Spider(metaclass=ABCMeta): # 元类 默认的元类 type +from base.localProxy import Proxy + +class Spider(metaclass=ABCMeta): _instance = None + + def __init__(self): + self.extend = '' + def __new__(cls, *args, **kwargs): if cls._instance: - return cls._instance # 有实例则直接返回 + return cls._instance else: - cls._instance = super().__new__(cls) # 没有实例则new一个并保存 - return cls._instance # 这个返回是给是给init，再实例化一次，也没有关系 - - # # 这是简化的写法，上面注释的写法更容易提现判断思路 - # if not cls._instance: - # cls._instance = super().__new__(cls) - # return cls._instance - - @abstractmethod - def init(self,extend=""):pass - @abstractmethod - def homeContent(self,filter):pass - @abstractmethod - def homeVideoContent(self):pass - @abstractmethod - def categoryContent(self,tid,pg,filter,extend):pass - @abstractmethod - def detailContent(self,ids):pass - @abstractmethod - def searchContent(self,key,quick):pass + cls._instance = super().__new__(cls) + return cls._instance + @abstractmethod - def playerContent(self,flag,id,vipFlags):pass -# @abstractmethod + def init(self, extend=""): + pass + + def homeContent(self, filter): + pass + + def homeVideoContent(self): + pass + + def categoryContent(self, tid, pg, filter, extend): + pass + + def detailContent(self, ids): + pass + + def searchContent(self, key, quick, pg="1"): + pass + + def playerContent(self, flag, id, vipFlags): + pass + def liveContent(self, url): pass - @abstractmethod - def localProxy(self,param):pass - @abstractmethod - def isVideoFormat(self,url):pass - @abstractmethod - def manualVideoCheck(self):pass - @abstractmethod - def getName(self):pass + + def localProxy(self, param): + pass + + def isVideoFormat(self, url): + pass + + def manualVideoCheck(self): + pass + + def action(self, action): + pass + + def destroy(self): + pass + + def getName(self): + pass + def getDependence(self): return [] - def setExtendInfo(self,extend): - self.extend = extend - def regStr(self,src,reg,group=1): + + def loadSpider(self, name): + return self.loadModule(name).Spider() + + def loadModule(self, name): + path = os.path.join(os.path.join("../plugin"), f'{name}.py') + return SourceFileLoader(name, path).load_module() + + def regStr(self, reg, src, group=1): m = re.search(reg, src) src = '' - if m : + if m: src = m.group(group) return src - def str2json(self,str): - return json.loads(str) - # cGroup = re.compile('[\U00010000-\U0010ffff]') - # clean = cGroup.sub('',rsp.text) - def cleanText(self,src): - clean = re.sub('[\U0001F600-\U0001F64F\U0001F300-\U0001F5FF\U0001F680-\U0001F6FF\U0001F1E0-\U0001F1FF]', '', src) + + def removeHtmlTags(self, src): + clean = re.compile('<.*?>') + return re.sub(clean, '', src) + + def cleanText(self, src): + clean = re.sub('[\U0001F600-\U0001F64F\U0001F300-\U0001F5FF\U0001F680-\U0001F6FF\U0001F1E0-\U0001F1FF]', '', + src) return clean - def fetch(self,url,headers={},cookies=""): - rsp = requests.get(url,headers=headers,cookies=cookies) - rsp.encoding='utf-8' - return rsp - def post(self,url,data,headers={},cookies={}): - rsp = requests.post(url,data=data,headers=headers,cookies=cookies) - rsp.encoding='utf-8' + + def fetch(self, url, params=None, cookies=None, headers=None, timeout=5, verify=True, stream=False, + allow_redirects=True): + rsp = requests.get(url, params=params, cookies=cookies, headers=headers, timeout=timeout, verify=verify, + stream=stream, allow_redirects=allow_redirects) + rsp.encoding = 'utf-8' return rsp - def postJson(self,url,json,headers={},cookies={}): - rsp = requests.post(url,json=json,headers=headers,cookies=cookies) - rsp.encoding='utf-8' + + def post(self, url, params=None, data=None, json=None, cookies=None, headers=None, timeout=5, verify=True, + stream=False, allow_redirects=True): + rsp = requests.post(url, params=params, data=data, json=json, cookies=cookies, headers=headers, timeout=timeout, + verify=verify, stream=stream, allow_redirects=allow_redirects) + rsp.encoding = 'utf-8' return rsp - def html(self,content): + + def html(self, content): return etree.HTML(content) - def xpText(self,root,expr): - ele = root.xpath(expr) - if len(ele) == 0: - return '' + + def str2json(str): + return json.loads(str) + + def json2str(str): + return json.dumps(str, ensure_ascii=False) + + def getProxyUrl(self, local=True): + return f'{Proxy.getUrl(local)}?do=py' + + def log(self, msg): + if isinstance(msg, dict) or isinstance(msg, list): + print(json.dumps(msg, ensure_ascii=False)) else: - return ele[0] - def loadModule(self,name,fileName): - return SourceFileLoader(name, fileName).load_module() \ No newline at end of file + print(f'{msg}') + + def getCache(self, key): + value = self.fetch(f'http://127.0.0.1:{Proxy.getPort()}/cache?do=get&key={key}', timeout=5).text + if len(value) > 0: + if value.startswith('{') and value.endswith('}') or value.startswith('[') and value.endswith(']'): + value = json.loads(value) + if type(value) == dict: + if not 'expiresAt' in value or value['expiresAt'] >= int(time.time()): + return value + else: + self.delCache(key) + return None + return value + else: + return None + + def setCache(self, key, value): + if type(value) in [int, float]: + value = str(value) + if len(value) > 0: + if type(value) == dict or type(value) == list: + value = json.dumps(value, ensure_ascii=False) + r = self.post(f'http://127.0.0.1:{Proxy.getPort()}/cache?do=set&key={key}', data={"value": value}, timeout=5) + return 'succeed' if r.status_code == 200 else 'failed' + + def delCache(self, key): + r = self.fetch(f'http://127.0.0.1:{Proxy.getPort()}/cache?do=del&key={key}', timeout=5) + return 'succeed' if r.status_code == 200 else 'failed' \ No newline at end of file