From c27ff27f9ec53959767623883b4525a812552336 Mon Sep 17 00:00:00 2001
From: XinYi Song <2037158277@qq.com>
Date: Fri, 3 Dec 2021 17:59:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/upload_client.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/upload/upload_client.py b/upload/upload_client.py
index f339c23..72b2de1 100644
--- a/upload/upload_client.py
+++ b/upload/upload_client.py
@@ -17,6 +17,7 @@ FILE_DIR = os.path.dirname(__file__)
 # home = os.path.join(BASE_DIR, "/unstructured_data/remote_sensing_data")
 home = "/unstructured_data/remote_sensing_data"
 
+
 # 定义一个函数，计算进度条
 def bar(num=1, sum=100):
     rate = float(num) / float(sum)
@@ -24,12 +25,13 @@ def bar(num=1, sum=100):
     temp = '\r%d %%' % (rate_num)
     sys.stdout.write(temp)
 
+
 def md5_file(name):
-  m = md5()
-  a_file = open(name, 'rb') #需要使用二进制格式读取文件内容
-  m.update(a_file.read())
-  a_file.close()
-  return m.hexdigest()
+    m = md5()
+    a_file = open(name, 'rb')  # 需要使用二进制格式读取文件内容
+    m.update(a_file.read())
+    a_file.close()
+    return m.hexdigest()
 
 
 def upload_file_client(file_path, depth, dateTime, collectionCode):
@@ -55,16 +57,10 @@ def upload_file_client(file_path, depth, dateTime, collectionCode):
     result_exist = str(ck.recv(1024), encoding='utf-8')
     has_sent = 0
     if result_exist == "2003":
-        # inp = input("文件已存在，是否续传？Y/N:").strip()
-        # if inp.upper() == 'Y':
         ck.sendall(bytes("2004", encoding='utf-8'))
         result_continue_pos = str(ck.recv(1024), encoding='utf-8')  # 已经传输了多少的文件内容
         print(result_continue_pos)
         has_sent = int(result_continue_pos)
-
-        # else:
-        #     ck.sendall(bytes("2005", encoding='utf-8'))  #发送2005代表不续传
-
     file_obj = open(file_path, 'rb')  # 对文件进行读操作
     file_obj.seek(has_sent)  # 调整指针
 
@@ -76,5 +72,6 @@ def upload_file_client(file_path, depth, dateTime, collectionCode):
 
     file_obj.close()
     print("文件上传成功！")
-    uc = {'file_size': file_byte_size, 'fileName': file_name, 'md5': md5, 'file_path': file_paths+'/'+file_name, 'type': 'ok'}
+    uc = {'file_size': file_byte_size, 'fileName': file_name, 'md5': md5, 'file_path': file_paths + '/' + file_name,
+          'type': 'ok'}
     return uc