add never adjust answer to client
This commit is contained in:
parent
be02136a1b
commit
8060aa7884
|
@ -65,7 +65,10 @@ def main():
|
||||||
logging.basicConfig(format='%(message)s', level=loglevel)
|
logging.basicConfig(format='%(message)s', level=loglevel)
|
||||||
args, path = adjust(args=args)
|
args, path = adjust(args=args)
|
||||||
from Utils import persistent_store
|
from Utils import persistent_store
|
||||||
persistent_store("adjuster", "last_settings_2", args)
|
from Rom import Sprite
|
||||||
|
if isinstance(args.sprite, Sprite):
|
||||||
|
args.sprite = args.sprite.name
|
||||||
|
persistent_store("adjuster", "last_settings_3", args)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
main()
|
main()
|
||||||
|
|
5
Gui.py
5
Gui.py
|
@ -844,7 +844,10 @@ def guiMain(args=None):
|
||||||
else:
|
else:
|
||||||
messagebox.showinfo(title="Success", message="Rom patched successfully")
|
messagebox.showinfo(title="Success", message="Rom patched successfully")
|
||||||
from Utils import persistent_store
|
from Utils import persistent_store
|
||||||
persistent_store("adjuster", "last_settings_2", guiargs)
|
from Rom import Sprite
|
||||||
|
if isinstance(guiargs.sprite, Sprite):
|
||||||
|
guiargs.sprite = guiargs.sprite.name
|
||||||
|
persistent_store("adjuster", "last_settings_3", guiargs)
|
||||||
|
|
||||||
adjustButton = Button(bottomFrame2, text='Adjust Rom', command=adjustRom)
|
adjustButton = Button(bottomFrame2, text='Adjust Rom', command=adjustRom)
|
||||||
|
|
||||||
|
|
16
Utils.py
16
Utils.py
|
@ -222,28 +222,32 @@ def get_adjuster_settings(romfile: str) -> typing.Tuple[str, bool]:
|
||||||
if hasattr(get_adjuster_settings, "adjuster_settings"):
|
if hasattr(get_adjuster_settings, "adjuster_settings"):
|
||||||
adjuster_settings = getattr(get_adjuster_settings, "adjuster_settings")
|
adjuster_settings = getattr(get_adjuster_settings, "adjuster_settings")
|
||||||
else:
|
else:
|
||||||
adjuster_settings = persistent_load().get("adjuster", {}).get("last_settings_2", {})
|
adjuster_settings = persistent_load().get("adjuster", {}).get("last_settings_3", {})
|
||||||
|
|
||||||
if adjuster_settings:
|
if adjuster_settings:
|
||||||
import pprint
|
import pprint
|
||||||
import Patch
|
import Patch
|
||||||
adjuster_settings.rom = romfile
|
adjuster_settings.rom = romfile
|
||||||
adjuster_settings.baserom = Patch.get_base_rom_path()
|
adjuster_settings.baserom = Patch.get_base_rom_path()
|
||||||
whitelist = {"disablemusic", "fastmenu", "heartbeep", "heartcolor", "ow_palettes", "quickswap",
|
whitelist = {"disablemusic", "fastmenu", "heartbeep", "heartcolor", "ow_palettes", "quickswap",
|
||||||
"uw_palettes"}
|
"uw_palettes", "sprite"}
|
||||||
printed_options = {name: value for name, value in vars(adjuster_settings).items() if name in whitelist}
|
printed_options = {name: value for name, value in vars(adjuster_settings).items() if name in whitelist}
|
||||||
sprite = getattr(adjuster_settings, "sprite", None)
|
|
||||||
if sprite:
|
|
||||||
printed_options["sprite"] = adjuster_settings.sprite.name
|
|
||||||
if hasattr(get_adjuster_settings, "adjust_wanted"):
|
if hasattr(get_adjuster_settings, "adjust_wanted"):
|
||||||
adjust_wanted = getattr(get_adjuster_settings, "adjust_wanted")
|
adjust_wanted = getattr(get_adjuster_settings, "adjust_wanted")
|
||||||
|
elif persistent_load().get("adjuster", {}).get("never_adjust", False): # never adjust, per user request
|
||||||
|
return romfile, False
|
||||||
else:
|
else:
|
||||||
adjust_wanted = input(f"Last used adjuster settings were found. Would you like to apply these? \n"
|
adjust_wanted = input(f"Last used adjuster settings were found. Would you like to apply these? \n"
|
||||||
f"{pprint.pformat(printed_options)}\n"
|
f"{pprint.pformat(printed_options)}\n"
|
||||||
f"Enter yes or no: ")
|
f"Enter yes, no or never: ")
|
||||||
if adjust_wanted and adjust_wanted.startswith("y"):
|
if adjust_wanted and adjust_wanted.startswith("y"):
|
||||||
adjusted = True
|
adjusted = True
|
||||||
import AdjusterMain
|
import AdjusterMain
|
||||||
_, romfile = AdjusterMain.adjust(adjuster_settings)
|
_, romfile = AdjusterMain.adjust(adjuster_settings)
|
||||||
|
elif adjust_wanted and "never" in adjust_wanted:
|
||||||
|
persistent_store("adjuster", "never_adjust", True)
|
||||||
|
return romfile, False
|
||||||
else:
|
else:
|
||||||
adjusted = False
|
adjusted = False
|
||||||
import logging
|
import logging
|
||||||
|
|
Loading…
Reference in New Issue