Merge branch 'master' into Complete-Layout-US

Author: gitdev-bash

README.md

@@ -2,7 +2,7 @@
 Piduck is a program with which you can easily use your Raspberry Pi Zero as a USB HID keyboard. It uses the scripting language [Ducky-Script-v1].
 
 The Project is in Beta and help is needed.
-The function `REPEAT`, `FN` and other special character and keys are missing. For now, only the US keyboard layout is available.
+For now, only the US keyboard layout is available.
 
 ## Contributions
 All contributions are welcome!

Usb-Hut1_12v2.pdf

@@ -2,50 +2,11 @@
 import argparse
 from importlib import import_module
 from time import sleep
+import sys
 
-key_layout = "us"
-default_delay = 10
-string_delay = 1
 
-aliasmap = {
-    "CTRL": "LCTRL",
-    "SHIFT": "LSHIFT",
-    "ALT": "LALT",
-    "META": "LMETA",
-    "CONTROL": "CTRL",
-    "GUI": "META",
-    "ESCAPE": "ESC",
-    "RIGHTARROW": "RIGHT",
-    "LEFTARROW": "LEFT",
-    "DOWNARROW": "DOWN",
-    "UPARROW": "UP",
-    "CTRL-ALT": "CTRL ALT",
-    "CTRL-SHIFT": "CTRL SHIFT",
-    "DEFAULT_DELAY": "DEFAULTDELAY",
-    " ": "SPACE",
-    "BREAK": "PAUSE",
-}
-
-piparser = argparse.ArgumentParser()
-piparser.add_argument("-i", "--input", help="File input")
-piparser.add_argument(
-    "-l", "--keyboardlayoutcode", help="Language codes specified by ISO639-1:2002"
-)
-piparser.add_argument("-d", "--defaultdelay", help="The default delay of execution")
-piparser.add_argument(
-    "-s", "--defaultchardelay", help="The default char delay of execution"
-)
-piargs = piparser.parse_args()
-if piargs.keyboardlayoutcode is not None:
-    key_layout = piargs.keyboardlayoutcode
-if piargs.defaultdelay is not None:
-    default_delay = piargs.defaultdelay
-if piargs.defaultchardelay is not None:
-    string_delay = piargs.defaultchardelay
-try:
-    keymap = import_module("pd_key_maps.keymap_" + key_layout)
-except ModuleNotFoundError:
-    exit(3)
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
 
 
 def string(string):
@@ -57,17 +18,25 @@ def string(string):
 def pharse(line, known, deltrue):
     global default_delay
     global string_delay
-    if line != " ":
-        command = line.split()
-    else:
+    if line == "":
+        return
+    elif line == " ":
         command = [" "]
+    else:
+        command = line.split()
     if command[0] == "DELAY":
         sleep(int(command[1]) / 100)
         return
     elif command[0] == "REM":
         return
     elif command[0] == "REPEAT":
-        return  # todo
+        try:
+            for i in range(int(command[1])):
+                pharse(last_line.strip(), [[], []], False)
+            return  # todo
+        except RecursionError:
+            eprint("You can not repeat the repeat")
+            exit(4)
     elif command[0] == "DEFAULTCHARDELAY":
         string_delay = int(command[1])
         return
@@ -78,23 +47,30 @@ def pharse(line, known, deltrue):
         if not deltrue:
             sleep(default_delay / 100)
     if command[0] == "STRING":
-        string(line[len("STRING ") :])
+        string(line[len(command[0] + " ") :])
         return
     elif command[0] in keymap.commap:
         known[0].append(keymap.commap[command[0]])
-        pharse(" ".join(command[1:]), known, True)
+        if len(command) > 1:
+            pharse(" ".join(command[1:]), known, True)
+        else:
+            out(known)
         return
     elif command[0] in keymap.c1map:
         known[1].append(keymap.c1map[command[0]])
-        out(known)
+        if len(command) > 1:
+            pharse(" ".join(command[1:]), known, True)
+        else:
+            out(known)
         return
     elif command[0] in keymap.c2map:
-        pharse(keymap.c2map[command[0]], known, True)
+        pharse(keymap.c2map[command[0]] + " " + " ".join(command[1:]), known, True)
         return
     elif command[0] in aliasmap:
         pharse(aliasmap[command[0]] + " " + " ".join(command[1:]), known, True)
         return
     else:
+        eprint('Could not find "' + command[0] + '"')
         exit(2)
 
 
@@ -115,21 +91,76 @@ def out(ccl):
 
 
 def main():
+    global last_line
     if piargs.input is not None:
         file1 = open(piargs.input, "r")
         while True:
             line = file1.readline()
             if not line:
                 break
             pharse(line.strip(), [[], []], False)
+            last_line = line
         file1.close()
     else:
         while True:
-            line = input()
+            try:
+                line = input()
+            except EOFError:
+                break
             if not line:
                 break
             pharse(line.strip(), [[], []], False)
+            last_line = line
+
 
+if __name__ == "__main__":
+    last_line = ""
+    key_layout = "us"
+    default_delay = 10
+    string_delay = 1
+    
+    aliasmap = {
+        "CTRL": "LCTRL",
+        "SHIFT": "LSHIFT",
+        "ALT": "LALT",
+        "META": "LMETA",
+        "CONTROL": "CTRL",
+        "GUI": "META",
+        "ESCAPE": "ESC",
+        "RIGHTARROW": "RIGHT",
+        "LEFTARROW": "LEFT",
+        "DOWNARROW": "DOWN",
+        "UPARROW": "UP",
+        "CTRL-ALT": "CTRL ALT",
+        "CTRL-SHIFT": "CTRL SHIFT",
+        "DEFAULT_DELAY": "DEFAULTDELAY",
+        " ": "SPACE",
+        "BREAK": "PAUSE",
+    }
 
-main()
-exit(0)
+    piparser = argparse.ArgumentParser()
+    piparser.add_argument("-i", "--input", help="File input")
+    piparser.add_argument(
+        "-l", "--keyboardlayoutcode", help="Language codes specified by ISO639-1:2002"
+    )
+    piparser.add_argument("-d", "--defaultdelay", help="The default delay of execution")
+    piparser.add_argument(
+        "-s", "--defaultchardelay", help="The default char delay of execution"
+    )
+    piargs = piparser.parse_args()
+    if piargs.keyboardlayoutcode is not None:
+        key_layout = piargs.keyboardlayoutcode
+    if piargs.defaultdelay is not None:
+        default_delay = piargs.defaultdelay
+    if piargs.defaultchardelay is not None:
+        string_delay = piargs.defaultchardelay
+    try:
+        keymap = import_module("pd_key_maps.keymap_" + key_layout)
+    except ModuleNotFoundError:
+        eprint('Keymap "' + key_layout + '" could not be found')
+        exit(3)
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    exit(0)