Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set text with more lines in ''' #28

Merged
merged 1 commit into from
Nov 1, 2024
Merged

set text with more lines in ''' #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions uc-v1.1.8-dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,9 @@ def ping_request(self):
self.crypt_stub.setup_encryption(self.clientSock)

self.print_log(
f'requesting ping from [{
f'''requesting ping from [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.PING))
answ = self.clientSock.recv(16)
ping = self.crypt_stub.decrypt_data(answ)
Expand All @@ -365,9 +365,9 @@ def download_script(self, downloadType, downloadName, clientToken):

# requesting transfer
self.print_log(
f'requesting transfer from [{
f'''requesting transfer from [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.DOWNLOAD))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -443,9 +443,9 @@ def download_script(self, downloadType, downloadName, clientToken):
# closing socket if file could not be found
elif resp == cOP.RST:
self.print_log(
f'file_not_found_error: closing connection to [{
f'''file_not_found_error: closing connection to [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.close()

# closing socket if selected operand is not available
Expand Down Expand Up @@ -637,9 +637,9 @@ def download_script(self, downloadType, downloadName, clientToken):
# directory not found
else:
self.print_log(
f'directory_not_found_error: closing connection to [{
f'''directory_not_found_error: closing connection to [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.close()

# authentification failure
Expand All @@ -660,9 +660,9 @@ def listfs(self, clientToken, oFile):

# requesting list and sending operand
self.print_log(
f'requesting listfs from [{
f'''requesting listfs from [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.LISTFS))
time.sleep(self.time_buffer)

Expand All @@ -680,9 +680,9 @@ def listfs(self, clientToken, oFile):
# no
# closing socket
self.print_log(
f'connection refused by [{
f'''connection refused by [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.close()
elif answ == cOP.OK:
# yes
Expand Down Expand Up @@ -734,9 +734,9 @@ def listfs(self, clientToken, oFile):
file.close()
space = 120 * " "
self.print_log(
f'filesystem written to {
f'''filesystem written to {
self.download +
oFile}{space}')
oFile}{space}''')

# sending operation done and closing socket
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.OK))
Expand All @@ -749,9 +749,9 @@ def test_authtoken(self, clientToken):

# requesting token validation
self.print_log(
f'requesting token validation from [{
f'''requesting token validation from [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.USERTOKEN))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -788,9 +788,9 @@ def updateuc(self):

# requesting update
self.print_log(
f'updating uc from [{
f'''updating uc from [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.SERVERUPDATE))

# receieving file size
Expand Down Expand Up @@ -830,9 +830,9 @@ def upload_script(self, fileDirectory, userFile, userToken):
# requesting file upload
current_date_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
self.print_log(
f'requesting file transfer from [{
self.serverAddr}]::[{
self.serverPort}]')
f'''requesting file transfer from [{
self.serverAddr}]::[{
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.UPLOAD))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -909,9 +909,9 @@ def remove_script(self, removeName, userToken):

# sending request to server
self.print_log(
f'requesting removal from [{
f'''requesting removal from [{
self.serverAddr}]::[{
self.serverPort}]')
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.REMOVE))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -1018,9 +1018,9 @@ def send_backup():
# requesting file transfer
sentBytes = 0
self.print_log(
f'requesting file transfer from [{
self.serverAddr}]::[{
self.serverPort}]')
f'''requesting file transfer from [{
self.serverAddr}]::[{
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.BACKUP))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -1247,9 +1247,9 @@ def install_package(package):

# request package from server
self.print_log(
f'installing package from [{
self.serverAddr}]::[{
self.serverPort}]')
f'''installing package from [{
self.serverAddr}]::[{
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.PACKAGE))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -1408,9 +1408,9 @@ def listall(self, userToken):
self.crypt_stub.setup_encryption(self.clientSock)
# request to list available packages
self.print_log(
f'listing available packages from [{
self.serverAddr}]::[{
self.serverPort}]')
f'''listing available packages from [{
self.serverAddr}]::[{
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.LISTALL))
time.sleep(self.time_buffer)

Expand Down Expand Up @@ -1464,16 +1464,16 @@ def remove(self, package):
except PermissionError:
self.print_log('ERROR: Permission denied. Are you root?')
except Exception as e:
self.print_log(f'ERROR: {package} package not found.')
self.print_log(f'ERROR: {e}: {package} package not found.')

# script to return if package is available
def search(self, userToken, package):
self.crypt_stub.setup_encryption(self.clientSock)
# request package search
self.print_log(
f"searching available package from [{
self.serverAddr}]::[{
self.serverPort}]")
f'''searching available package from [{
self.serverAddr}]::[{
self.serverPort}]''')
self.clientSock.send(self.crypt_stub.encrypt_data(cOP.SEARCH))
time.sleep(self.time_buffer)

Expand Down
Loading