ok-script 0.0.70__tar.gz → 0.0.71__tar.gz

{ok-script-0.0.70 → ok-script-0.0.71}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.70
+Version: 0.0.71
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok-script-0.0.70 → ok-script-0.0.71}/ok/firebase/FireBaseAnalytics.py

@@ -2,7 +2,6 @@ import ctypes
 import json
 import locale
 import random
-import time
 import uuid
 from urllib.parse import urlencode
 
@@ -93,35 +92,38 @@ class FireBaseAnalytics:
             'v': '2',
             'tid': self.measurement_id,
             'gtm': '45je4630v9186643593za200',
-            '_p': random_number(),
+            '_p': 312721869,  # random_number(),
             # 'gcd': '13l3l3l3l1',
-            'npa': '0',
-            'dma': '0',
-            'tag_exp': '0',
+            # 'npa': '0',
+            # 'dma': '0',
+            # 'tag_exp': '0',
             'cid': self.client_id,
             'ul': locale.getdefaultlocale()[0],
             'sr': get_screen_resolution(),
-            'uaa': 'x86',
-            'uab': '64',
+            # 'uaa': 'x86',
+            # 'uab': '64',
             # 'uafvl': 'Microsoft Edge;125.0.2535.85|Chromium;125.0.6422.142|Not.A/Brand;24.0.0.0',
-            'uamb': '0',
-            'uam': '',
-            'uap': 'Windows',
-            'uapv': '15.0.0',
-            'uaw': '0',
-            'are': '1',
-            'frm': '0',
-            'pscdl': 'noapi',
+            # 'uamb': '0',
+            # 'uam': '',
+            # 'uap': 'Windows',
+            # 'uapv': '15.0.0',
+            # 'uaw': '0',
+            # 'are': '1',
+            # 'frm': '0',
+            # 'pscdl': 'noapi',
+
+            '_z': 'ccd.v9B',
             '_s': '1',
-            'sid': int(time.time()),
-            'sct': '1',
-            'seg': '1',
+            # 'sid': int(time.time()),
+            # 'sct': '1',
+            # 'seg': '1',
             'dl': 'https://ok-script.com/',
-            'dt': 'AppStartGTAG2',
+            'dt': 'AppStartGTAG3',
             'en': 'page_view',
             '_ee': '1',
-            'ep.version': self.app_config.get('version')
+            # 'ep.version': self.app_config.get('version')
             # 'tfd': '5133'
+            '_fv': 1
         }
         if self._fv:
             params['_fv'] = self._fv
@@ -135,7 +137,7 @@ class FireBaseAnalytics:
         }
         query_string = urlencode(params)
 
-        response = requests.post(f'{GTAG_ENDPOINT}', data=params)
+        response = requests.post(f'{GTAG_ENDPOINT}', headers=headers, data=params)
 
         logger.debug(f'send gtag {GTAG_ENDPOINT}?{query_string}')
         if response.status_code == 204:

{ok-script-0.0.70 → ok-script-0.0.71}/ok/gui/resources.py

@@ -1336,7 +1336,7 @@ qt_resource_struct = b"\
 \x00\x00\x00>\x00\x01\x00\x00\x00\x01\x00\x00$\x89\
 \x00\x00\x01\x8e2\xed>\xd3\
 \x00\x00\x00(\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x8f\xebq4l\
+\x00\x00\x01\x8f\xed\xe0Nr\
 \x00\x00\x00T\x00\x02\x00\x00\x00\x05\x00\x00\x00\x0d\
 \x00\x00\x00\x00\x00\x00\x00\x00\
 \x00\x00\x00b\x00\x02\x00\x00\x00\x05\x00\x00\x00\x08\

{ok-script-0.0.70 → ok-script-0.0.71}/ok/gui/widget/StartLoadingDialog.py

@@ -50,7 +50,7 @@ class StartLoadingDialog(MaskDialogBase):
 
     def set_seconds_left(self, seconds_left: int):
         self.seconds_left = seconds_left
-        text = self.tr(f'Starting, timeout after {seconds_left} seconds.').format(self.seconds_left)
+        text = self.tr('Starting, timeout after {seconds_left} seconds.').format(seconds_left=self.seconds_left)
         self.loading_label.setText(f'<h2>{text}</h2>')
 
     def update_countdown(self):

{ok-script-0.0.70 → ok-script-0.0.71}/ok/ocr/OCR.py

@@ -73,10 +73,10 @@ class OCR:
             return sort_boxes(detected_boxes)
 
     def wait_click_ocr(self, x=0, y=0, to_x=1, to_y=1, width=0, height=0, box=None, name=None, match=None, threshold=0,
-                       frame=None, target_height=0):
+                       frame=None, target_height=0, time_out=0):
         box = self.wait_ocr(x, y, width=width, height=height, to_x=to_x, to_y=to_y, box=box, name=name, match=match,
                             threshold=threshold,
-                            frame=frame, target_height=target_height)
+                            frame=frame, target_height=target_height, time_out=time_out)
         if box is not None:
             self.click_box(box)
             return box

{ok-script-0.0.70 → ok-script-0.0.71}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ok-script
-Version: 0.0.70
+Version: 0.0.71
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok-script-0.0.70 → ok-script-0.0.71}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setuptools.setup(
     name="ok-script",
-    version="0.0.70",
+    version="0.0.71",
     author="ok-oldking",
     author_email="firedcto@gmail.com",
     description="Automation with Computer Vision for Python",