|
|
@ -30,6 +30,7 @@ class ClientUtil: |
|
|
|
prd_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', '/客户端/结测常用客户端/历史客户端', |
|
|
|
history_client_list = self.get_smb_file_list('data1', '/客户端/结测常用客户端/历史客户端', |
|
|
|
r'client_v2.033*.7z', ) |
|
|
|
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} |
|
|
|
return {'test': test_client_list, 'prd': prd_client_list, 'history': history_client_list} |
|
|
|
|
|
|
|
|
|
|
|
def get_smb_file_list(self, service_name, path, pattern): |
|
|
|
def get_smb_file_list(self, service_name, path, pattern): |
|
|
@ -79,6 +80,7 @@ class ClientUtil: |
|
|
|
def clear_delete_file(self): |
|
|
|
def clear_delete_file(self): |
|
|
|
print('clear_delete_file') |
|
|
|
print('clear_delete_file') |
|
|
|
all_delete = ClientRelease.objects.filter(is_delete=True).all() |
|
|
|
all_delete = ClientRelease.objects.filter(is_delete=True).all() |
|
|
|
|
|
|
|
print(all_delete) |
|
|
|
for delete in all_delete: |
|
|
|
for delete in all_delete: |
|
|
|
file = os.path.join(self.local_path, delete.origin_name) |
|
|
|
file = os.path.join(self.local_path, delete.origin_name) |
|
|
|
if os.path.exists(file): |
|
|
|
if os.path.exists(file): |
|
|
@ -136,6 +138,7 @@ class ClientUtil: |
|
|
|
if is_exist is False: |
|
|
|
if is_exist is False: |
|
|
|
client = ClientRelease.objects.filter(ver_id=int(short_version[7:])).order_by('-sub_ver').first() |
|
|
|
client = ClientRelease.objects.filter(ver_id=int(short_version[7:])).order_by('-sub_ver').first() |
|
|
|
client_version = client.client_ver |
|
|
|
client_version = client.client_ver |
|
|
|
|
|
|
|
print(client_version) |
|
|
|
return client_version |
|
|
|
return client_version |
|
|
|
|
|
|
|
|
|
|
|
def get_client(self, cinema_ip, short_version): |
|
|
|
def get_client(self, cinema_ip, short_version): |
|
|
@ -149,6 +152,7 @@ class ClientUtil: |
|
|
|
return |
|
|
|
return |
|
|
|
# 如果本地没有则到服务器上拉取 |
|
|
|
# 如果本地没有则到服务器上拉取 |
|
|
|
client = ClientRelease.objects.filter(Q(client_ver=client_version) & Q(is_delete=False)).order_by('-id').first() |
|
|
|
client = ClientRelease.objects.filter(Q(client_ver=client_version) & Q(is_delete=False)).order_by('-id').first() |
|
|
|
|
|
|
|
print(client) |
|
|
|
if client.client_type == 'test': |
|
|
|
if client.client_type == 'test': |
|
|
|
self.download_client_file(client.origin_name, r'/客户端/测试专用/') |
|
|
|
self.download_client_file(client.origin_name, r'/客户端/测试专用/') |
|
|
|
elif client.client_type == 'prd': |
|
|
|
elif client.client_type == 'prd': |
|
|
|