improv: swap the order of conflict responses

users may associate this with the order in which we display timestamps
This commit is contained in:
Paweł Lidwin 2024-10-09 12:27:52 +02:00
parent bc3331b632
commit 01b69f53c5
No known key found for this signature in database
GPG key ID: C6EDF064F9FEE1E1

View file

@ -535,15 +535,15 @@ class LegendaryCLI:
logger.warning('Run the command again with appropriate force parameter to effectively pick the save') logger.warning('Run the command again with appropriate force parameter to effectively pick the save')
continue continue
else: else:
result = get_int_choice('Which saves should be kept? Type the number corresponding to preferred action (local - 1/remote - 2/cancel - 3)', result = get_int_choice('Which saves should be kept? Type the number corresponding to preferred action (remote - 1/local - 2/cancel - 3)',
default=3, min_choice=1, max_choice=3) default=3, min_choice=1, max_choice=3)
if result == 1: if result == 1:
self.core.upload_save(igame.app_name, igame.save_path, dt_l, args.disable_filters) self.core.download_saves(igame.app_name, save_dir=igame.save_path, clean_dir=True,
manifest_name=latest_save[igame.app_name].manifest_name)
igame.save_timestamp = time.time() igame.save_timestamp = time.time()
self.core.lgd.set_installed_game(igame.app_name, igame) self.core.lgd.set_installed_game(igame.app_name, igame)
elif result == 2: elif result == 2:
self.core.download_saves(igame.app_name, save_dir=igame.save_path, clean_dir=True, self.core.upload_save(igame.app_name, igame.save_path, dt_l, args.disable_filters)
manifest_name=latest_save[igame.app_name].manifest_name)
igame.save_timestamp = time.time() igame.save_timestamp = time.time()
self.core.lgd.set_installed_game(igame.app_name, igame) self.core.lgd.set_installed_game(igame.app_name, igame)
else: else: