From 0667abe75fbeeca2e9ac1bd1b60aef0c067b898e Mon Sep 17 00:00:00 2001
From: Timmoc <timmoc@qq.com>
Date: Tue, 10 Dec 2024 17:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3sender=5Fnet=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=8F=91=E9=80=81=E6=96=87=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py                           | 2 +-
 {recv => recvs}/recv.py           | 0
 {recv => recvs}/recv_net.py       | 6 +++---
 {recv => recvs}/test_recv.py      | 2 +-
 {sender => senders}/sender.py     | 0
 {sender => senders}/sender_net.py | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename {recv => recvs}/recv.py (100%)
 rename {recv => recvs}/recv_net.py (98%)
 rename {recv => recvs}/test_recv.py (96%)
 rename {sender => senders}/sender.py (100%)
 rename {sender => senders}/sender_net.py (98%)

diff --git a/main.py b/main.py
index 49f2e0e..4be2473 100644
--- a/main.py
+++ b/main.py
@@ -1,6 +1,6 @@
 import pyfiglet # 程序greet
 
-from sender import sender_net
+from senders import sender_net
 
 # 程序greet
 print(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>")
diff --git a/recv/recv.py b/recvs/recv.py
similarity index 100%
rename from recv/recv.py
rename to recvs/recv.py
diff --git a/recv/recv_net.py b/recvs/recv_net.py
similarity index 98%
rename from recv/recv_net.py
rename to recvs/recv_net.py
index 0498554..22af388 100644
--- a/recv/recv_net.py
+++ b/recvs/recv_net.py
@@ -8,8 +8,8 @@ from time import sleep
 import select
 
 from entity.Letter import Letter, json_to_obj
-import recv
-from sender import sender
+import recvs.recv
+from senders import sender
 
 
 # from entity.Letter import Letter
@@ -87,7 +87,7 @@ class recver_net():
 
     def recv_file(self, data):
         letter: Letter = json_to_obj(data)
-        recv.handleLetter(letter)
+        recvs.recv.handleLetter(letter)
 
     def main(self):
 
diff --git a/recv/test_recv.py b/recvs/test_recv.py
similarity index 96%
rename from recv/test_recv.py
rename to recvs/test_recv.py
index 13bfe6a..1dd212d 100644
--- a/recv/test_recv.py
+++ b/recvs/test_recv.py
@@ -1,7 +1,7 @@
 from unittest.mock import patch
 
 import recv
-from sender import sender
+from senders import sender
 
 
 @patch('builtins.input', side_effect=['../README.md', 'aes', 'ecb'])
diff --git a/sender/sender.py b/senders/sender.py
similarity index 100%
rename from sender/sender.py
rename to senders/sender.py
diff --git a/sender/sender_net.py b/senders/sender_net.py
similarity index 98%
rename from sender/sender_net.py
rename to senders/sender_net.py
index 1836700..0b36d13 100644
--- a/sender/sender_net.py
+++ b/senders/sender_net.py
@@ -4,9 +4,9 @@ import socket
 import threading
 from time import sleep
 
-import sender
+import senders.sender
 from entity.Letter import Letter, json_to_obj
-from recv import recv
+from recvs import recv
 
 
 # from entity.Letter import Letter
@@ -70,7 +70,7 @@ class sender_net():
         conn.sendall(msg)
 
     def send_file(self, conn):
-        self.letter: Letter = sender.main()
+        self.letter: Letter = senders.sender.main()
         letter = self.letter.to_dict()
         msg = {"flag": 1, "data": letter}
         print(letter)