diff --git a/install.py b/install.py index 53f7e1cdf..5688ca014 100644 --- a/install.py +++ b/install.py @@ -12051,7 +12051,10 @@ def _plan_lines(check: dict, dest: Path | None, state: TuiState) -> list: lines.append(f"Not enough free space: {format_size(check['bytes_needed'])} " "needed. Free some, or choose another folder.") if wrong: - lines.append("They are replaced, and the old copies are kept in a backup folder.") + # With its subject: "They are replaced" sat lines under the count. + lines.append(f"The {wrong} wrong {'copy' if wrong == 1 else 'copies'} " + f"{'is' if wrong == 1 else 'are'} replaced, the old " + f"{'one' if wrong == 1 else 'ones'} kept in a backup folder.") misplaced = _tui_misplaced(state) if check is state.check else [] if misplaced: lines.insert(3, f"{_plural(len(misplaced), 'file')} " @@ -12403,7 +12406,11 @@ def _view_confirm(state: TuiState, width: int, height: int) -> tuple: if state.running or state.dry is None: lines: list = ["Counting the files for these choices..."] else: - lines = _plan_lines(state.dry, state.dest, state) + # Why this screen: the numbers above are counted again for the + # systems and options chosen, the last look before anything is + # written. + lines = ["Counted again for your choices. Nothing is written before Install.", + *_plan_lines(state.dry, state.dest, state)] return ("Confirm", _compose(state, width, height, lines, tui_rows(state)), ("A/Enter Install", "B/Esc Back", "? Help")) diff --git a/tests/fixtures/tui/confirm-120x40.txt b/tests/fixtures/tui/confirm-120x40.txt index 89ee7e0e4..ec7e73637 100644 --- a/tests/fixtures/tui/confirm-120x40.txt +++ b/tests/fixtures/tui/confirm-120x40.txt @@ -1,5 +1,6 @@ RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -34,7 +35,6 @@ - A/Enter Install B/Esc Back ? Help diff --git a/tests/fixtures/tui/confirm-40x12.txt b/tests/fixtures/tui/confirm-40x12.txt index e6b28e26d..a6829f6b0 100644 --- a/tests/fixtures/tui/confirm-40x12.txt +++ b/tests/fixtures/tui/confirm-40x12.txt @@ -1,5 +1,7 @@ RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -7,6 +9,4 @@ > Install Back - - A/Enter Install B/Esc Back ? Help diff --git a/tests/fixtures/tui/confirm-40x15.txt b/tests/fixtures/tui/confirm-40x15.txt index d44fb0005..250844ab7 100644 --- a/tests/fixtures/tui/confirm-40x15.txt +++ b/tests/fixtures/tui/confirm-40x15.txt @@ -1,5 +1,7 @@ RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -10,6 +12,4 @@ - - A/Enter Install B/Esc Back ? Help diff --git a/tests/fixtures/tui/confirm-80x24.txt b/tests/fixtures/tui/confirm-80x24.txt index 6e2101480..b373fe4db 100644 --- a/tests/fixtures/tui/confirm-80x24.txt +++ b/tests/fixtures/tui/confirm-80x24.txt @@ -1,5 +1,6 @@ RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -20,5 +21,4 @@ - A/Enter Install B/Esc Back ? Help diff --git a/tests/fixtures/tui/plan-120x40.txt b/tests/fixtures/tui/plan-120x40.txt index 0c0ad949d..25e7bbce7 100644 --- a/tests/fixtures/tui/plan-120x40.txt +++ b/tests/fixtures/tui/plan-120x40.txt @@ -4,7 +4,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems diff --git a/tests/fixtures/tui/plan-40x15.txt b/tests/fixtures/tui/plan-40x15.txt index 709f289fb..5f7240348 100644 --- a/tests/fixtures/tui/plan-40x15.txt +++ b/tests/fixtures/tui/plan-40x15.txt @@ -4,8 +4,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems diff --git a/tests/fixtures/tui/plan-80x24.txt b/tests/fixtures/tui/plan-80x24.txt index ee2684f49..6b26353e0 100644 --- a/tests/fixtures/tui/plan-80x24.txt +++ b/tests/fixtures/tui/plan-80x24.txt @@ -4,7 +4,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems diff --git a/tests/fixtures/tui/route-evmapy.txt b/tests/fixtures/tui/route-evmapy.txt index 1e46aebf1..c9f54b1b5 100644 --- a/tests/fixtures/tui/route-evmapy.txt +++ b/tests/fixtures/tui/route-evmapy.txt @@ -450,8 +450,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems @@ -466,7 +466,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems @@ -865,6 +865,8 @@ === confirm 40x12 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -872,12 +874,12 @@ > Install Back - - A Install B Back === confirm 40x15 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -888,12 +890,11 @@ - - A Install B Back === confirm 80x24 RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -914,7 +915,6 @@ - A Install B Back === installing 40x12 RetroBIOS: Installing diff --git a/tests/fixtures/tui/route-gptokeyb.txt b/tests/fixtures/tui/route-gptokeyb.txt index 5fc8c13d6..9812144e8 100644 --- a/tests/fixtures/tui/route-gptokeyb.txt +++ b/tests/fixtures/tui/route-gptokeyb.txt @@ -450,8 +450,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems @@ -466,7 +466,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems @@ -865,6 +865,8 @@ === confirm 40x12 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -872,12 +874,12 @@ > Install Back - - A Install B Back === confirm 40x15 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -888,12 +890,11 @@ - - A Install B Back === confirm 80x24 RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -914,7 +915,6 @@ - A Install B Back === installing 40x12 RetroBIOS: Installing diff --git a/tests/fixtures/tui/route-gptokeyb_muxterm.txt b/tests/fixtures/tui/route-gptokeyb_muxterm.txt index 5fc8c13d6..9812144e8 100644 --- a/tests/fixtures/tui/route-gptokeyb_muxterm.txt +++ b/tests/fixtures/tui/route-gptokeyb_muxterm.txt @@ -450,8 +450,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems @@ -466,7 +466,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems @@ -865,6 +865,8 @@ === confirm 40x12 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -872,12 +874,12 @@ > Install Back - - A Install B Back === confirm 40x15 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -888,12 +890,11 @@ - - A Install B Back === confirm 80x24 RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -914,7 +915,6 @@ - A Install B Back === installing 40x12 RetroBIOS: Installing diff --git a/tests/fixtures/tui/route-keys.txt b/tests/fixtures/tui/route-keys.txt index 5d7e60d8a..51fc6cdfd 100644 --- a/tests/fixtures/tui/route-keys.txt +++ b/tests/fixtures/tui/route-keys.txt @@ -396,8 +396,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems @@ -412,7 +412,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems @@ -811,6 +811,8 @@ === confirm 40x12 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -818,12 +820,12 @@ > Install Back - - Enter Install Esc Back ? Help === confirm 40x15 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -834,12 +836,11 @@ - - Enter Install Esc Back ? Help === confirm 80x24 RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -860,7 +861,6 @@ - Enter Install Esc Back ? Help === installing 40x12 RetroBIOS: Installing diff --git a/tests/fixtures/tui/route-miyoo.txt b/tests/fixtures/tui/route-miyoo.txt index 4b8e2e4aa..faaed9394 100644 --- a/tests/fixtures/tui/route-miyoo.txt +++ b/tests/fixtures/tui/route-miyoo.txt @@ -450,8 +450,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems @@ -466,7 +466,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems @@ -865,6 +865,8 @@ === confirm 40x12 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -872,12 +874,12 @@ > Install Back - - A Install R2 Back === confirm 40x15 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -888,12 +890,11 @@ - - A Install R2 Back === confirm 80x24 RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -914,7 +915,6 @@ - A Install R2 Back === installing 40x12 RetroBIOS: Installing diff --git a/tests/fixtures/tui/route-muxterm.txt b/tests/fixtures/tui/route-muxterm.txt index aa7509a7c..8394f7eaf 100644 --- a/tests/fixtures/tui/route-muxterm.txt +++ b/tests/fixtures/tui/route-muxterm.txt @@ -450,8 +450,8 @@ BIOS folder: ~/.co.../retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies - are kept in a backup folder. + The 1 wrong copy is replaced, the old + one kept in a backup folder. > Install Choose systems @@ -466,7 +466,7 @@ BIOS folder: ~/.config/retroarch/system 1 in place, 3 missing, 1 wrong copy Free space: 50.0 GB - They are replaced, and the old copies are kept in a backup folder. + The 1 wrong copy is replaced, the old one kept in a backup folder. > Install Choose systems @@ -865,6 +865,8 @@ === confirm 40x12 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -872,12 +874,12 @@ > Install Back - - Start Install B Back === confirm 40x15 RetroBIOS: Confirm + Counted again for your choices. + Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.co.../retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -888,12 +890,11 @@ - - Start Install B Back === confirm 80x24 RetroBIOS: Confirm + Counted again for your choices. Nothing is written before Install. 1 file to download, 16.0 KB BIOS folder: ~/.config/retroarch/system 0 in place, 1 missing, 0 wrong copies @@ -914,7 +915,6 @@ - Start Install B Back === installing 40x12 RetroBIOS: Installing