fix bug: assets packages' order

master
wlt233 6 months ago
parent 825e2293b9
commit df6dcf6582

File diff suppressed because one or more lines are too long

@ -22,25 +22,35 @@ def load_assets():
assets_list["iOS"][i] = defaultdict(list) assets_list["iOS"][i] = defaultdict(list)
android_i = 0 android_i = 0
tmp_android_package = []
if config["ASSETS_PATH_ANDROID"]: if config["ASSETS_PATH_ANDROID"]:
for r, d, fs in os.walk(config["ASSETS_PATH_ANDROID"]): for r, d, fs in os.walk(config["ASSETS_PATH_ANDROID"]):
for f in fs: for f in fs:
if f.endswith(".zip"): if f.endswith(".zip"):
package_type, package_id, package_order = [int(i) for i in f.replace(".zip", "").split("_")] package_type, package_id, package_order = [int(i) for i in f.replace(".zip", "").split("_")]
package_size = os.stat(os.path.join(r, f)).st_size package_size = os.stat(os.path.join(r, f)).st_size
assets_list["Android"][package_type][package_id].append((package_order, package_size)) tmp_android_package.append((package_type, package_id, package_order, package_size))
android_i += 1 android_i += 1
tmp_android_package.sort(key=lambda x: x[2])
tmp_android_package.sort(key=lambda x: x[1])
for p in tmp_android_package:
assets_list["Android"][p[0]][p[1]].append((p[2], p[3]))
logger.info(f"Loaded {android_i} Android packages from {config['ASSETS_PATH_ANDROID']}") logger.info(f"Loaded {android_i} Android packages from {config['ASSETS_PATH_ANDROID']}")
ios_i = 0 ios_i = 0
tmp_ios_package = []
if config["ASSETS_PATH_IOS"]: if config["ASSETS_PATH_IOS"]:
for r, d, fs in os.walk(config["ASSETS_PATH_IOS"]): for r, d, fs in os.walk(config["ASSETS_PATH_IOS"]):
for f in fs: for f in fs:
if f.endswith(".zip"): if f.endswith(".zip"):
package_type, package_id, package_order = [int(i) for i in f.replace(".zip", "").split("_")] package_type, package_id, package_order = [int(i) for i in f.replace(".zip", "").split("_")]
package_size = os.stat(os.path.join(r, f)).st_size package_size = os.stat(os.path.join(r, f)).st_size
assets_list["iOS"][package_type][package_id].append((package_order, package_size)) tmp_ios_package.append((package_type, package_id, package_order, package_size))
ios_i += 1 ios_i += 1
tmp_ios_package.sort(key=lambda x: x[2])
tmp_ios_package.sort(key=lambda x: x[1])
for p in tmp_ios_package:
assets_list["iOS"][p[0]][p[1]].append((p[2], p[3]))
logger.info(f"Loaded {ios_i} iOS packages from {config['ASSETS_PATH_IOS']}") logger.info(f"Loaded {ios_i} iOS packages from {config['ASSETS_PATH_IOS']}")
dirname = os.path.dirname(config["ASSETS_LIST_PATH"]) dirname = os.path.dirname(config["ASSETS_LIST_PATH"])

Loading…
Cancel
Save