【热更工具】添加不使用多线程上传的方式,并兼容多参数设置

master
JLIOSM1 2021-08-21 18:50:43 +08:00
parent 9acdc48604
commit a1919b43cd
1 changed files with 26 additions and 7 deletions

View File

@ -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!")