v1.9.8 (#207)

* improves: win_32 improve * open_ended_progress (#206) * cereja: fixes bug in visualize_sample * display: corrige método `__exit__` do Context Manager para finalizar a barra de progresso. * cereja: update version --------- Co-authored-by: Denny <dennyceccon@handtalk.com> * improves: win_32 improve * improves: win_32 improve --------- Co-authored-by: Denny <ceccon.dm@gmail.com> Co-authored-by: Denny <dennyceccon@handtalk.com>
cereja-project · Mar 17, 2024 · b7982cf · b7982cf
1 parent 01c335e
commit b7982cf
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 28 deletions.
diff --git a/cereja/__init__.py b/cereja/__init__.py
@@ -47,7 +47,7 @@
 from . import experimental
 from ._requests import request
 
-VERSION = "1.9.7.final.0"
+VERSION = "1.9.8.final.0"
 __version__ = get_version_pep440_compliant(VERSION)
 
 

diff --git a/cereja/display/_display.py b/cereja/display/_display.py
@@ -1078,6 +1078,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
             self._console.error(
                     f"{os.path.basename(exc_tb.tb_frame.f_code.co_filename)}:{exc_tb.tb_lineno}: {exc_val}"
             )
+        self._iter_finaly = True
         self.stop()
         self._task_count = 0
         self._with_context = False

diff --git a/cereja/hashtools/_hash.py b/cereja/hashtools/_hash.py
@@ -22,6 +22,7 @@
 import binascii
 import hashlib
 import base64 as _b64
+import secrets
 from typing import Union
 
 from cereja import string_to_literal
@@ -54,3 +55,7 @@ def is_base64(content):
         return True
     except binascii.Error:
         return False
+
+
+def random_hash(n_bytes):
+    return secrets.token_hex(nbytes=n_bytes)
diff --git a/cereja/system/_win32.py b/cereja/system/_win32.py
@@ -18,6 +18,7 @@
 try:
     ctypes.windll.user32.SetProcessDPIAware()
 except AttributeError:
+    print("ERRO")
     pass
 
 # Definir MessageBeep
@@ -174,16 +175,28 @@ class Keyboard:
 
     __WM_KEYDOWN = 0x0100
     __WM_KEYUP = 0x0101
-    MAX_TIME_SIMULE_KEY_PRESS = 1
+    MAX_TIME_SIMULE_KEY_PRESS = 0.05
 
     def __init__(self, hwnd=None, is_async=False):
-        self.send_event = PostMessage if is_async else SendMessage
+        self._is_async = is_async
         self.user32 = ctypes.windll.user32
         self._stop_listen = True
         self._hwnd = hwnd
         self._max_time_simule_key_press = self.MAX_TIME_SIMULE_KEY_PRESS
         self._key_press_callbacks = None
 
+
+    @property
+    def is_async(self):
+        return self._is_async
+
+    @is_async.setter
+    def is_async(self, v):
+        self._is_async = bool(v)
+
+    def send_event(self, *args, **kwargs):
+        (PostMessage if self._is_async else SendMessage)(*args, **kwargs)
+
     @property
     def max_time_key_press(self):
         return self._max_time_simule_key_press
@@ -243,7 +256,7 @@ def _press_and_wait(self, key, secs):
     def _press_n_times(self, key, n_times=1):
         for _ in range(n_times):
             self._key_down(key)
-            time.sleep(0.1 + (self._max_time_simule_key_press - (random.random() * self._max_time_simule_key_press)))
+            time.sleep(0.05 + (self._max_time_simule_key_press - (random.random() * self._max_time_simule_key_press)))
         self._key_up(key)
 
     def _key_press(self, key_code, n_times=1, secs=None):
@@ -499,9 +512,12 @@ def pid(self):
 
     @staticmethod
     def _enum_windows_callback(hwnd, lParam):
-        if IsWindowVisible(hwnd):
-            windows = ctypes.cast(lParam, ctypes.py_object).value
-            windows.append(Window(hwnd))
+        try:
+            if IsWindowVisible(hwnd):
+                windows = ctypes.cast(lParam, ctypes.py_object).value
+                windows.append(Window(hwnd))
+        except:
+            return False
         return True
 
     @staticmethod
@@ -602,11 +618,12 @@ def capture_image_bmp(self, filepath=None, only_window_content=True):
         window_dc = GetWindowDC(self.hwnd)
         mem_dc = CreateCompatibleDC(window_dc)
 
-        # Obtenha as dimensões
-        left, top, right, bottom = self.dimensions
+
         if only_window_content:
             width, height = self.size_window_content
         else:
+            # Obtenha as dimensões
+            left, top, right, bottom = self.dimensions
             width = right - left
             height = bottom - top
 
@@ -617,42 +634,41 @@ def capture_image_bmp(self, filepath=None, only_window_content=True):
         # Copie o conteúdo da janela
         PrintWindow(self.hwnd, mem_dc, int(only_window_content))
 
-        # Cria uma imagem em memória a partir do bitmap capturado
+        # Prepara a estrutura BITMAPINFO com os dados da imagem
         bitmap_info = BITMAPINFO()
         bitmap_info.bmiHeader.biSize = ctypes.sizeof(BITMAPINFOHEADER)
         bitmap_info.bmiHeader.biWidth = width
-        bitmap_info.bmiHeader.biHeight = -height  # Negativo indica origem no topo esquerdo
+        bitmap_info.bmiHeader.biHeight = -height  # Negativo para origem no topo
         bitmap_info.bmiHeader.biPlanes = 1
         bitmap_info.bmiHeader.biBitCount = 32
         bitmap_info.bmiHeader.biCompression = BI_RGB
 
-        bitmap_data = ctypes.create_string_buffer(width * height * 4)
-        BitBlt(mem_dc, 0, 0, width, height, window_dc, left, top, SRCCOPY)
-        GetDIBits(mem_dc, screenshot, 0, height, bitmap_data, ctypes.byref(bitmap_info), 0)  # DIB_RGB_COLORS
+        # Cria buffer para os dados da imagem
+        bitmap_data = ctypes.create_string_buffer(abs(bitmap_info.bmiHeader.biWidth * bitmap_info.bmiHeader.biHeight * 4))
+        # Obtém os dados da imagem
+        GetDIBits(mem_dc, screenshot, 0, height, bitmap_data, ctypes.byref(bitmap_info), DIB_RGB_COLORS)
+
+        # Se um filepath foi fornecido, salva a imagem como um arquivo BMP
         if filepath:
-            # Escrevendo os dados em um arquivo BMP
             with open(filepath, 'wb') as bmp_file:
-                # Cabeçalho do arquivo
+                # Escreve o cabeçalho do arquivo BMP
                 bmp_file.write(b'BM')
                 size = 54 + len(bitmap_data.raw)  # 54 bytes para o cabeçalho BMP
-                bmp_file.write(ctypes.c_uint32(size).value.to_bytes(4, byteorder='little'))
-                bmp_file.write(b'\x00\x00')  # Reservado
-                bmp_file.write(b'\x00\x00')  # Reservado
-                bmp_file.write((54).to_bytes(4, byteorder='little'))  # Offset para início dos dados da imagem
-
-                # Cabeçalho da imagem
-                bmp_file.write(bitmap_info.bmiHeader)
-
-                # Dados da imagem
+                bmp_file.write(size.to_bytes(4, 'little'))
+                bmp_file.write((0).to_bytes(4, 'little'))  # Reservado
+                bmp_file.write((54).to_bytes(4, 'little'))  # Offset dos dados da imagem
+                # Escreve o cabeçalho da imagem
+                bmp_file.write(ctypes.string_at(ctypes.byref(bitmap_info.bmiHeader), ctypes.sizeof(BITMAPINFOHEADER)))
+                # Escreve os dados da imagem
                 bmp_file.write(bitmap_data.raw)
-        raw = bitmap_data.raw
+
         # Limpeza
         DeleteObject(screenshot)
         DeleteDC(mem_dc)
         ReleaseDC(self.hwnd, window_dc)
-        DeleteObject(bitmap_data)
 
-        return raw
+        return bitmap_data.raw
+
 
     # SHOW implements
     def hide(self):