v1.9.18

* 过滤规则支持促销过滤，可实现按FREE排序择优，取消了站点的促销属性 * 修复了个别问题
d960124 · Aug 7, 2022 · 31ef449 · 31ef449
1 parent ec62d63
commit 31ef449
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/pt/indexer/indexer.py b/pt/indexer/indexer.py
@@ -183,14 +183,14 @@ def __search(self, order_seq, indexer, key_word, filter_args: dict, match_type,
                 match_flag, res_order, _ = self.filterrule.check_rules(meta_info=meta_info,
                                                                        rolegroup=filter_args.get("rule"))
                 if not match_flag:
-                    log.info(f"【{self.index_type}】{torrent_name} {str_filesize(size)} 不符合订阅过滤规则")
+                    log.info(f"【{self.index_type}】{torrent_name} 大小：{str_filesize(meta_info.size)} 促销：{meta_info.get_volume_factor_string()} 不符合订阅过滤规则")
                     index_rule_fail += 1
                     continue
             # 使用默认规则
             else:
                 match_flag, res_order, _ = self.filterrule.check_rules(meta_info=meta_info)
                 if match_type == 1 and not match_flag:
-                    log.info(f"【{self.index_type}】{torrent_name} {str_filesize(size)} 不符合默认过滤规则")
+                    log.info(f"【{self.index_type}】{torrent_name} 大小：{str_filesize(meta_info.size)} 促销：{meta_info.get_volume_factor_string()} 不符合默认过滤规则")
                     index_rule_fail += 1
                     continue
 

diff --git a/pt/rss.py b/pt/rss.py
@@ -135,7 +135,7 @@ def rssdownload(self):
                         # 种子大小
                         size = res.get('size')
 
-                        log.debug("【RSS】开始处理：%s" % torrent_name)
+                        log.info("【RSS】开始处理：%s" % torrent_name)
 
                         # 检查这个种子是不是下过了
                         if is_torrent_rssd(enclosure):
@@ -160,15 +160,11 @@ def rssdownload(self):
                             site_rule=site_rule_group,
                             site_cookie=rss_cookie)
                         if match_rssid is not None:
-                            log.info("【RSS】%s: %s %s %s 匹配成功" % (media_info.type.value,
-                                                                 media_info.get_title_string(),
-                                                                 media_info.get_season_episode_string(),
-                                                                 media_info.get_resource_type_string()))
+                            log.info("【RSS】%s %s%s 匹配成功" % (media_info.org_string,
+                                                            media_info.get_title_string(),
+                                                            media_info.get_season_episode_string()))
                         else:
-                            log.info("【RSS】%s: %s %s %s 不匹配订阅" % (media_info.type.value,
-                                                                  media_info.get_title_string(),
-                                                                  media_info.get_season_episode_string(),
-                                                                  media_info.get_resource_type_string()))
+                            log.info("【RSS】%s %s 不匹配订阅" % (media_info.org_string, media_info.get_title_string()))
                             continue
 
                         # 非模糊匹配命中

diff --git a/version.py b/version.py
@@ -1 +1 @@
-APP_VERSION = 'v1.9.17'
+APP_VERSION = 'v1.9.18'