提交 40da78b9 编写于 作者: H hjdhnx

drpy显示真实来源

上级 b37400e0
无法预览此类型文件
......@@ -763,7 +763,7 @@ class CMS:
return result
def detailOneVod(self,id,fyclass=''):
def detailOneVod(self,id,fyclass='',show_name=False):
detailUrl = str(id)
vod = {}
if not detailUrl.startswith('http') and not '/' in detailUrl:
......@@ -780,7 +780,7 @@ class CMS:
vod['vod_play_from'] = '道长在线'
vod['vod_remarks'] = detailUrl
vod['vod_actor'] = '没有二级,只有一级链接直接嗅探播放'
vod['vod_content'] = url
vod['vod_content'] = url if not show_name else f'({self.id}) {url}'
vod['vod_play_url'] = '嗅探播放$'+self.play_url+url
print(vod)
return vod
......@@ -958,9 +958,11 @@ class CMS:
# print(vod_play_url)
except Exception as e:
logger.info(f'{self.getName()}获取单个详情页{detailUrl}出错{e}')
if show_name:
vod['vod_content'] = f'({self.id}){vod.get("vod_content","")}'
return vod
def detailContent(self, fypage, array):
def detailContent(self, fypage, array,show_name=False):
"""
cms二级数据
:param array:
......@@ -978,7 +980,7 @@ class CMS:
tmp = vod_url.split('$')
vod_class = tmp[0]
vod_url = tmp[1]
obj = thread_pool.submit(self.detailOneVod, vod_url,vod_class)
obj = thread_pool.submit(self.detailOneVod, vod_url,vod_class,show_name)
obj_list.append(obj)
thread_pool.shutdown(wait=True) # 等待所有子线程并行完毕
vod_list = [obj.result() for obj in obj_list]
......
......@@ -222,11 +222,13 @@ def vod_home():
return jsonify(data)
if ac and ids: # 二级
id_list = ids.split(',')
show_name = False
if ids.find('#') > -1:
id_list = list(map(lambda x:x.split('#')[0],id_list))
show_name = True
# print('app:377',len(id_list))
# print(id_list)
data = cms.detailContent(pg,id_list)
data = cms.detailContent(pg,id_list,show_name)
# print(data)
return jsonify(data)
if wd: # 搜索
......
3.6.12
\ No newline at end of file
3.6.13
\ No newline at end of file
......@@ -49,6 +49,7 @@
###### 2022/09/17
- [X] 1.pluto1.5.1最新beta版支持drpy首页推荐点击跳drpy内部聚搜(原理同T4)
- [X] 2.pluto1.5.1最新beta版支持searchable为2的源忽略参与聚搜,正常单一搜索
- [X] 3.drpy源增加内部聚搜进入二级详情页的简介签名备注真实来源规则名
###### 2022/09/16
- [X] 1.规则headers合并优化
- [X] 2.基础js功能修复,如pdfh,request,Object.keys
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册