Refactor into module with class

This is over-engineered already and pylint is upset about it, so I'm
just recording this working state until I can replace it with just
a main().

1 files changed, 90 insertions, 58 deletions

diff --git a/vixf.py3 b/vixf.py3
index d455a39..aca8294 100644
--- a/vixf.py3
+++ b/vixf.py3
@@ -17,62 +17,94 @@ import time
 from pynput.keyboard import Key, Controller
 import pyperclip
 
-SELF = 'vixf'
 
-EDITOR = 'vi'
-FOCUS_DELAY = 0.2
-TERM = 'x-terminal-emulator'
-
-keyboard = Controller()
-
-time.sleep(FOCUS_DELAY)
-
-# Select all
-with keyboard.pressed(Key.ctrl):
-    keyboard.type('a')
-
-# Copy
-with keyboard.pressed(Key.ctrl):
-    keyboard.type('c')
-
-# Read clipboard
-content_before = pyperclip.paste()
-
-# Stop here (error condition) if there's nothing in the clipboard
-if len(content_before) == 0:
-    print(
-        f'{SELF}: Nothing to edit.  Did the selection work?',
-        file=sys.stderr,
-    )
-    sys.exit(1)
-
-with tempfile.NamedTemporaryFile(mode='w', delete_on_close=False) as tf:
-    tf.write(content_before)
-    tf.close()
-
-    env = os.environ
-    if 'VISUAL' in env:
-        editor = env['VISUAL']
-    elif 'EDITOR' in env:
-        editor = env['EDITOR']
-    else:
-        editor = EDITOR
-
-    command = [
-        TERM,
-        '-name', SELF,
-        '-e', editor, tf.name,
-    ]
-    subprocess.run(command, check=True)
-
-    encoding = locale.getpreferredencoding()
-    with open(tf.name, mode='r', encoding=encoding) as tfr:
-        content_after = tfr.read()
-
-pyperclip.copy(content_after)
-
-time.sleep(FOCUS_DELAY)
-
-# Paste
-with keyboard.pressed(Key.ctrl):
-    keyboard.type('v')
+class ViXF():
+    """
+    Using a class, to encapsulate a fair bit of system state that gets injected
+    into this.
+    """
+
+    SELF = 'vixf'
+
+    EDITOR = 'vi'
+    FOCUS_DELAY = 0.2
+    TERM = 'x-terminal-emulator'
+
+    def __init__(self, environ):
+        """
+        Object setup: read environment as provided by whatever instantiated us,
+        and set up a keyboard controller object.
+        """
+        self.environ = environ
+        self.keyboard = Controller()
+
+    def exec(self):
+        """
+        Perform the actual keyboard automation and editor instantiation.
+        """
+
+        time.sleep(self.FOCUS_DELAY)
+
+        # Select all
+        with self.keyboard.pressed(Key.ctrl):
+            self.keyboard.type('a')
+
+        # Copy
+        with self.keyboard.pressed(Key.ctrl):
+            self.keyboard.type('c')
+
+        # Read clipboard
+        content_before = pyperclip.paste()
+
+        # Stop here (error condition) if there's nothing in the clipboard
+        if len(content_before) == 0:
+            print(
+                f'{self.SELF}: Nothing to edit.  Did the selection work?',
+                file=sys.stderr,
+            )
+            sys.exit(1)
+
+        with tempfile.NamedTemporaryFile(
+                mode='w',
+                delete_on_close=False
+        ) as tf:
+            tf.write(content_before)
+            tf.close()
+
+            if 'VISUAL' in self.environ:
+                editor = self.environ['VISUAL']
+            elif 'EDITOR' in self.environ:
+                editor = self.environ['EDITOR']
+            else:
+                editor = self.EDITOR
+
+            command = [
+                self.TERM,
+                '-name', self.SELF,
+                '-e', editor, tf.name,
+            ]
+            subprocess.run(command, check=True)
+
+            encoding = locale.getpreferredencoding()
+            with open(tf.name, mode='r', encoding=encoding) as tfr:
+                content_after = tfr.read()
+
+        pyperclip.copy(content_after)
+
+        time.sleep(self.FOCUS_DELAY)
+
+        # Paste
+        with self.keyboard.pressed(Key.ctrl):
+            self.keyboard.type('v')
+
+
+def main():
+    """
+    Entry point for the command line client.
+    """
+    vixf = ViXF(os.environ)
+    vixf.exec()
+
+
+if __name__ == '__main__':
+    main()