attempt at removing tqdm dependency

This commit is contained in:
CactiChameleon9 2020-12-10 08:32:59 +00:00
parent bd417edb89
commit 4eb152b8aa
8 changed files with 12 additions and 33 deletions

View File

@ -1,11 +1,11 @@
import socket import socket
import os import os
import tqdm
# device's IP address # device's IP address
SERVER_HOST = "127.0.0.1" #(socket.gethostbyname(socket.gethostname())) SERVER_HOST = "127.0.0.1" #(socket.gethostbyname(socket.gethostname()))
SERVER_PORT = 5001 SERVER_PORT = 5001
# receive 4096 bytes each time # receive 4096 bytes each time
BUFFER_SIZE = 4096 BUFFER_SIZE = 128
SEPARATOR = "<SEPARATOR>" SEPARATOR = "<SEPARATOR>"
# create the server socket # create the server socket
# TCP socket # TCP socket
@ -31,7 +31,7 @@ filename = os.path.basename(filename)
filesize = int(filesize) filesize = int(filesize)
# start receiving the file from the socket # start receiving the file from the socket
# and writing to the file stream # 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: #with open(filename, "wb") as f:
while True: while True:
@ -46,8 +46,6 @@ while True:
f = open(filename, 'ab') f = open(filename, 'ab')
f.write(bytes_read) f.write(bytes_read)
print(bytes_read) print(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
f.close() f.close()
# close the client socket # close the client socket

View File

@ -1,6 +1,5 @@
import socket import socket
import os import os
import tqdm
import pynput import pynput
from pynput.keyboard import Key, Controller from pynput.keyboard import Key, Controller
#press #press
@ -36,7 +35,7 @@ filename = os.path.basename(filename)
filesize = int(filesize) filesize = int(filesize)
# start receiving the file from the socket # start receiving the file from the socket
# and writing to the file stream # 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: #with open(filename, "wb") as f:
@ -55,7 +54,6 @@ while True:
f = open(filename, 'wb') f = open(filename, 'wb')
f.write(bytes_read) f.write(bytes_read)
# update the progress bar # update the progress bar
progress.update(len(bytes_read))
f.close() f.close()
g = open(filename, 'r') g = open(filename, 'r')

View File

@ -1,6 +1,5 @@
import socket import socket
import os import os
import tqdm
import pynput import pynput
from pynput.keyboard import Key, Controller from pynput.keyboard import Key, Controller
#release #release
@ -36,7 +35,7 @@ filename = os.path.basename(filename)
filesize = int(filesize) filesize = int(filesize)
# start receiving the file from the socket # start receiving the file from the socket
# and writing to the file stream # 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: #with open(filename, "wb") as f:
@ -54,8 +53,7 @@ while True:
# write to the file the bytes we just received # write to the file the bytes we just received
f = open(filename, 'wb') f = open(filename, 'wb')
f.write(bytes_read) f.write(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
f.close() f.close()
g = open(filename, 'r') g = open(filename, 'r')

View File

@ -1,6 +1,5 @@
import socket import socket
import os import os
import tqdm
import pynput import pynput
from pynput.mouse import Button, Controller from pynput.mouse import Button, Controller
import time import time
@ -38,7 +37,7 @@ filename = os.path.basename(filename)
filesize = int(filesize) filesize = int(filesize)
# start receiving the file from the socket # start receiving the file from the socket
# and writing to the file stream # 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: #with open(filename, "wb") as f:
@ -57,8 +56,6 @@ while True:
# update the progress bar # update the progress bar
f = open(filename, 'wb') f = open(filename, 'wb')
f.write(bytes_read) f.write(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
f.close() f.close()
g = open(filename, 'r') g = open(filename, 'r')

View File

@ -1,6 +1,5 @@
import socket import socket
import os import os
import tqdm
from tkinter import * from tkinter import *
from pynput import keyboard from pynput import keyboard
@ -46,7 +45,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
def sendfile(): def sendfile():
# start sending the file # 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: with open(filename, "rb") as f:
for _ in progress: for _ in progress:
# read the bytes from the file # read the bytes from the file
@ -57,8 +56,6 @@ def sendfile():
# we use sendall to assure transimission in # we use sendall to assure transimission in
# busy networks # busy networks
s.sendall(bytes_read) s.sendall(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
# close the socket # close the socket
#s.close() #s.close()

View File

@ -1,6 +1,5 @@
import socket import socket
import os import os
import tqdm
from tkinter import * from tkinter import *
from pynput import keyboard from pynput import keyboard
@ -45,7 +44,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
def sendfile(): def sendfile():
# start sending the file # 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: with open(filename, "rb") as f:
for _ in progress: for _ in progress:
# read the bytes from the file # read the bytes from the file
@ -56,8 +55,6 @@ def sendfile():
# we use sendall to assure transimission in # we use sendall to assure transimission in
# busy networks # busy networks
s.sendall(bytes_read) s.sendall(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
# close the socket # close the socket
#s.close() #s.close()

View File

@ -1,6 +1,5 @@
import socket import socket
import os import os
import tqdm
from pynput import keyboard from pynput import keyboard
from pynput.mouse import Button, Controller from pynput.mouse import Button, Controller
from pynput import mouse from pynput import mouse
@ -33,7 +32,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
def sendfile(): def sendfile():
# start sending the file # 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: with open(filename, "rb") as f:
for _ in progress: for _ in progress:
# read the bytes from the file # read the bytes from the file
@ -44,8 +43,6 @@ def sendfile():
# we use sendall to assure transimission in # we use sendall to assure transimission in
# busy networks # busy networks
s.sendall(bytes_read) s.sendall(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
# close the socket # close the socket
#s.close() #s.close()

View File

@ -1,12 +1,11 @@
import socket import socket
import os import os
import tqdm
from pynput import keyboard from pynput import keyboard
SEPARATOR = "<SEPARATOR>" 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 # the ip address or hostname of the server, the receiver
@ -30,7 +29,7 @@ s.send(f"{filename}{SEPARATOR}{filesize}".encode())
def sendfile(): def sendfile():
# start sending the file # 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: with open(filename, "rb") as f:
for _ in progress: for _ in progress:
# read the bytes from the file # read the bytes from the file
@ -41,8 +40,6 @@ def sendfile():
# we use sendall to assure transimission in # we use sendall to assure transimission in
# busy networks # busy networks
s.sendall(bytes_read) s.sendall(bytes_read)
# update the progress bar
progress.update(len(bytes_read))
# close the socket # close the socket
#s.close() #s.close()