From 3e83608ae84748636528e2d7618fcb96ca89ea65 Mon Sep 17 00:00:00 2001 From: Alexander Hayden Date: Fri, 27 Sep 2019 12:40:39 -0400 Subject: catch master up to 'JEFFREY' --- update.py | 202 ++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 143 insertions(+), 59 deletions(-) (limited to 'update.py') diff --git a/update.py b/update.py index 68e598a..3404175 100755 --- a/update.py +++ b/update.py @@ -1,90 +1,174 @@ #!/usr/bin/env python3 -import hashlib -import requests + +import argparse import os -import shutil import sys +import hashlib +import shutil + +import requests -# Initalize from config -INSTALL_DIR = "" -with open("pack-location.txt", "r") as f: - INSTALL_DIR = f.read().strip() +parser = argparse.ArgumentParser( + description="A Simple Git-Based Modpack Manager", + formatter_class=argparse.RawDescriptionHelpFormatter, + epilog='''\ +Available commands: + install : Downloads mods listed in version.txt and populates the mods folder specified in pack-location.txt + apply_updates : Using the urls in mods.txt, repopulates version.txt to reflect the most recent mod versions + check_updates : Compares version.txt and mods.txt to see if any mods can be updated +''') +parser.add_argument('command', + nargs='?', + default='install', + help="The action to perform (default: install)") +parser.add_argument('filename', + nargs='?', + default="mods.txt", + help="Optional filename to specify latest mods (default: mods.txt)") +parser.add_argument('--version-file', + type=str, + default="version.txt", + help="Optional custom version file to download mods from (default: version.txt)") +parser.add_argument('--pack-location', + type=str, + help="Optional custom modpack folder location (default: read from pack-location.txt)") +parser.add_argument('--whitelist-file', + type=str, + default="whitelist.txt", + help="Optional custom whitelist file that tells 'install' which files not to remove (default: whitelist.txt)") + +## loaded from version.txt +VERSION = 0 + +def read_file(fil): + strings = [] + with open(fil) as f: + for line in f: + string = line.strip().split() + if len(line) > 1 and line[0] != '#': + # run strip on each element + string = tuple(map(lambda x: x.strip(), string)) + strings.append(string) + + return strings # Apply updates to the actual mod pack -def install(): - print("Updating pack...") +def install(args): + print("Updating pack with version " + str(VERSION) + "...") + print() # (fname, checksum, url) - mods = read_file("downloads.txt") + mods = read_file(args.version_file) names = [mod[0] for mod in mods] + # whitelist client mods (e.g. optifine) + names += [line[0] for line in read_file(args.whitelist_file)] + for mod in mods: - if mod[0] in os.listdir(INSTALL_DIR) and hashlib.sha1(open(os.path.join(INSTALL_DIR, mod[0]), 'rb').read()).hexdigest() == mod[1]: - print("Skipping " + mod[0] + ", already up to date") + mod_path = os.path.join(args.pack_location, mod[0]) + if os.path.exists(mod_path) and os.path.isfile(mod_path) and \ + hashlib.sha1(open(mod_path, 'rb').read()).hexdigest() == mod[1]: + print("Skipping {mod[0]}, already up to date".format(mod=mod)) else: - print(f'Installing {mod[0]} from {mod[2]}...') + print('Installing {mod[0]} from {mod[2]}...'.format(mod=mod)) download_obj = requests.get(mod[2], stream=True) - with open(os.path.join(INSTALL_DIR, mod[0]), "wb") as write_file: + with open(mod_path, "wb") as write_file: shutil.copyfileobj(download_obj.raw, write_file) print("Done!") - print("\nRemoving old versions...") - for jar in os.listdir(INSTALL_DIR): + print() + print("Removing old mods...") + for jar in os.listdir(args.pack_location): if jar not in names and os.path.splitext(jar)[1] == ".jar": - os.remove(os.path.join(INSTALL_DIR, jar)) - print(f"Removing '{jar}'") + os.remove(os.path.join(args.pack_location, jar)) + print("Removing '{jar}'".format(jar=jar)) - print("\nFinished updating pack!") + print() + print("Finished installing mods!") -# Using the latest urls, update downloads.txt to match the urls and have the correct sha1 -def apply_updates(): - print("Reading update file...") - mods = read_file("latest-urls.txt") - print("Downloading new versions of all mods...") - with open('downloads.txt', 'w') as f: +# Using the latest urls, update downloads.txt to match and have the correct sha1 +def apply_updates(args): + print("Populating version File...") + mods = read_file(args.filename) + print("Getting new versions of all mods...") + with open(args.version_file, 'w') as f: f.write('# Format: \n') + f.write("#VERSION " + str(VERSION + 1) + "\n") for mod in mods: - print(f"Downloading {mod[0]}...") + print("Fetching {mod[0]}...".format(mod=mod)) resp = requests.get(mod[1]) - hsh = hashlib.sha1(resp.content) - f.write(f'{mod[0]} {hsh.hexdigest()} {resp.url}\n') - print("\nDone downloading updates!") + hsh = hashlib.sha1(resp.content).hexdigest() + f.write('{mod[0]} {hsh} {resp.url}\n'.format(mod=mod, hsh=hsh, resp=resp)) + print() + print("Done!") + print("Updates applied to {args.version_file}".format(args=args)) + print("New pack version is " + str(VERSION + 1)) + print("[!] No mods were installed. To update your mods folder, run 'update.py install'") + # Find if any updates are available -def check_updates(): - print("Reading update files...") - latest = read_file("latest-urls.txt") - old = read_file("downloads.txt") +def check_updates(args): + print("Checking for updates to version " + str(VERSION) + "...") + latest = read_file(args.filename) + old = read_file(args.version_file) old_urls = [mod[2] for mod in old] + num_updates = 0 - print("Checking updates...\nThe following mods have updates available:\n") + print("Checking updates...") for mod in latest: + print("Checking for updates to {mod[0]}...".format(mod=mod), end="") + sys.stdout.flush() # takes care of line-buffered terminals resp = requests.get(mod[1]) - if not resp.url in old_urls: - print(f" -> Found update for {mod[0]}: {resp.url.split('/')[-1]}") - print("\nFinished checking for updates!") + if resp.url in old_urls: + print(" No updates") + else: + print(" Found update: " + resp.url.split('/')[-1]) + num_updates += 1 + + print("Finished checking for updates. {num} mods can be updated".format(num=num_updates)) + if num_updates >= 0: + print("Run 'python update.py apply_updates' to create a new version with these updates applied.") -def read_file(fil): - strings = set() - with open(fil) as f: - for line in f: - string = line.strip().split() - if len(line) >= 1 and line[0] != '#': - # run strip on each element - string = tuple(map(lambda x: x.strip(), string)) - strings.add(string) - return strings +COMMAND_MAP = { + 'install': install, + 'apply_updates': apply_updates, + 'check_updates': check_updates, +} +if __name__ == "__main__": + args = parser.parse_args() + + if not args.pack_location: + # initialize from config + with open("pack-location.txt", "r") as f: + args.pack_location = f.read().strip() -if len(sys.argv) < 2: - print(f"Usage: {sys.argv[0]} ") - sys.exit(-1) -elif sys.argv[1] == 'install': - install() -elif sys.argv[1] == 'apply_updates': - apply_updates() -elif sys.argv[1] == 'check_updates': - check_updates() -else: - print(f"Usage: {sys.argv[0]} ") - sys.exit(-1) + if not os.path.exists(args.version_file): + print("Error: version file\"" + args.version_file + "\" does not exist.") + parser.print_help() + sys.exit(1) + if not os.path.exists(args.pack_location): + print("Error: mod folder \"" + args.pack_location + "\" does not exist.") + parser.print_help() + sys.exit(1) + elif not os.path.isdir(args.pack_location): + print("Error: mod folder \"" + args.pack_location + "\" is not actually a folder.") + parser.print_help() + sys.exit(1) + if not os.path.exists(args.whitelist_file): + print("Error: whitelist file \"" + args.whitelist_file + "\" does not exist.") + sys.exit(1) + + if not (args.command in COMMAND_MAP): + print("Error: command \"" + args.command + "\" does not exist") + parser.print_help() + sys.exit(1) + + # fetch version + with open(args.version_file) as f: + for line in f: + if line.strip().split()[0] == "#VERSION": + VERSION = int(line.strip().split()[1]) + break + # run the command + COMMAND_MAP[args.command](args) -- cgit v1.2.3