Merge branch 'develop' into playback_class_interface

Author: WesleyMPG

README.md

@@ -4,6 +4,14 @@
 Literally Automate the boring stuff with Python, allows the user to record his mouse and keyboard 
 actions and reproduce them identically as many times as he wants.
 
+# Use cases
+I've mainly used it to automate gold/point/XP farming in games, I think this can also be used to:
+
+- Automate a demo during a conference for example
+- Automate UAT in the devops process (as long as you're making something with a GUI).
+
+If you use it for something really cool you can always reach me at github (at) rmpr (dot) xyz or drop
+a PR :). Bonus points if you have a demo video.
 
 # Install instructions
 
@@ -16,8 +24,8 @@ from [here](https://github.com/rmpr/atbswp/releases)
 
 Fedora
 ```shell
+sudo dnf install python3-wxpython4 python3-xlib python3-tkinter
 git clone https://github.com/RMPR/atbswp.git && cd atbswp
-sudo dnf install python3-wxpython4
 make prepare-dev
 make run
 ```
@@ -47,27 +55,18 @@ python atbswp\atbswp.py
 
 ![atbswp quick demo](demo/demo.gif)
 
-# Use cases
-I've mainly used it to automate gold/point/XP farming in games, I think this can also be used to:
-
-- Automate a demo during a conference for example
-- Automate UAT in the devops process (as long as you're making something with a GUI).
-
-If you use it for something really cool you can always reach me at github (at) rmpr (dot) xyz or drop
-a PR :). Bonus points if you have a demo video.
 
 # Donate
 <a href="https://www.buymeacoffee.com/rmpr" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-black.png" width="150" alt="Buy me a coffee"></a>
 
-If you found this helpful in any way.
-
+If you found this helpful.
 
 # Contributions
 Contributions are welcomed, see [CONTRIBUTING.md](./CONTRIBUTING.md)
 
 # Known issues
 On Linux, this only works with Xorg, with wayland support coming soon, for now you have to
-enable Xorg. 
+enable Xorg.
 
 ```
 sudo sed 's/#WaylandEnable=false/WaylandEnable=false/' /etc/gdm/custom.conf -i # on Gnome

atbswp/control.py

@@ -191,8 +191,8 @@ def isinteger(s):
 
         if move == "moveTo":
             coordinates = [int(s) for s in parameters.split(", ") if isinteger(s)]
-            if coordinates[0] - self._lastx < self.mouse_sensibility \
-               and coordinates[1] - self._lasty < self.mouse_sensibility:
+            if abs(coordinates[0] - self._lastx) < self.mouse_sensibility \
+               and abs(coordinates[1] - self._lasty) < self.mouse_sensibility:
                 return
             else:
                 self._lastx, self._lasty = coordinates
@@ -256,8 +256,6 @@ def on_scroll(self, x, y, dx, dy):
 
     def on_press(self, key):
         """Triggered by a key press."""
-        if not self.recording:
-            return False
         b = time.perf_counter()
         timeout = int(b - self.last_time)
         if timeout > 0:
@@ -333,9 +331,7 @@ def action(self, event):
             with open(TMP_PATH, 'w') as f:
                 # Remove the recording trigger event
                 self._capture.pop()
-                # If it's the mouse remove the previous also
-                if "mouseDown" in self._capture[-1]:
-                    self._capture.pop()
+                self._capture.pop()
                 f.seek(0)
                 f.write("\n".join(self._capture))
                 f.truncate()
@@ -345,7 +341,6 @@ def action(self, event):
 
     def update_timer(self, event):
         """Check if it's the time to start to record"""
-        print(self.timer)
         if self.timer <= 0:
             self.wx_timer.Stop()
             self.countdown_dialog.Destroy()

atbswp/gui.py

@@ -158,6 +158,8 @@ def __init__(self, *args, **kwds):
                                                  wx.ID_ANY,
                                                  wx.Bitmap(os.path.join(self.path, "img", "play-circle.png"),
                                                            wx.BITMAP_TYPE_ANY))
+        self.remaining_plays = wx.StaticText(self, label=settings.CONFIG.get("DEFAULT", "Repeat Count"),
+                                                style=wx.ALIGN_CENTRE_HORIZONTAL)
         self.play_button.SetToolTip(self.app_text[3])
         self.compile_button = wx.BitmapButton(self,
                                               wx.ID_ANY,
@@ -228,6 +230,7 @@ def __set_properties(self):
         self.help_button.SetSize(self.help_button.GetBestSize())
 
     def __do_layout(self):
+        self.remaining_plays.Position = (256, 0)
         main_sizer = wx.BoxSizer(wx.HORIZONTAL)
         main_sizer.Add(self.panel)
         main_sizer.Add(self.file_open_button, 0, 0, 0)

atbswp/settings.py

@@ -25,7 +25,7 @@
 
 CONFIG = configparser.ConfigParser()
 VERSION = "0.2"
-YEAR = date.today().strftime('%Y')
+YEAR = date.today().strftime("%Y")
 
 
 # Check the location of the configuration file, default to the home directory
@@ -44,16 +44,18 @@ def save_config():
     with open(config_location, "w") as config_file:
         CONFIG.write(config_file)
 
+
 try:
     with open(config_location) as config_file:
         CONFIG.read(config_location)
 except:
-    CONFIG['DEFAULT'] = {'Fast Play Speed': False,
-                         'Infinite Playback': False,
-                         'Repeat Count': 1,
-                         'Recording Hotkey': 348,
-                         'Playback Hotkey': 349,
-                         'Always On Top': True,
-                         'Language': 'en',
-                         'Recording Timer': 0}
-
+    CONFIG["DEFAULT"] = {
+        "Fast Play Speed": False,
+        "Infinite Playback": False,
+        "Repeat Count": 1,
+        "Recording Hotkey": 348,
+        "Playback Hotkey": 349,
+        "Always On Top": True,
+        "Language": "en",
+        "Recording Timer": 0,
+    }