修正sender_net无法发送文件问题

sender_okToCheck
Timmoc 3 months ago
parent b2a673af0e
commit 0667abe75f

@ -1,6 +1,6 @@
import pyfiglet # 程序greet import pyfiglet # 程序greet
from sender import sender_net from senders import sender_net
# 程序greet # 程序greet
print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>") print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")

@ -8,8 +8,8 @@ from time import sleep
import select import select
from entity.Letter import Letter, json_to_obj from entity.Letter import Letter, json_to_obj
import recv import recvs.recv
from sender import sender from senders import sender
# from entity.Letter import Letter # from entity.Letter import Letter
@ -87,7 +87,7 @@ class recver_net():
def recv_file(self, data): def recv_file(self, data):
letter: Letter = json_to_obj(data) letter: Letter = json_to_obj(data)
recv.handleLetter(letter) recvs.recv.handleLetter(letter)
def main(self): def main(self):

@ -1,7 +1,7 @@
from unittest.mock import patch from unittest.mock import patch
import recv import recv
from sender import sender from senders import sender
@patch('builtins.input', side_effect=['../README.md', 'aes', 'ecb']) @patch('builtins.input', side_effect=['../README.md', 'aes', 'ecb'])

@ -4,9 +4,9 @@ import socket
import threading import threading
from time import sleep from time import sleep
import sender import senders.sender
from entity.Letter import Letter, json_to_obj from entity.Letter import Letter, json_to_obj
from recv import recv from recvs import recv
# from entity.Letter import Letter # from entity.Letter import Letter
@ -70,7 +70,7 @@ class sender_net():
conn.sendall(msg) conn.sendall(msg)
def send_file(self, conn): def send_file(self, conn):
self.letter: Letter = sender.main() self.letter: Letter = senders.sender.main()
letter = self.letter.to_dict() letter = self.letter.to_dict()
msg = {"flag": 1, "data": letter} msg = {"flag": 1, "data": letter}
print(letter) print(letter)
Loading…
Cancel
Save