mirror of
https://github.com/ihaveamac/custom-install.git
synced 2025-12-06 06:41:45 +00:00
custominstall: read all CIAs before installing
Prevents the issue of one having a corrupt header or something causing an issue in the middle of writing.
This commit is contained in:
12
ci-gui.py
12
ci-gui.py
@@ -355,7 +355,6 @@ class CustomInstallGUI(ttk.Frame):
|
||||
installer = CustomInstall(boot9=boot9,
|
||||
seeddb=seeddb,
|
||||
movable=movable_sed,
|
||||
cias=cias,
|
||||
sd=sd_root,
|
||||
skip_contents=self.skip_contents_var.get() == 1,
|
||||
overwrite_saves=self.overwrite_saves_var.get() == 1)
|
||||
@@ -393,12 +392,21 @@ class CustomInstallGUI(ttk.Frame):
|
||||
installer.event.on_error += ci_on_error
|
||||
installer.event.on_cia_start += ci_on_cia_start
|
||||
|
||||
try:
|
||||
installer.prepare_titles(cias)
|
||||
except Exception as e:
|
||||
for line in format_exception(*exc_info()):
|
||||
for line2 in line.split('\n')[:-1]:
|
||||
installer.log(line2)
|
||||
self.show_error('An error occurred when trying to read the files.')
|
||||
self.open_console()
|
||||
|
||||
if taskbar:
|
||||
taskbar.SetProgressState(self.hwnd, tbl.TBPF_NORMAL)
|
||||
|
||||
def install():
|
||||
try:
|
||||
result, copied_3dsx = installer.start(continue_on_fail=False)
|
||||
result, copied_3dsx = installer.start()
|
||||
if result is True:
|
||||
self.log('Done!')
|
||||
if copied_3dsx:
|
||||
|
||||
@@ -19,7 +19,7 @@ import subprocess
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from os import PathLike
|
||||
from typing import Union
|
||||
from typing import List, Union
|
||||
|
||||
from events import Events
|
||||
|
||||
@@ -141,10 +141,7 @@ def save_cifinish(path: 'Union[PathLike, bytes, str]', data: dict):
|
||||
|
||||
|
||||
class CustomInstall:
|
||||
|
||||
cia: CIAReader
|
||||
|
||||
def __init__(self, boot9, seeddb, movable, cias, sd, cifinish_out=None,
|
||||
def __init__(self, boot9, seeddb, movable, sd, cifinish_out=None,
|
||||
overwrite_saves=False, skip_contents=False):
|
||||
self.event = Events()
|
||||
self.log_lines = [] # Stores all info messages for user to view
|
||||
@@ -152,7 +149,7 @@ class CustomInstall:
|
||||
self.crypto = CryptoEngine(boot9=boot9)
|
||||
self.crypto.setup_sd_key_from_file(movable)
|
||||
self.seeddb = seeddb
|
||||
self.cias = cias
|
||||
self.readers = []
|
||||
self.sd = sd
|
||||
self.skip_contents = skip_contents
|
||||
self.overwrite_saves = overwrite_saves
|
||||
@@ -171,7 +168,14 @@ class CustomInstall:
|
||||
if fire_event:
|
||||
self.event.update_percentage((total_read / size) * 100, total_read / 1048576, size / 1048576)
|
||||
|
||||
def start(self, continue_on_fail=True):
|
||||
def prepare_titles(self, paths: 'List[PathLike]'):
|
||||
readers = []
|
||||
for path in paths:
|
||||
self.log(f'Reading {path}')
|
||||
readers.append(CIAReader(path))
|
||||
self.readers = readers
|
||||
|
||||
def start(self):
|
||||
if frozen:
|
||||
save3ds_fuse_path = join(script_dir, 'bin', 'save3ds_fuse')
|
||||
else:
|
||||
@@ -204,22 +208,10 @@ class CustomInstall:
|
||||
|
||||
# Now loop through all provided cia files
|
||||
|
||||
for idx, c in enumerate(self.cias):
|
||||
self.log('Reading ' + c)
|
||||
|
||||
try:
|
||||
cia = CIAReader(c)
|
||||
except Exception as e:
|
||||
self.event.on_error(sys.exc_info())
|
||||
if continue_on_fail:
|
||||
continue
|
||||
else:
|
||||
return None, False
|
||||
for idx, cia in enumerate(self.readers):
|
||||
|
||||
self.event.on_cia_start(idx)
|
||||
|
||||
self.cia = cia
|
||||
|
||||
tid_parts = (cia.tmd.title_id[0:8], cia.tmd.title_id[8:16])
|
||||
|
||||
try:
|
||||
@@ -536,7 +528,6 @@ if __name__ == "__main__":
|
||||
|
||||
installer = CustomInstall(boot9=args.boot9,
|
||||
seeddb=args.seeddb,
|
||||
cias=args.cia,
|
||||
movable=args.movable,
|
||||
sd=args.sd,
|
||||
overwrite_saves=args.overwrite_saves,
|
||||
@@ -558,7 +549,9 @@ if __name__ == "__main__":
|
||||
installer.event.update_percentage += percent_handle
|
||||
installer.event.on_error += error
|
||||
|
||||
result, copied_3dsx = installer.start(continue_on_fail=False)
|
||||
installer.prepare_titles(args.cia)
|
||||
|
||||
result, copied_3dsx = installer.start()
|
||||
if result is False:
|
||||
# save3ds_fuse failed
|
||||
installer.log('NOTE: Once save3ds_fuse is fixed, run the same command again with --skip-contents')
|
||||
|
||||
Reference in New Issue
Block a user