diff --git a/cronjob/media/compress.py b/cronjob/media/compress.py index fe8ae06..060301c 100644 --- a/cronjob/media/compress.py +++ b/cronjob/media/compress.py @@ -1,5 +1,5 @@ import os - +from pymongo import UpdateOne from lib.all import * from PIL import Image import oss2 @@ -80,32 +80,31 @@ class S: ret = compress_and_save_image(oss_src_download_path, local_resize_path, resize_p) if ret != "success": logger.Error("compress_and_save_image {} fail, err: {}, src: {}, local: {}".format(resize_p, ret, oss_src_download_path, local_resize_path)) - return False + return None try: ret = self.upload_img_to_oss(local_resize_path, oss_resize_src_id) if ret.status != 200: logger.Error("upload_img_to_oss {} fail, err: {}, src: {}, local: {}".format(resize_p, ret, oss_src_download_path, local_resize_path)) - return False - # 更新mongo - file_size = os.path.getsize(local_resize_path) - q = { - "src_id": oss_src_id - } - up = { + return None + + except Exception as e: + logger.Error("upload_img_to_oss {} fail, err: {}, src: {}, local: {}".format(resize_p, str(e), oss_src_download_path, local_resize_path)) + return None + + file_size = os.path.getsize(local_resize_path) + q = { + "src_id": oss_src_id + } + up = { + "$set": { "size_{}".format(resize_p): file_size, "src_id_{}".format(resize_p): oss_resize_src_id } - mongo_ret = self.col_image.update_one(q, up) - if not mongo_ret: - logger.Error("update_one fail, q: {}, up: {}".format(q, up)) - return False - except Exception as e: - logger.Error("upload_img_to_oss {} fail, err: {}, src: {}, local: {}".format(resize_p, str(e), oss_src_download_path, local_resize_path)) - return False - + } + uo = UpdateOne(q, up) os.remove(local_resize_path) - return True + return uo def proc(self): images = [ @@ -120,6 +119,8 @@ class S: # 当前目录 cur_dir = os.getcwd() + "/" + bulk_reqs = list() + # 先下载到本地,源文件 oss_src_download_path = cur_dir + src_id_python_type + ".jpeg" try: @@ -129,24 +130,35 @@ class S: "src_id": oss_src_id } up = { - "size_src": src_size, + "$set": { + "size_src": src_size, + } } - mongo_ret = self.col_image.update_one(q, up) - if not mongo_ret: - logger.Error("update_one fail, q: {}, up: {}".format(q, up)) - continue + bulk_reqs.append(UpdateOne(q, up)) except Exception as e: logger.Error("save_img_from_oss fail, err: {}, src_id: {}".format(str(e), oss_src_id)) continue # 720P - ret = self.deal_one(oss_src_id, oss_src_download_path, "jpeg", Resize720P) + uo720 = self.deal_one(oss_src_id, oss_src_download_path, "jpeg", Resize720P) + if not uo720: + logger.Error("deal_one 720 error, oss_src_id: {}".format(oss_src_id)) + else: + bulk_reqs.append(uo720) # 1080P - ret = self.deal_one(oss_src_id, oss_src_download_path, "jpeg", Resize1080P) + uo1080 = self.deal_one(oss_src_id, oss_src_download_path, "jpeg", Resize1080P) + if not uo1080: + logger.Error("deal_one 1080 error, oss_src_id: {}".format(oss_src_id)) + else: + bulk_reqs.append(uo1080) # 1440P - ret = self.deal_one(oss_src_id, oss_src_download_path, "jpeg", Resize1440P) + uo1440 = self.deal_one(oss_src_id, oss_src_download_path, "jpeg", Resize1440P) + if not uo1440: + logger.Error("deal_one 1440 error, oss_src_id: {}".format(oss_src_id)) + else: + bulk_reqs.append(uo1440) os.remove(oss_src_download_path)