diff --git a/hlna.py b/hlna.py index 3343b4f..d3b2530 100755 --- a/hlna.py +++ b/hlna.py @@ -382,61 +382,59 @@ def modextract(id_mod, id_game_workshop): print_line(dirnames) for dname in dirnames: os.makedirs(os.path.join(modextractdir, os.path.relpath(os.path.join(dirpath, dname), mod_steam_workshop)), exist_ok=True) - print_line(filenames) - print_line(dirnames) - for fname in filenames: - if not os.path.isfile(os.path.join(mod_steam_workshop, fname)) and not os.path.isfile(os.path.join(mod_steam_workshop, fname + ".z")): - os.unlink(os.path.join(modextractdir, fname)) - for dname in dirnames: - if not os.path.isdir(os.path.join(mod_steam_workshop, dname)): - shutil.rmtree(os.path.join(modextractdir, os.path.relpath(os.path.join(dirpath, dname), mod_steam_workshop))) + for fname in filenames: + if not os.path.isfile(os.path.join(mod_steam_workshop, fname)) and not os.path.isfile(os.path.join(mod_steam_workshop, fname + ".z")): + os.unlink(os.path.join(modextractdir, fname)) + for dname in dirnames: + if not os.path.isdir(os.path.join(mod_steam_workshop, dname)): + shutil.rmtree(os.path.join(modextractdir, os.path.relpath(os.path.join(dirpath, dname), mod_steam_workshop))) - for root, dirs, files in os.walk(mod_steam_workshop): - for name in files: - if not (name.endswith(".z") or name.endswith(".z.uncompressed_size")): - srcfile = os.path.join(root, name) - dstfile = os.path.join(modextractdir, os.path.relpath(srcfile, mod_steam_workshop)) - if not os.path.isfile(dstfile) or os.path.getmtime(srcfile) > os.path.getmtime(dstfile): - shutil.copy2(srcfile, dstfile) + for root, dirs, files in os.walk(mod_steam_workshop): + for name in files: + if not (name.endswith(".z") or name.endswith(".z.uncompressed_size")): + srcfile = os.path.join(root, name) + dstfile = os.path.join(modextractdir, os.path.relpath(srcfile, mod_steam_workshop)) + if not os.path.isfile(dstfile) or os.path.getmtime(srcfile) > os.path.getmtime(dstfile): + shutil.copy2(srcfile, dstfile) - modname = subprocess.check_output(['curl', '-s', 'https://steamcommunity.com/sharedfiles/filedetails/?id={}'.format(id_mod)]).decode('utf-8') - modname = re.search(r'