v2.2.7: 修复获取评论数的正则表达式，兼容评论为空的情况 (#130)，优化测试 (#131)

Author: hect0x7

src/jmcomic/__init__.py

@@ -2,7 +2,7 @@
 # 被依赖方 <--- 使用方
 # config <--- entity <--- toolkit <--- client <--- option <--- downloader
 
-__version__ = '2.2.6'
+__version__ = '2.2.7'
 
 from .api import *
 from .jm_plugin import *

src/jmcomic/jm_entity.py

@@ -321,7 +321,7 @@ def __init__(self,
 
         self.likes: str = likes  # [1K] 點擊喜歡
         self.views: str = views  # [40K] 次觀看
-        self.comment_count = int(comment_count)
+        self.comment_count: int = self.__parse_comment_count(comment_count)  # 评论数
         self.work_list: List[str] = work_list  # 作品
         self.actor_list: List[str] = actor_list  # 登場人物
         self.tag_list: List[str] = tag_list  # 標籤
@@ -368,6 +368,21 @@ def not_exist(episode):
 
         return ret
 
+    # noinspection PyMethodMayBeStatic
+    def __parse_comment_count(self, comment_count: str) -> int:
+        if comment_count == '':
+            return 0
+
+        try:
+            from .jm_toolkit import JmcomicText
+            match = JmcomicText.pattern_total_video_comments.search(comment_count)
+            if match is None:
+                return 0
+            return int(match[1])
+        except ValueError:
+            jm_debug('regular.error', f'评论数匹配失败: {comment_count}')
+            return 0
+
     def create_photo_detail(self, index) -> Tuple[JmPhotoDetail, Tuple]:
         # 校验参数
         length = len(self.episode_list)
@@ -407,7 +422,7 @@ def __iter__(self) -> Generator[JmPhotoDetail, Any, None]:
         return super().__iter__()
 
 
-class JmSearchPage(JmBaseEntity, IterableEntity):
+class JmSearchPage(JmBaseEntity):
 
     def __init__(self, album_info_list: List[Tuple[str, str, StrNone, StrNone, List[str]]]):
         # (album_id, title, category_none, label_sub_none, tag_list)
@@ -416,12 +431,9 @@ def __init__(self, album_info_list: List[Tuple[str, str, StrNone, StrNone, List[
     def __len__(self):
         return len(self.album_info_list)
 
-    def __getitem__(self, item):
+    def __getitem__(self, item) -> Tuple[str, str]:
         return self.album_info_list[item][0:2]
 
-    def __iter__(self) -> Generator[List[str], Any, None]:
-        return super().__iter__()
-
     @property
     def single_album(self) -> JmAlbumDetail:
         return getattr(self, 'album')

src/jmcomic/jm_toolkit.py

@@ -52,8 +52,13 @@ class JmcomicText:
     pattern_html_album_likes = compile('<span id="albim_likes_\d+">(.*?)</span>')
     # 觀看
     pattern_html_album_views = compile('<span>(.*?)</span> 次觀看')
-    # 評論
-    pattern_html_album_comment_count = compile('<div class="badge" id="total_video_comments">(\d+)</div></a></li>')
+    # 評論(div)
+    pattern_html_album_comment_count = compile(
+        'forum-open btn btn-primary" .*>\w{2}\n'
+        '(<div class="badge" id="total_video_comments">(\d+)</div>|)?'
+    )
+    # 评论(number)
+    pattern_total_video_comments = compile('<div class="badge" id="total_video_comments">(\d+)</div>')
 
     @classmethod
     def parse_to_jm_domain(cls, text: str):

tests/test_jmcomic/test_jm_api.py

@@ -43,59 +43,6 @@ def test_batch(self):
         ret2 = jmcomic.download_album((e for e in album_ls), self.option)
         self.assertEqual(len(ret2), len(album_ls), 'Generator')
 
-    def test_photo_sort(self):
-        client = self.option.build_jm_client()
-
-        # 测试用例 - 单章本子
-        single_photo_album_is = str_to_list('''
-        430371
-        438696
-        432888
-        ''')
-
-        # 测试用例 - 多章本子
-        multi_photo_album_is = str_to_list('''
-        400222
-        122061
-        ''')
-
-        photo_dict: Dict[str, JmPhotoDetail] = multi_call(client.get_photo_detail, single_photo_album_is)
-        album_dict: Dict[str, JmAlbumDetail] = multi_call(client.get_album_detail, single_photo_album_is)
-
-        for each in photo_dict.values():
-            each: JmPhotoDetail
-            self.assertEqual(each.album_index, 1)
-
-        for each in album_dict.values():
-            each: JmAlbumDetail
-            self.assertEqual(each[0].album_index, 1)
-
-        print_eye_catching('【通过】测试用例 - 单章本子')
-        multi_photo_album_dict: Dict[JmAlbumDetail, List[JmPhotoDetail]] = {}
-
-        def run(aid):
-            album = client.get_album_detail(aid)
-
-            photo_dict = multi_call(
-                client.get_photo_detail,
-                (photo.photo_id for photo in album),
-                launcher=thread_pool_executor,
-            )
-
-            multi_photo_album_dict[album] = list(photo_dict.values())
-
-        multi_thread_launcher(
-            iter_objs=multi_photo_album_is,
-            apply_each_obj_func=run,
-        )
-
-        for album, photo_ls in multi_photo_album_dict.items():
-            self.assertListEqual(
-                sorted([each.sort for each in album]),
-                sorted([ans.sort for ans in photo_ls]),
-                album.album_id
-            )
-
     def test_get_jmcomic_url(self):
         func_list = {
             self.client.get_jmcomic_url,
@@ -125,80 +72,3 @@ def run_func_async(func):
             print(e)
 
         raise AssertionError(exception_list)
-
-    def test_getitem_and_slice(self):
-        cl: JmcomicClient = self.client
-        cases = [
-            ['400222', 0, [400222]],
-            ['400222', 1, [413446]],
-            ['400222', (None, 1), [400222]],
-            ['400222', (1, 3), [413446, 413447]],
-            ['413447', (1, 3), [2, 3], []],
-        ]
-
-        for [jmid, slicearg, *args] in cases:
-            ans = args[0]
-
-            if len(args) == 1:
-                func = cl.get_album_detail
-            else:
-                func = cl.get_photo_detail
-
-            jmentity = func(jmid)
-
-            ls: List[Union[JmPhotoDetail, JmImageDetail]]
-            if isinstance(slicearg, int):
-                ls = [jmentity[slicearg]]
-            elif len(slicearg) == 2:
-                ls = jmentity[slicearg[0]: slicearg[1]]
-            else:
-                ls = jmentity[slicearg[0]: slicearg[1]: slicearg[2]]
-
-            if len(args) == 1:
-                self.assertListEqual(
-                    list1=[int(e.id) for e in ls],
-                    list2=ans,
-                )
-            else:
-                self.assertListEqual(
-                    list1=[int(e.img_file_name) for e in ls],
-                    list2=ans,
-                )
-
-    def test_search_advanced(self):
-        elist = []
-
-        def search_and_test(expected_result, params):
-            try:
-                page = self.client.search_site(**params)
-                print(page)
-                assert int(page[0][0]) == expected_result
-            except Exception as e:
-                elist.append(e)
-
-        # 定义测试用例
-        cases = {
-            152637: {
-                'search_query': '无修正',
-                'order_by': JmSearchAlbumClient.ORDER_BY_LIKE,
-                'time': JmSearchAlbumClient.TIME_ALL,
-            },
-            147643: {
-                'search_query': '无修正',
-                'order_by': JmSearchAlbumClient.ORDER_BY_PICTURE,
-                'time': JmSearchAlbumClient.TIME_ALL,
-            },
-        }
-
-        multi_thread_launcher(
-            iter_objs=cases.items(),
-            apply_each_obj_func=search_and_test,
-        )
-
-        if len(elist) == 0:
-            return
-
-        for e in elist:
-            print(e)
-
-        raise AssertionError(elist)