更新smb文件路径

update/utils/client_util.py

@@ -9,6 +9,10 @@ from django.db.models import Q
 from dingxin_toolbox_drf.settings import BASE_DIR
 from update.utils.dingxin_sql import *
 
+TEST_CLIENT_PATH = r'/客户端/测试专用'
+PRD_CLIENT_PATH = r'/客户端/结测常用客户端'
+PRD_HISTORY_CLIENT_PATH = r'/客户端/结测常用客户端/历史客户端——通用'
+
 
 class ClientUtil:
     def __init__(self):
@@ -26,10 +30,9 @@ class ClientUtil:
 
     def get_all_smb_client(self):
         print('get_all_smb_client')
-        test_client_list = self.get_smb_file_list('data1', '/客户端/测试专用', r'client_v2.033*.7z')
-        prd_client_list = self.get_smb_file_list('data1', '/客户端/结测常用客户端', r'client_v2.033*.7z')
-        history_client_list = self.get_smb_file_list('data1', '/客户端/结测常用客户端/历史客户端',
-                                                     r'client_v2.033*.7z', )
+        test_client_list = self.get_smb_file_list('data1', TEST_CLIENT_PATH, r'client_v2.033*.7z')
+        prd_client_list = self.get_smb_file_list('data1', PRD_CLIENT_PATH, r'client_v2.033*.7z')
+        history_client_list = self.get_smb_file_list('data1', PRD_HISTORY_CLIENT_PATH, r'client_v2.033*.7z', )
         print({'test': test_client_list, 'prd': prd_client_list, 'history': history_client_list})
         return {'test': test_client_list, 'prd': prd_client_list, 'history': history_client_list}
 
@@ -44,10 +47,9 @@ class ClientUtil:
 
     def get_all_smb_file_list(self):
         print('get_all_smb_file_list')
-        test_client_list = self.get_smb_file_list('data1', '/客户端/测试专用', r'client_v2.033*.7z')
-        prd_client_list = self.get_smb_file_list('data1', '/客户端/结测常用客户端', r'client_v2.033*.7z')
-        history_client_list = self.get_smb_file_list('data1', '/客户端/结测常用客户端/历史客户端',
-                                                     r'client_v2.033*.7z', )
+        test_client_list = self.get_smb_file_list('data1', TEST_CLIENT_PATH, r'client_v2.033*.7z')
+        prd_client_list = self.get_smb_file_list('data1', PRD_CLIENT_PATH, r'client_v2.033*.7z')
+        history_client_list = self.get_smb_file_list('data1', PRD_HISTORY_CLIENT_PATH, r'client_v2.033*.7z', )
         print(test_client_list + prd_client_list + history_client_list)
         return test_client_list + prd_client_list + history_client_list
 
@@ -164,11 +166,11 @@ class ClientUtil:
                 return
         # 如果本地没有则到服务器上拉取
         if client.client_type == 'test':
-            self.download_client_file(client.origin_name, r'/客户端/测试专用/')
+            self.download_client_file(client.origin_name, TEST_CLIENT_PATH)
         elif client.client_type == 'prd':
-            self.download_client_file(client.origin_name, r'/客户端/结测常用客户端/')
+            self.download_client_file(client.origin_name, PRD_CLIENT_PATH)
         elif client.client_type == 'history':
-            self.download_client_file(client.origin_name, r'/客户端/结测常用客户端/历史客户端/')
+            self.download_client_file(client.origin_name, PRD_HISTORY_CLIENT_PATH)
         else:
             print('检查下载客户端逻辑')
 
@@ -234,7 +236,7 @@ class ClientUtil:
 #
 #     def get_test_client_file(self):
 #         self.smb_conn.connect(self.smb_host, 445)
-#         smb_files = self.smb_conn.listPath('data1', '/客户端/测试专用', pattern=r'client_v2.033*.7z')
+#         smb_files = self.smb_conn.listPath('data1', TEST_CLIENT_PATH, pattern=r'client_v2.033*.7z')
 #         for file in smb_files:
 #             file_name = file.filename
 #             print(file_name)