"Signal №1" bot adaptation

broker_manager_gui.py

@@ -3,7 +3,6 @@
 import logging
 import pyautogui
 import pyperclip
-import pytz
 import time
 
 import geometry_2d
@@ -13,26 +12,29 @@
 logger = logging.getLogger('pyFinance')
 
 
+def repeater(action):
+    def repeat_action(*args, **kvargs):
+        tries = 5
+        for k in range(tries):
+            if action(*args, **kvargs):
+                logger.debug('Check {} - True'.format(action.__name__))
+                return
+            logger.debug('Check {} - False'.format(action.__name__))
+        # при всех неудачных попытках кидаем исключение об ошибке
+        raise RuntimeError('{} setting error'.format(action.__name__))
+    return repeat_action
+
+
 class BrokerManagerGui(BrokerManagerInterface):
-    TRY_COUNT = 3
+    TRY_COUNT = 5
 
     def __init__(self, result_handler, config_file):
         super().__init__(result_handler)
 
         with open(config_file, 'r') as cf:
             self.config = json.load(cf)
 
-        self.exp_hour_buttons = geometry_2d.get_matrix(
-            m_size=geometry_2d.Vector(x=6, y=4),
-            start=geometry_2d.Vector(**self.config['buttons']['expiration_time']['first_hour']),
-            delta=geometry_2d.Vector(**self.config['buttons']['expiration_time']['delta'])
-        )
-
-        self.exp_minute_buttons = geometry_2d.get_matrix(
-            m_size=geometry_2d.Vector(x=3, y=4),
-            start=geometry_2d.Vector(**self.config['buttons']['expiration_time']['first_minute']),
-            delta=geometry_2d.Vector(**self.config['buttons']['expiration_time']['delta'])
-        )
+        self.interval_deal_time = None
 
         self.option_buttons = dict(zip(
             BrokerManagerInterface.OPTION_LIST,
@@ -51,76 +53,124 @@ def __init__(self, result_handler, config_file):
             ]
         ))
 
+        # Устанавливаем начальный опцион
+        self.current_option = None
+        try:
+            self.click_option('EURUSD')
+        except:
+            pass
+
+        self.option_buttons['CADCHF'] = self.option_buttons['CADJPY']
+
     def _get_deal_result(self):
         self.is_deal = False
 
         result = ''
         windows_manager.activate_window('Прозрачный брокер бинарных опционов')
+
+        # открываем графу сделок "открытые"
+        pyautogui.doubleClick(
+            self.config['buttons']['opened']['x'],
+            self.config['buttons']['opened']['y'],
+            duration=0.1
+        )
+        time.sleep(5)
+
         for k in range(BrokerManagerGui.TRY_COUNT):
-            pyperclip.copy("")  # <- Это предотвращает замену последней копии текущей копией null.
-            pyautogui.doubleClick(self.config['fields']['result']['x'], self.config['fields']['result']['y'])
-            pyautogui.hotkey('ctrl', 'c')
-            time.sleep(1)  # ctrl-c обычно работает очень быстро, но ваша программа может выполняться быстрее
-            result = pyperclip.paste()
+            result = self.get_field('result')
             if result in ['LOSE', 'WIN']:
                 break
             time.sleep(5)
 
         # If result not in ['LOSE', 'WIN'] return as is
         self.result_handler(result)
 
+    def set_field(self, field, value):
+        pyautogui.doubleClick(
+            self.config['fields'][field]['x'],
+            self.config['fields'][field]['y'],
+            duration=0.1
+        )
+        time.sleep(0.5)
+        pyautogui.write(str(value), interval=0.25)
+        time.sleep(0.5)
+
+    def get_field(self, field, use_mouse=False):
+        pyperclip.copy("")  # <- Это предотвращает замену последней копии текущей копией null.
+
+        pyautogui.doubleClick(
+            self.config['fields'][field]['x'],
+            self.config['fields'][field]['y'],
+            duration=0.1
+        )
+        time.sleep(0.5)
+
+        if use_mouse:
+            pyautogui.rightClick(
+                self.config['fields'][field]['x'],
+                self.config['fields'][field]['y'],
+                duration=0.1
+            )
+            time.sleep(0.5)
+
+            pyautogui.click(
+                self.config['fields'][field]['x'] + self.config['context_menu']['copy']['x'],
+                self.config['fields'][field]['y'] + self.config['context_menu']['copy']['y'],
+                duration=0.1
+            )
+        else:
+            # ctrl-c обычно работает очень быстро, но ваша программа может выполняться быстрее
+            pyautogui.hotkey('ctrl', 'c')
+
+        time.sleep(0.5)
+        return pyperclip.paste()
+
+    @repeater
+    def try_set_field(self, field, value, use_mouse=False):
+        self.set_field(field, value)
+        return self.get_field(field, use_mouse) == str(value)
+
+    @repeater
+    def set_expiration_time(self, finish_datetime):
+        self.interval_deal_time = int((finish_datetime - datetime.datetime.now()).total_seconds() // 60)
+        self.set_field('expiration_time', self.interval_deal_time)
+        return self.get_field('expiration_time') == str(self.interval_deal_time)
+
+    def click_option(self, option):
+        @repeater
+        def click_option_button(point, screenshot):
+            pyautogui.click(point.x, point.y, duration=0.1)
+            time.sleep(3)
+            screenshot_new = pyautogui.screenshot(region=(point.x - 5, point.y - 5, point.x + 5, point.y + 5))
+            if screenshot == screenshot_new:
+                return False
+            self.current_option = option
+            return True
+
+        if self.current_option == option:
+            return
+
+        point = self.option_buttons[option]
+        screenshot = pyautogui.screenshot(region=(point.x - 5, point.y - 5, point.x + 5, point.y + 5))
+
+        click_option_button(point, screenshot)
+
+
     def make_deal(self, option, prognosis, summ, deal_time):
         if self.is_deal:
-            logger.info('Deal is active now, skip new deal.')
+            logger.info('Deal is active now, skip new deal.\n')
             return
 
         windows_manager.activate_window('Прозрачный брокер бинарных опционов')
-        pyautogui.click(self.option_buttons[option].x, self.option_buttons[option].y, duration=0.1)
-        time.sleep(2)
 
-        for k in range(self.TRY_COUNT):
-            pyautogui.doubleClick(
-                self.config['fields']['investment_money']['x'],
-                self.config['fields']['investment_money']['y'],
-                duration=0.1
-            )
-            time.sleep(1)
-            pyautogui.write(str(summ), interval=0.25)
-            time.sleep(1)
+        finish_datetime = datetime.datetime.now() + datetime.timedelta(minutes=deal_time)
+
+        self.click_option(option)
+        self.try_set_field('investment_money', summ, use_mouse=True)
+        self.set_expiration_time(finish_datetime)
 
-        pyautogui.click(
-            self.config['fields']['expiration_time']['x'],
-            self.config['fields']['expiration_time']['y'],
-            duration=0.1
-        )
-        time.sleep(2)
-        pyautogui.click(self.exp_hour_buttons[deal_time.hour].x, self.exp_hour_buttons[deal_time.hour].y, duration=0.1)
-        time.sleep(2)
-        pyautogui.click(
-            self.exp_minute_buttons[deal_time.minute // 5].x,
-            self.exp_minute_buttons[deal_time.minute // 5].y,
-            duration=0.1
-        )
-        time.sleep(2)
         pyautogui.click(self.prognosis_table[prognosis].x, self.prognosis_table[prognosis].y, duration=0.1)
         self.is_deal = True
 
-        # Set up timer on finish job
-        msk_tz = pytz.timezone('Europe/Moscow')
-        now_date = datetime.datetime.now(msk_tz)
-        finish_datetime = msk_tz.localize(
-            datetime.datetime(
-                now_date.year,
-                now_date.month,
-                now_date.day,
-                deal_time.hour,
-                deal_time.minute
-            )
-        )
-        if deal_time.hour in [0, 1]:
-            finish_datetime += datetime.timedelta(days=1)
-        finish_datetime = finish_datetime.astimezone()
-
-        logger.debug("finish_datetime={}".format(finish_datetime))
-
+        finish_datetime = datetime.datetime.now() + datetime.timedelta(minutes=self.interval_deal_time)
         self.scheduler.add_job(self._get_deal_result, 'date', run_date=finish_datetime)

broker_manager_gui_luzin_config.json

@@ -34,6 +34,10 @@
                 "x": 1250,
                 "y": 340
             }
+        },
+        "opened": {
+            "x": 1213,
+            "y": 415
         }
     },
 
@@ -48,7 +52,14 @@
         },
         "result": {
             "x": 1330,
-            "y": 462
+            "y": 470
+        }
+    },
+
+    "context_menu": {
+        "copy": {
+            "x": 44,
+            "y": 85
         }
     }
 }

broker_manager_gui_nick_config.json

@@ -4,11 +4,11 @@
         "expiration_time": {
             "first_hour": {
                 "x": 585,
-                "y": 219
+                "y": 231
             },
             "first_minute": {
                 "x": 831,
-                "y": 219
+                "y": 231
             },
             "delta": {
                 "x": 39,
@@ -18,7 +18,7 @@
         "option": {
             "first": {
                 "x": 164,
-                "y": 146
+                "y": 159
             },
             "delta": {
                 "x": 54,
@@ -28,27 +28,38 @@
         "prognosis": {
             "call": {
                 "x": 824,
-                "y": 351
+                "y": 363
             },
             "put": {
                 "x": 944,
-                "y": 351
+                "y": 363
             }
+        },
+        "opened": {
+            "x": 866,
+            "y": 412
         }
     },
 
     "fields": {
         "investment_money": {
             "x": 851,
-            "y": 156
+            "y": 168
         },
         "expiration_time": {
             "x": 911,
-            "y": 156
+            "y": 168
         },
         "result": {
-            "x": 983,
-            "y": 457
+            "x": 987,
+            "y": 470
+        }
+    },
+
+    "context_menu": {
+        "copy": {
+            "x": 52,
+            "y": 91
         }
     }
 }

broker_manager_interface.py

@@ -5,7 +5,7 @@
 class BrokerManagerInterface:
     OPTION_LIST = (
         'AUDCAD', 'AUDJPY', 'AUDUSD', 'EURAUD', 'EURCHF', 'EURJPY', 'GBPAUD', 'GBPJPY', 'NZDJPY', 'USDCAD', 'USDJPY',
-        'AUDCHF', 'AUDNZD', 'CADJPY', 'EURCAD', 'EURGBP', 'EURUSD', 'GBPCHF', 'GBPNZD', 'NZDUSD', 'USDCHF'
+        'AUDCHF', 'AUDNZD', 'CADJPY', 'EURCAD', 'EURGBP', 'EURUSD', 'GBPCHF', 'GBPNZD', 'NZDUSD', 'USDCHF', 'CADCHF'
     )
     PROGNOSIS_LIST = ('вверх', 'вниз')