Fix: De-redundancy of daily commissions

- Fix typo of intersect_by_eq

module/commission/commission.py

@@ -1,3 +1,5 @@
+import copy
+
 from scipy import signal
 
 from module.base.timer import Timer
@@ -52,6 +54,8 @@ class RewardCommission(UI, InfoHandler):
         for y in peaks:
             comm = Commission(image, y=y, config=self.config)
             logger.attr('Commission', comm)
+            repeat = len([c for c in commission if c == comm])
+            comm.repeat_count += repeat
             commission.append(comm)
 
         return SelectedGrids(commission)
@@ -97,8 +101,8 @@ class RewardCommission(UI, InfoHandler):
 
         # Separate daily and urgent
         run = run[:self.max_commission - running_count]
-        daily_choose = run.intersect_by_ed(daily)
-        urgent_choose = run.intersect_by_ed(urgent)
+        daily_choose = run.intersect_by_eq(daily)
+        urgent_choose = run.intersect_by_eq(urgent)
         if daily_choose:
             logger.info('Choose daily commission')
             for comm in daily_choose:
@@ -262,6 +266,8 @@ class RewardCommission(UI, InfoHandler):
             is_urgent (bool):
         """
         logger.hr('Commission find and start', level=2)
+        comm = copy.deepcopy(comm)
+        comm.repeat_count = 1
         logger.info(f'Finding commission {comm}')
         for _ in range(15):
             new = self._commission_detect(self.device.image)

module/commission/project.py

@@ -88,6 +88,7 @@ class Commission:
             self.valid = False
 
         self.create_time = datetime.now()
+        self.repeat_count = 1
         self.category_str = 'unknown'
         self.genre_str = 'unknown'
         self.duration_hour = 'unknown'
@@ -275,16 +276,16 @@ class Commission:
         self.status = dic[int(np.argmax(color))]
 
     def __str__(self):
-        if self.valid:
-            if self.expire:
-                return f'{self.name} | {self.suffix} ' \
-                    f'(Genre: {self.genre}, Status: {self.status}, Duration: {self.duration}, Expire: {self.expire})'
-            else:
-                return f'{self.name} | {self.suffix} ' \
-                    f'(Genre: {self.genre}, Status: {self.status}, Duration: {self.duration})'
-        else:
-            return f'{self.name} | {self.suffix} ' \
-                f'(Invalid)'
+        name = f'{self.name} | {self.suffix}'
+        if not self.valid:
+            return f'{name} (Invalid)'
+        info = {'Genre': self.genre, 'Status': self.status, 'Duration': self.duration}
+        if self.expire:
+            info['Expire'] = self.expire
+        if self.repeat_count > 1:
+            info['Repeat'] = self.repeat_count
+        info = ', '.join([f'{k}: {v}' for k, v in info.items()])
+        return f'{name} ({info})'
 
     def __eq__(self, other):
         """
@@ -317,6 +318,8 @@ class Commission:
         if self.expire and other.expire:
             if (other.expire < self.expire - threshold) or (other.expire > self.expire + threshold):
                 return False
+        if self.repeat_count != other.repeat_count:
+            return False
 
         return True
 

module/map/map_grids.py

@@ -157,7 +157,7 @@ class SelectedGrids:
         """
         return SelectedGrids(list(set(self.grids).intersection(set(grids.grids))))
 
-    def intersect_by_ed(self, grids):
+    def intersect_by_eq(self, grids):
         """
         Another `intersect()` method, but de-duplicates with `__eq__` instead of `__hash__`.