diff --git a/controllers/cms.py b/controllers/cms.py index ae6fae288209768ff05b3e3ed9a0448b8c60d38f..181dbaed3bf3a7927f796a9c2ec3f8d1ee0aadce 100644 --- a/controllers/cms.py +++ b/controllers/cms.py @@ -34,12 +34,19 @@ class CMS: new_conf = {} self.title = rule.get('title', '') self.id = rule.get('id', self.title) + cate_exclude = rule.get('cate_exclude','') self.lazy = rule.get('lazy', False) self.play_disable = new_conf.get('PLAY_DISABLE',False) self.retry_count = new_conf.get('RETRY_CNT',3) self.lazy_mode = new_conf.get('LAZYPARSE_MODE') self.ocr_api = new_conf.get('OCR_API') self.cate_exclude = new_conf.get('CATE_EXCLUDE','') + if cate_exclude: + if not str(cate_exclude).startswith('|') and not str(self.cate_exclude).endswith('|'): + self.cate_exclude = self.cate_exclude+'|'+cate_exclude + else: + self.cate_exclude += cate_exclude + # print(self.cate_exclude) try: self.vod = redirect(url_for('vod')).headers['Location'] except: @@ -382,7 +389,11 @@ class CMS: # print(url) tag = url if len(p) > 3 and p[3].strip(): - tag = self.regexp(p[3].strip(),url,0) + try: + tag = self.regexp(p[3].strip(),url,0) + except: + logger.info(f'分类匹配错误:{title}对应的链接{url}无法匹配{p[3]}') + continue new_classes.append({ 'type_name': title, 'type_id': tag diff --git a/js/version.txt b/js/version.txt index 448ada3bdaff6ea0c5d059f4c941ff90123c41c6..c4a602db6ef81d557f1cdf3d94559080672cc392 100644 --- a/js/version.txt +++ b/js/version.txt @@ -1 +1 @@ -3.2.5 \ No newline at end of file +3.2.6 \ No newline at end of file diff --git a/models/rules.db b/models/rules.db index 99facc1f6e50ba5290ff96422c9bcae846592ef4..6c473b3bb1266f26a1a0970fedce15eb8895ac57 100644 Binary files a/models/rules.db and b/models/rules.db differ diff --git a/readme.md b/readme.md index 619d9b75ab912633b0981a094fd443b1b59acea9..8f7bb0e4e8785e0601697f696bdb0f3d28536b3d 100644 --- a/readme.md +++ b/readme.md @@ -49,6 +49,8 @@ ###### 2022/09/07 - [X] 1.优化后台管理登录界面,升级更新脚本 - [X] 2.增加了镜像合并脚本(三合一直接拉 hjdhnx/drpy 即可) +- [X] 3.js源增加cate_exlude参数 +- [X] 4.增加腾云驾雾源(二级暂未完善,后面再说) ###### 2022/09/06 - [X] 1.增加了后台管理界面在线检测升级系统功能 - [X] 2.增加了后台管理界面修改直播源地址和同步直播源 @@ -188,6 +190,8 @@ var rule = { class_url:'1&2&3&4',//静态分类标识拼接 //动态分类获取 列表;标题;链接;正则提取 不需要正则的时候后面别加分号 class_parse:'#side-menu:lt(1) li;a&&Text;a&&href;com/(.*?)/', + // 除开全局过滤之外还需要过滤哪些标题不视为分类 + cate_exclude:'', // 服务器解析播放 play_parse:true, // 自定义免嗅