From a1919b43cd13159b8915d365eededda58d004f42 Mon Sep 17 00:00:00 2001 From: JLIOSM1 <774727341@qq.com> Date: Sat, 21 Aug 2021 18:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=E3=80=90=E7=83=AD=E6=9B=B4=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E6=B7=BB=E5=8A=A0=E4=B8=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E5=B9=B6=E5=85=BC=E5=AE=B9=E5=A4=9A=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tools/cos/UpLoad.py | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Tools/cos/UpLoad.py b/Tools/cos/UpLoad.py index 70f2518ae..05bcda0f8 100644 --- a/Tools/cos/UpLoad.py +++ b/Tools/cos/UpLoad.py @@ -51,9 +51,17 @@ def upload_file_to_txy_cos(self, path, file): class Cos_Upload(): logging.basicConfig(level=logging.INFO, stream=sys.stdout) - - def __init__(self, abDir, settingDir, changeVersion): + def __init__(self, *args): + abDir = args[0] + settingDir = args[1] + changeVersion = args[2] + isThread = "1" + if args.__len__() > 3: + isThread = args[3] + self.init(abDir, settingDir, changeVersion, isThread) + + def init(self, abDir, settingDir, changeVersion, isThread): self.settingFile = "Setting.txt" self.configFile = "config.txt" self.versionFile = "version.txt" @@ -65,6 +73,8 @@ class Cos_Upload(): self.change_file = self.setting_dir + "/__HotFixLog/" + changeVersion + ".log" self.loadSetting() + self.IsThread = isThread + # cdn config self.bucket = 'internal-jieling-1302131159' self.secret_id = "AKIDRJxLRFFzwcmiNlLzqPggdplPlrpVec2A" @@ -90,11 +100,17 @@ class Cos_Upload(): def up(self): filelist = self.get_all_file() - pool = ProcessPoolExecutor(4) - for file in filelist: - pool.submit(upload_file_to_txy_cos, self, self.ab_dir + "/" + self.platform + "/", file) - pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.configFile) - pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.versionFile) + if self.IsThread == "1": + pool = ProcessPoolExecutor(4) + for file in filelist: + pool.submit(upload_file_to_txy_cos, self, self.ab_dir + "/" + self.platform + "/", file) + pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.configFile) + pool.submit(upload_file_to_txy_cos, self, self.setting_dir +"/", self.versionFile) + else: + for file in filelist: + upload_file_to_txy_cos(self, self.ab_dir + "/" + self.platform + "/", file) + upload_file_to_txy_cos(self, self.setting_dir +"/", self.configFile) + upload_file_to_txy_cos(self, self.setting_dir +"/", self.versionFile) @@ -102,6 +118,9 @@ if __name__ == '__main__': if sys.argv.__len__() == 4: t = Cos_Upload(sys.argv[1], sys.argv[2], sys.argv[3]) t.up() + elif sys.argv.__len__() == 5: + t = Cos_Upload(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]) + t.up() else: print("params error!")