|
|
@ -64,8 +64,10 @@ class ClientUtil: |
|
|
|
for client in _client_data[_type]: |
|
|
|
for client in _client_data[_type]: |
|
|
|
file_name = client |
|
|
|
file_name = client |
|
|
|
if ClientRelease.objects.filter(origin_name=file_name).first(): |
|
|
|
if ClientRelease.objects.filter(origin_name=file_name).first(): |
|
|
|
|
|
|
|
print('if', file_name, _type) |
|
|
|
ClientRelease.objects.filter(origin_name=file_name).update(is_delete=False) |
|
|
|
ClientRelease.objects.filter(origin_name=file_name).update(is_delete=False) |
|
|
|
else: |
|
|
|
else: |
|
|
|
|
|
|
|
print('else', file_name, _type) |
|
|
|
# 写入数据库 |
|
|
|
# 写入数据库 |
|
|
|
origin_name = file_name |
|
|
|
origin_name = file_name |
|
|
|
main_ver = file_name[8:18] |
|
|
|
main_ver = file_name[8:18] |
|
|
@ -80,7 +82,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) |
|
|
|
print('all_delete', 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): |
|
|
@ -144,6 +146,7 @@ class ClientUtil: |
|
|
|
def get_client(self, cinema_ip, short_version): |
|
|
|
def get_client(self, cinema_ip, short_version): |
|
|
|
print('get_client') |
|
|
|
print('get_client') |
|
|
|
client_version = self.get_client_version(cinema_ip, short_version) |
|
|
|
client_version = self.get_client_version(cinema_ip, short_version) |
|
|
|
|
|
|
|
print('client_version', client_version) |
|
|
|
# 查看本地是否有此版本客户端 |
|
|
|
# 查看本地是否有此版本客户端 |
|
|
|
local_file_list = list(os.walk(self.local_path))[0][2] |
|
|
|
local_file_list = list(os.walk(self.local_path))[0][2] |
|
|
|
for local_file in local_file_list: |
|
|
|
for local_file in local_file_list: |
|
|
@ -153,7 +156,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) |
|
|
|
print('client_by_sql-origin_name', client.origin_name, client.client_type) |
|
|
|
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': |
|
|
@ -165,7 +168,7 @@ class ClientUtil: |
|
|
|
|
|
|
|
|
|
|
|
# 传输客户端的方法 |
|
|
|
# 传输客户端的方法 |
|
|
|
def upload(self, cine_ip, origin, target): |
|
|
|
def upload(self, cine_ip, origin, target): |
|
|
|
print('upload') |
|
|
|
print('upload', cine_ip, origin, target) |
|
|
|
# 创建Transport客户端 |
|
|
|
# 创建Transport客户端 |
|
|
|
trans = paramiko.Transport((cine_ip, 22)) |
|
|
|
trans = paramiko.Transport((cine_ip, 22)) |
|
|
|
# 使用密码连接服务器 |
|
|
|
# 使用密码连接服务器 |
|
|
@ -181,7 +184,7 @@ class ClientUtil: |
|
|
|
trans.close() |
|
|
|
trans.close() |
|
|
|
|
|
|
|
|
|
|
|
def upload_client(self, cinema_ip, short_version): |
|
|
|
def upload_client(self, cinema_ip, short_version): |
|
|
|
print('upload_client') |
|
|
|
print('upload_client', cinema_ip, short_version) |
|
|
|
# 上传操作 |
|
|
|
# 上传操作 |
|
|
|
client_version = self.get_client_version(cinema_ip, short_version) |
|
|
|
client_version = self.get_client_version(cinema_ip, short_version) |
|
|
|
print(f'开始上传操作, 目标主机 {cinema_ip}, 客户端版本 {client_version}') |
|
|
|
print(f'开始上传操作, 目标主机 {cinema_ip}, 客户端版本 {client_version}') |
|
|
@ -208,6 +211,7 @@ class ClientUtil: |
|
|
|
def client_process(self, cinema_ip, short_release): |
|
|
|
def client_process(self, cinema_ip, short_release): |
|
|
|
self.smb_connect() |
|
|
|
self.smb_connect() |
|
|
|
short_version = short_release[:11] |
|
|
|
short_version = short_release[:11] |
|
|
|
|
|
|
|
print('short_version', short_version) |
|
|
|
self.handle_client_db() |
|
|
|
self.handle_client_db() |
|
|
|
self.clear_delete_file() |
|
|
|
self.clear_delete_file() |
|
|
|
self.get_client(cinema_ip, short_version) |
|
|
|
self.get_client(cinema_ip, short_version) |
|
|
|