fix

pur1fying · Feb 17, 2024 · 0bfedd8 · 0bfedd8
1 parent 437e62c
commit 0bfedd8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/core/picture.py b/core/picture.py
@@ -35,10 +35,12 @@ def co_detect(self, rgb_ends=None, rgb_possibles=None, img_ends=None, img_possib
                 img_ends = [img_ends]
             for i in range(0, len(img_ends)):
                 threshold = 0.8
-                if len(img_ends[i]) == 2:
+                img_name = img_ends[i]
+                if type(img_ends[i]) is tuple:
+                    img_name = img_ends[i][0]
                     threshold = img_ends[i][1]
-                if image.compare_image(self, img_ends[i],  False, threshold):
-                    self.logger.info('end : ' + img_ends[i])
+                if image.compare_image(self, img_name,  False, threshold):
+                    self.logger.info('end : ' + img_name)
                     return img_ends[i]
         f = 0
         if rgb_possibles is not None:

diff --git a/module/main_story.py b/module/main_story.py
@@ -13,15 +13,15 @@ def implement(self):
     self.quick_method_to_main_page()
     to_main_story(self, True)
     push_episode_list = self.config['main_story_regions']
-    if type(push_episode_list) is not list:
-        push_episode_list = [push_episode_list]
     if not push_episode_list:
         default_list = {
             'CN': [1, 2, 3],
             'Global': [1, 2, 3, 4, 5, 4],
             'JP': [1, 2, 3, 4, 5, 4, 6]
         }
         push_episode_list = default_list[self.server]
+    if type(push_episode_list) is not list:
+        push_episode_list = [push_episode_list]
     for i in range(0, len(push_episode_list)):
         current_episode = push_episode_list[i]
         is_final = False