Merge pull request #59 from JE-Chen/dev

Dev

Author: JE-Chen

.idea/workspace.xml

@@ -1 +1 @@
-## Pls read README.md, thanks.
+# Pls Read README Thanks

LEARN.md

@@ -1,18 +1,18 @@
-# je_auto_control
+# AutoControl
 
 ---
 
-### JE Auto Control as a tool for GUI Testing 
-#### Features
-* Image Detect
-* Keyboard Event
-* Mouse Event
-* Screen 
-* Action file and executor
-* Record Event
-* CLI with action file
-* Generate HTML Report
-* Timeout
+## AutoControl as a tool for GUI Testing 
+### Features
+*  Image Detect
+*  Keyboard Event
+*  Mouse Event
+*  Screen 
+*  Action file and executor
+*  Record Event
+*  CLI with action file
+*  Generate HTML Report
+*  Timeout
 
 ---
 
@@ -36,19 +36,19 @@ pip install je_auto_control
 
 ## Info
 
-* requirement
-    * Python 3.7 & later
-    * pip 19.3 & later
+*  requirement
+    *  Python 3.7 & later
+    *  pip 19.3 & later
 
 
-* Dev env
-    * windows 11
-    * osx 11 big sur
-    * ubuntu 20.0.4
+*  Dev env
+    *  windows 11
+    *  osx 11 big sur
+    *  ubuntu 20.0.4
 
 
-* Test on
-    * windows 10 ~ 11
-    * osx 10.5 ~ 11 big sur
-    * ubuntu 20.0.4
-    * raspberry pi 3B and 4B
+*  Test on
+    *  windows 10 ~ 11
+    *  osx 10.5 ~ 11 big sur
+    *  ubuntu 20.0.4
+    *  raspberry pi 3B and 4B

README.md

@@ -6,7 +6,6 @@
     server = start_autocontrol_socket_server()
     while not server.close_flag:
         pass
-    else:
-        sys.exit(0)
+    sys.exit(0)
 except Exception as error:
     print(repr(error))

autocontrol_driver/generate_autocontrol_driver.py

@@ -2,6 +2,27 @@
 import all wrapper function
 """
 
+__all__ = [
+    "click_mouse", "mouse_table", "position", "press_mouse", "release_mouse",
+    "scroll", "set_position", "special_table",
+    "keys_table", "press_key", "release_key", "type_key", "check_key_is_press",
+    "write", "hotkey",
+    "size", "screenshot",
+    "locate_all_image", "locate_image_center", "locate_and_click",
+    "CriticalExit",
+    "AutoControlException", "AutoControlKeyboardException",
+    "AutoControlMouseException", "AutoControlCantFindKeyException",
+    "AutoControlScreenException", "ImageNotFoundException",
+    "AutoControlJsonActionException", "AutoControlRecordException",
+    "AutoControlActionNullException", "AutoControlActionException",
+    "record", "stop_record",
+    "read_action_json", "write_action_json",
+    "execute_action", "execute_files", "executor", "add_command_to_executor",
+    "multiprocess_timeout", "test_record_instance",
+    "screenshot",
+    "generate_html",
+    "get_dir_files_as_list", "create_template_dir", "start_autocontrol_socket_server"
+]
 
 # import mouse
 from je_auto_control.wrapper.auto_control_mouse import click_mouse
@@ -66,7 +87,7 @@
 from je_auto_control.utils.test_record.record_test_class import test_record_instance
 
 # utils image
-from je_auto_control.wrapper.auto_control_image import screenshot
+from je_auto_control.utils.image.screenshot import pil_screenshot
 
 # html report
 from je_auto_control.utils.html_report.html_report_generate import generate_html

je_auto_control/__init__.py

@@ -8,7 +8,6 @@
 
 import os
 from Xlib.display import Display
-"""
-get x system display
-"""
+
+# get x system display
 display = Display(os.environ['DISPLAY'])

je_auto_control/linux_with_x11/core/utils/x11_linux_display.py

@@ -7,12 +7,11 @@
     raise AutoControlException(linux_import_error)
 
 import Xlib
-from Xlib import XK
 from je_auto_control.linux_with_x11.core.utils.x11_linux_display import display
 
-"""
-x11 linux virtual keycode
-"""
+
+# x11 linux virtual keycode
+
 x11_linux_key_backspace = display.keysym_to_keycode(Xlib.XK.string_to_keysym("BackSpace"))
 x11_linux_key_slash_b = display.keysym_to_keycode(Xlib.XK.string_to_keysym("BackSpace"))
 x11_linux_key_tab = display.keysym_to_keycode(Xlib.XK.string_to_keysym("Tab"))

je_auto_control/linux_with_x11/core/utils/x11_linux_vk.py

@@ -20,7 +20,7 @@ def press_key(keycode: int) -> None:
         time.sleep(0.01)
         fake_input(display, X.KeyPress, keycode)
         display.sync()
-    except struct.error as error:
+    except Exception as error:
         print(repr(error), file=sys.stderr)
 
 
@@ -32,5 +32,5 @@ def release_key(keycode: int) -> None:
         time.sleep(0.01)
         fake_input(display, X.KeyRelease, keycode)
         display.sync()
-    except struct.error as error:
+    except Exception as error:
         print(repr(error), file=sys.stderr)

je_auto_control/linux_with_x11/keyboard/x11_linux_keyboard_control.py

@@ -5,7 +5,6 @@
 from je_auto_control.utils.exception.exception_tag import linux_import_error
 from je_auto_control.utils.exception.exception_tag import listener_error
 
-
 if sys.platform not in ["linux", "linux2"]:
     raise AutoControlException(linux_import_error)
 
@@ -71,7 +70,7 @@ def run(self, reply) -> None:
         except AutoControlException:
             raise AutoControlException(listener_error)
 
-    def record(self, record_queue)-> None:
+    def record(self, record_queue) -> None:
         """
         :param record_queue the queue test_record action
         """
@@ -133,7 +132,7 @@ def run(self) -> None:
                     current_display.record_enable_context(self.context, self.handler.run)
                     current_display.record_free_context(self.context)
                 # keep running this to get event
-                next_event = self.root.display.next_event()
+                self.root.display.next_event()
             except AutoControlException:
                 raise AutoControlException(listener_error)
             finally:
@@ -165,9 +164,8 @@ def x11_linux_record(record_queue) -> None:
     xwindows_listener.record(record_queue)
 
 
-def x11_linux_stop_record() -> None:
+def x11_linux_stop_record() -> Queue:
     """
     stop test_record action
     """
     return xwindows_listener.stop_record()
-

je_auto_control/linux_with_x11/listener/x11_linux_listener.py

@@ -79,6 +79,8 @@ def scroll(scroll_value: int, scroll_direction: int) -> None:
     scroll_direction = 6 : direction left
     scroll_direction = 7 : direction right
     """
+    total = 0
     for i in range(scroll_value):
         click_mouse(scroll_direction)
-
+        total = total + i
+    print("Scroll Value:" + total)