mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-18 15:47:51 -06:00
feat: remember the install and open on the plan
An install writes retrobios-backup/<folder>.install.json beside the BIOS folder: each file it placed with its sha1, size and source, and the choice it made. The next run for the same setup and folder takes that choice when the command line chose nothing, in line mode and on the full screen, and says so. A record that cannot be read is said once and ignored. A record event reports it. With one setup found, the full screen opens on its plan, Change where one row away. The plan's Install row says the size its headline says.
This commit is contained in:
1 parent
76ccc3e72a
commit
8f2018e7c2
25 files changed
+1621
-143
No files matched your search
Vendored
+41
@@ -1064,3 +1064,44 @@
|
||||
|
||||
|
||||
^[[0;1;35mA/Enter^[[0m Back
|
||||
=== plan-record
|
||||
^[[0;1m ^[[0;1;35mRetroBIOS^[[0;1m: RetroArch^[[0m
|
||||
|
||||
^[[0;1m ^[[0;1;35m1^[[0;1m file to download, ^[[0;1;35m16.0 KB^[[0m
|
||||
BIOS folder: ^[[0;1m~/.config/retroarch/system^[[0m
|
||||
For nintendo-gba.
|
||||
|
||||
^[[0;7;35m > Install^[[0m
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
^[[0;1;35mA/Enter^[[0m Install ^[[0;2mB/Esc^[[0m Back ^[[0;2mY/o^[[0m Options ^[[0;2m?^[[0m Help
|
||||
Vendored
+13
@@ -336,3 +336,16 @@
|
||||
^[[0;2m Shortened to fit this window.^[[0m
|
||||
|
||||
^[[0;1;35mA^[[0m Back
|
||||
=== plan-record
|
||||
^[[0;1m ^[[0;1;35mRetroBIOS^[[0;1m: RetroArch^[[0m
|
||||
|
||||
^[[0;1m ^[[0;1;35m1^[[0;1m file to download, ^[[0;1;35m16.0 KB^[[0m
|
||||
BIOS folder:
|
||||
^[[0;1m~/.config/retroarch/system^[[0m
|
||||
|
||||
^[[0;7;35m > Install^[[0m
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
^[[0;2m 1-4 of 8^[[0m
|
||||
^[[0;1;35mA^[[0m Install ^[[0;2mB^[[0m Back ^[[0;2mY^[[0m Options ^[[0;2m?^[[0m Help
|
||||
Vendored
+16
@@ -414,3 +414,19 @@
|
||||
|
||||
|
||||
^[[0;1;35mA^[[0m Back
|
||||
=== plan-record
|
||||
^[[0;1m ^[[0;1;35mRetroBIOS^[[0;1m: RetroArch^[[0m
|
||||
|
||||
^[[0;1m ^[[0;1;35m1^[[0;1m file to download, ^[[0;1;35m16.0 KB^[[0m
|
||||
BIOS folder:
|
||||
^[[0;1m~/.config/retroarch/system^[[0m
|
||||
For nintendo-gba.
|
||||
^[[0;7;35m > Install^[[0m
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
^[[0;1;35mA^[[0m Install ^[[0;2mB^[[0m Back ^[[0;2mY^[[0m Options ^[[0;2m?^[[0m Help
|
||||
Vendored
+25
@@ -648,3 +648,28 @@
|
||||
|
||||
|
||||
^[[0;1;35mA/Enter^[[0m Back
|
||||
=== plan-record
|
||||
^[[0;1m ^[[0;1;35mRetroBIOS^[[0;1m: RetroArch^[[0m
|
||||
|
||||
^[[0;1m ^[[0;1;35m1^[[0;1m file to download, ^[[0;1;35m16.0 KB^[[0m
|
||||
BIOS folder: ^[[0;1m~/.config/retroarch/system^[[0m
|
||||
For nintendo-gba.
|
||||
|
||||
^[[0;7;35m > Install^[[0m
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
^[[0;1;35mA/Enter^[[0m Install ^[[0;2mB/Esc^[[0m Back ^[[0;2mY/o^[[0m Options ^[[0;2m?^[[0m Help
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A/Enter Install B/Esc Back Y/o Options ? Help
|
||||
+12
@@ -0,0 +1,12 @@
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
A Install B Back Y Options ? Help
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
A Install B Back Y Options ? Help
|
||||
+24
@@ -0,0 +1,24 @@
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A/Enter Install B/Esc Back Y/o Options ? Help
|
||||
Vendored
+54
@@ -1183,3 +1183,57 @@
|
||||
|
||||
|
||||
A Back
|
||||
=== plan-record 40x12
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
A Install B Back Y Options
|
||||
=== plan-record 40x15
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
A Install B Back Y Options
|
||||
=== plan-record 80x24
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A Install B Back Y Options
|
||||
+54
@@ -1183,3 +1183,57 @@
|
||||
|
||||
|
||||
A Back
|
||||
=== plan-record 40x12
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
A Install B Back Y Options
|
||||
=== plan-record 40x15
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
A Install B Back Y Options
|
||||
=== plan-record 80x24
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A Install B Back Y Options
|
||||
+54
@@ -1183,3 +1183,57 @@
|
||||
|
||||
|
||||
A Back
|
||||
=== plan-record 40x12
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
A Install B Back Y Options
|
||||
=== plan-record 40x15
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
A Install B Back Y Options
|
||||
=== plan-record 80x24
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A Install B Back Y Options
|
||||
Vendored
+54
@@ -1348,3 +1348,57 @@
|
||||
|
||||
|
||||
Enter Back
|
||||
=== plan-record 40x12
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
Enter Install Esc Back o Options
|
||||
=== plan-record 40x15
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
Enter Install Esc Back o Options
|
||||
=== plan-record 80x24
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Enter Install Esc Back o Options ? Help
|
||||
Vendored
+54
@@ -1286,3 +1286,57 @@
|
||||
|
||||
|
||||
A Back
|
||||
=== plan-record 40x12
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
A Install R2 Back L2 Options
|
||||
=== plan-record 40x15
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
A Install R2 Back L2 Options
|
||||
=== plan-record 80x24
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
A Install R2 Back L2 Options
|
||||
Vendored
+54
@@ -1402,3 +1402,57 @@
|
||||
|
||||
|
||||
Start Back
|
||||
=== plan-record 40x12
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
1-4 of 8
|
||||
Start Install B Back
|
||||
=== plan-record 40x15
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder:
|
||||
~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
Start Install B Back
|
||||
=== plan-record 80x24
|
||||
RetroBIOS: RetroArch
|
||||
|
||||
1 file to download, 16.0 KB
|
||||
BIOS folder: ~/.config/retroarch/system
|
||||
For nintendo-gba.
|
||||
|
||||
> Install
|
||||
Same choice as on 3 Nov: yes
|
||||
Choose systems
|
||||
Copy the BIOS files from an old card or a folder
|
||||
Change where
|
||||
Details
|
||||
Options
|
||||
Quit
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Start Install B Back
|
||||
+16
-2
@@ -6954,10 +6954,19 @@ class EventsDescribeTheRun(unittest.TestCase, _SyntheticTree):
|
||||
# The last transfer: every byte came over the network.
|
||||
self.assertEqual([e for e in events if e["event"] == "transfer"][-1],
|
||||
{"event": "transfer", "bytes_local": 0, "bytes_network": 245})
|
||||
record = next(e for e in events if e["event"] == "record")
|
||||
# What the run placed, and its choice, the whole list: written
|
||||
# right before the summary.
|
||||
self.assertEqual({key: record[key] for key in ("folder", "status", "choice", "files")},
|
||||
{"folder": str(self.bios), "status": "written",
|
||||
"choice": ["--all-files"], "files": 3})
|
||||
self.assertEqual(record["path"], str(self.home / install.BACKUP_DIR
|
||||
/ f"{self.bios.name}.install.json"))
|
||||
self.assertEqual([e for e in events if e["event"] not in ("progress", "transfer")],
|
||||
self._head("install", installer) + [
|
||||
{"event": "download", "platform": "retroarch", "files": 3, "bytes": 245},
|
||||
*done,
|
||||
record,
|
||||
{"event": "summary", "mode": "install", "installed": 3, "up_to_date": 1,
|
||||
"pending": 0, "failed": [], "skipped": self.SKIPPED, "left_out": [],
|
||||
"kept": [{"folder": kept[0]["folder"], "files": 1, "bytes": 11}],
|
||||
@@ -7565,7 +7574,11 @@ class KeptFilesEndToEnd(unittest.TestCase, _SyntheticTree):
|
||||
"--no-input", "--jobs", "1", "--verbose")
|
||||
self.assertEqual(proc.returncode, 0, proc.stdout + proc.stderr)
|
||||
self.assertEqual((self.bios / "b.bin").read_bytes(), self.FILES["bios/A/b.bin"])
|
||||
runs = list((self.home / install.BACKUP_DIR).iterdir())
|
||||
# The install record sits beside the run folders, a file of its own.
|
||||
held = list((self.home / install.BACKUP_DIR).iterdir())
|
||||
runs = [path for path in held if path.is_dir()]
|
||||
self.assertEqual(sorted(path.name for path in held if not path.is_dir()),
|
||||
[f"{self.bios.name}.install.json"])
|
||||
self.assertEqual(len(runs), 1)
|
||||
self.assertIn("Kept 1 file already there (11 B), which the collection's copies "
|
||||
f"replaced, in {runs[0]}", proc.stdout)
|
||||
@@ -7594,7 +7607,8 @@ class KeptFilesEndToEnd(unittest.TestCase, _SyntheticTree):
|
||||
again = _install_run(self.env, "--platform", "retroarch", "--dest", str(self.bios),
|
||||
"--no-input", "--jobs", "1")
|
||||
self.assertEqual(again.returncode, 0, again.stderr)
|
||||
self.assertEqual(len(list((self.home / install.BACKUP_DIR).iterdir())), 2)
|
||||
self.assertEqual(len([path for path in (self.home / install.BACKUP_DIR).iterdir()
|
||||
if path.is_dir()]), 2)
|
||||
|
||||
|
||||
|
||||
|
||||
+175
-34
@@ -41,15 +41,17 @@ ESC = "\x1b"
|
||||
|
||||
# (keys to start the install or reach the answer, keys in all). One system
|
||||
# is reached through None and the filter, the other device's folder typed
|
||||
# as ~/bios.
|
||||
# as ~/bios. With one setup found the screen opens on its plan: one key
|
||||
# fewer, and one more for another device, whose Esc goes back to the
|
||||
# setups. The second run of one system takes its install record's choice.
|
||||
JOURNEY_KEYS = {
|
||||
"first_install": (2, 3),
|
||||
"card_with_games": (2, 3),
|
||||
"update": (2, 3),
|
||||
"one_system": (14, 15),
|
||||
"one_system_again": (2, 3),
|
||||
"what_is_missing": (5, 6),
|
||||
"another_device": (19, 20),
|
||||
"first_install": (1, 2),
|
||||
"card_with_games": (1, 2),
|
||||
"update": (1, 2),
|
||||
"one_system": (13, 14),
|
||||
"one_system_again": (1, 2),
|
||||
"what_is_missing": (4, 5),
|
||||
"another_device": (20, 21),
|
||||
}
|
||||
|
||||
# Words each journey's screens show by default, summed over the screens it
|
||||
@@ -58,13 +60,15 @@ JOURNEY_KEYS = {
|
||||
# word: its length is the machine's. A change that adds words raises a
|
||||
# number here and says why.
|
||||
JOURNEY_WORDS = {
|
||||
"first_install": 63,
|
||||
"card_with_games": 106,
|
||||
"update": 79,
|
||||
"one_system": 193,
|
||||
"one_system_again": 68,
|
||||
"what_is_missing": 223,
|
||||
"another_device": 230,
|
||||
"first_install": 47,
|
||||
"card_with_games": 87,
|
||||
"update": 70,
|
||||
"one_system": 179,
|
||||
"one_system_again": 67,
|
||||
"what_is_missing": 207,
|
||||
# The plan of the setup found comes first now (33 words), the setups
|
||||
# one Esc away, and the last plan names Change where (2 words).
|
||||
"another_device": 265,
|
||||
}
|
||||
# Which setup? names every setup, Preview every file: lists, not prose.
|
||||
SCREEN_CEILING = 90
|
||||
@@ -75,7 +79,9 @@ LINE_TEXT = {
|
||||
"card_with_games": (4, 29),
|
||||
"update": (5, 36),
|
||||
"one_system": (4, 18),
|
||||
"what_is_missing": (3, 15),
|
||||
# After one system installed, the check counts the install record's
|
||||
# choice: one line says so, and how to count every file.
|
||||
"what_is_missing": (4, 25),
|
||||
"another_device": (4, 18),
|
||||
}
|
||||
|
||||
@@ -221,10 +227,9 @@ class Journeys(unittest.TestCase):
|
||||
repo = Repository(self)
|
||||
dest = repo.retroarch_here()
|
||||
term = self.start(repo)
|
||||
screen = term.wait("Where to install?", timeout=40)
|
||||
self.assertIn("> RetroArch", screen)
|
||||
self.press(term, "\r")
|
||||
term.wait("files to download", timeout=40)
|
||||
# The one setup found: its plan first.
|
||||
screen = term.wait("files to download", timeout=40)
|
||||
self.assertIn("Change where", screen)
|
||||
self.press(term, "\r")
|
||||
started = self.keys
|
||||
self.assertEqual(self.finish(term), 0)
|
||||
@@ -241,8 +246,6 @@ class Journeys(unittest.TestCase):
|
||||
(card / "ROMS" / "GBA").mkdir(parents=True)
|
||||
(card / "ROMS" / "GBA" / "unknown.gba").write_bytes(b"not in any catalog")
|
||||
term = self.start(repo, env={"JOURNEY_CARD": str(card)})
|
||||
term.wait("Where to install?", timeout=40)
|
||||
self.press(term, "\r")
|
||||
screen = term.wait("For the games on this card: yes", timeout=60)
|
||||
self.assertIn("For the 1 game on this card.", screen)
|
||||
self.press(term, "\r")
|
||||
@@ -265,8 +268,6 @@ class Journeys(unittest.TestCase):
|
||||
changed["size"] += 1
|
||||
repo.write_list()
|
||||
term = self.start(repo)
|
||||
term.wait("Where to install?", timeout=40)
|
||||
self.press(term, "\r")
|
||||
term.wait("1 file to download", timeout=40)
|
||||
self.press(term, "\r")
|
||||
started = self.keys
|
||||
@@ -278,8 +279,6 @@ class Journeys(unittest.TestCase):
|
||||
repo = Repository(self)
|
||||
dest = repo.retroarch_here()
|
||||
term = self.start(repo)
|
||||
term.wait("Where to install?", timeout=40)
|
||||
self.press(term, "\r")
|
||||
term.wait("files to download", timeout=40)
|
||||
for _step in range(12):
|
||||
if "> Choose systems" in term.settle():
|
||||
@@ -298,24 +297,25 @@ class Journeys(unittest.TestCase):
|
||||
self.assertEqual(self.finish(term), 0)
|
||||
self.counted("one_system", started, self.keys)
|
||||
self.assertEqual(written(dest), ["gba_bios.bin"])
|
||||
# The next release: the earlier choice is not kept, and two keys
|
||||
# install the whole list.
|
||||
# The next release changes its file: the plan opens on the same
|
||||
# choice, read from the install record, and one key installs it.
|
||||
changed = next(e for e in repo.listed["files"] if e["dest"] == "gba_bios.bin")
|
||||
changed["size"] += 1
|
||||
repo.write_list()
|
||||
term = self.start(repo)
|
||||
term.wait("Where to install?", timeout=40)
|
||||
self.press(term, "\r")
|
||||
term.wait("files to download", timeout=40)
|
||||
screen = term.wait("1 file to download", timeout=40)
|
||||
self.assertRegex(screen, r"Same choice as on \d+ [A-Z][a-z]{2}: yes")
|
||||
self.press(term, "\r")
|
||||
started = self.keys
|
||||
self.assertEqual(self.finish(term), 0)
|
||||
self.counted("one_system_again", started, self.keys)
|
||||
self.assertEqual(written(dest), sorted(e["dest"] for e in repo.listed["files"]))
|
||||
self.assertEqual(written(dest), ["gba_bios.bin"])
|
||||
self.assertEqual((dest / "gba_bios.bin").stat().st_size, changed["size"])
|
||||
|
||||
def test_what_is_missing(self):
|
||||
repo = Repository(self)
|
||||
repo.retroarch_here()
|
||||
term = self.start(repo)
|
||||
term.wait("Where to install?", timeout=40)
|
||||
self.press(term, "\r")
|
||||
term.wait("files to download", timeout=40)
|
||||
self.press(term, "o")
|
||||
term.wait("Each row is an option")
|
||||
@@ -332,6 +332,9 @@ class Journeys(unittest.TestCase):
|
||||
repo = Repository(self)
|
||||
repo.retroarch_here()
|
||||
term = self.start(repo)
|
||||
# The plan of the one setup found first: Esc goes back to the setups.
|
||||
term.wait("files to download", timeout=40)
|
||||
self.press(term, ESC)
|
||||
term.wait("Where to install?", timeout=40)
|
||||
for _step in range(12):
|
||||
if "> Another setup or folder" in term.settle():
|
||||
@@ -478,5 +481,143 @@ class LineModeJourneys(unittest.TestCase):
|
||||
self.run_line(repo, *base, "--check", "--verbose").stdout)
|
||||
|
||||
|
||||
def events(proc: subprocess.CompletedProcess, kind: str | None = None) -> list[dict]:
|
||||
said = [json.loads(line) for line in proc.stdout.splitlines() if line.startswith("{")]
|
||||
return [event for event in said if kind is None or event["event"] == kind]
|
||||
|
||||
|
||||
class InstallRecord(unittest.TestCase):
|
||||
"""What an install placed, recorded beside the BIOS folder, and its
|
||||
choice taken by the next run when nothing on the command line chose."""
|
||||
|
||||
def setUp(self):
|
||||
self.repo = Repository(self)
|
||||
self.dest = self.repo.root / "retroarch" / "system"
|
||||
self.record = self.dest.parent / install.BACKUP_DIR / "system.install.json"
|
||||
|
||||
def run_line(self, *args: str, dest: Path | None = None) -> subprocess.CompletedProcess:
|
||||
return subprocess.run(
|
||||
[sys.executable, str(REPO_ROOT / "install.py"), "--platform", "retroarch",
|
||||
"--dest", str(dest or self.dest), *args],
|
||||
env=self.repo.env, capture_output=True, text=True, timeout=120, check=False,
|
||||
stdin=subprocess.DEVNULL)
|
||||
|
||||
def dests(self, proc: subprocess.CompletedProcess) -> list[str]:
|
||||
return sorted(event["dest"] for event in events(proc, "file"))
|
||||
|
||||
def everything(self) -> list[str]:
|
||||
return sorted(entry["dest"] for entry in self.repo.listed["files"])
|
||||
|
||||
def test_the_record_holds_each_file_written_and_its_hash(self):
|
||||
proc = self.run_line("--system", "nintendo-gba", "--yes", "--events")
|
||||
self.assertEqual(proc.returncode, 0, proc.stdout + proc.stderr)
|
||||
said = events(proc, "record")
|
||||
self.assertEqual([event["status"] for event in said], ["written"])
|
||||
self.assertEqual(said[0]["choice"], ["--system", "nintendo-gba"])
|
||||
self.assertEqual((said[0]["path"], said[0]["files"]), (str(self.record), 1))
|
||||
# Before the summary, its keys those of EVENT_KEYS.
|
||||
kinds = [event["event"] for event in events(proc)]
|
||||
self.assertEqual(kinds.index("record") + 1, kinds.index("summary"))
|
||||
self.assertEqual(list(said[0])[1:], list(install.EVENT_KEYS["record"]))
|
||||
kept = json.loads(self.record.read_text(encoding="utf-8"))
|
||||
files = kept["setups"]["retroarch"]["files"]
|
||||
self.assertEqual([item["dest"] for item in files], ["gba_bios.bin"])
|
||||
self.assertEqual(files[0]["sha1"], hashlib.sha1(
|
||||
(self.dest / "gba_bios.bin").read_bytes()).hexdigest())
|
||||
self.assertEqual((files[0]["from"], files[0]["root"]), ("download", ""))
|
||||
self.assertEqual(kept["folder"], str(self.dest))
|
||||
# Nothing of it in the BIOS folder, which some cores read whole.
|
||||
self.assertEqual(written(self.dest), ["gba_bios.bin"])
|
||||
|
||||
def test_the_next_run_takes_the_recorded_choice(self):
|
||||
self.run_line("--system", "nintendo-gba", "--yes")
|
||||
(self.dest / "gba_bios.bin").unlink()
|
||||
proc = self.run_line("--yes", "--events")
|
||||
self.assertEqual(proc.returncode, 0, proc.stderr)
|
||||
kinds = [event["event"] for event in events(proc)]
|
||||
self.assertLess(kinds.index("record"), kinds.index("choices"))
|
||||
applied = events(proc, "record")[0]
|
||||
self.assertEqual((applied["status"], applied["choice"]),
|
||||
("applied", ["--system", "nintendo-gba"]))
|
||||
self.assertEqual(self.dests(proc), ["gba_bios.bin"])
|
||||
self.assertEqual(written(self.dest), ["gba_bios.bin"])
|
||||
(self.dest / "gba_bios.bin").unlink()
|
||||
proc = self.run_line("--yes")
|
||||
self.assertRegex(proc.stdout, r"Installing 1 file \(.*\) for RetroArch, same choice "
|
||||
r"as on \d+ [A-Z][a-z]{2}\.")
|
||||
|
||||
def test_the_command_line_replaces_the_record(self):
|
||||
self.run_line("--system", "nintendo-gba", "--yes")
|
||||
self.assertEqual(self.dests(self.run_line("--system", "sega-megadrive", "--check",
|
||||
"--events")),
|
||||
sorted(e["dest"] for e in self.repo.listed["files"]
|
||||
if "sega-megadrive" in e.get("systems", [])))
|
||||
whole = self.run_line("--all-files", "--check", "--events")
|
||||
self.assertEqual(self.dests(whole), self.everything())
|
||||
self.assertEqual(events(whole, "record"), [])
|
||||
|
||||
def test_a_record_that_cannot_be_read_is_said_once_and_ignored(self):
|
||||
self.dest.mkdir(parents=True)
|
||||
self.record.parent.mkdir()
|
||||
self.record.write_text("{not json", encoding="utf-8")
|
||||
proc = self.run_line("--yes", "--events")
|
||||
self.assertEqual(proc.returncode, 0, proc.stderr)
|
||||
said = events(proc, "record")
|
||||
self.assertEqual([event["status"] for event in said], ["unreadable", "written"])
|
||||
self.assertIn("is damaged, so it is ignored.", said[0]["message"])
|
||||
# Said once to a person (standard error under --events), once as an event.
|
||||
self.assertEqual(proc.stderr.count("so it is ignored"), 1)
|
||||
self.assertEqual(self.dests(proc), self.everything())
|
||||
# Replaced by a record that reads.
|
||||
self.assertEqual(json.loads(self.record.read_text())["schema"], install.RECORD_SCHEMA)
|
||||
for text in ('{"schema": 99, "setups": {}}', '{"schema": 1, "setups": {"retroarch": 3}}',
|
||||
"\xff\xfe"):
|
||||
with self.subTest(record=text):
|
||||
self.record.write_bytes(text.encode("latin-1"))
|
||||
proc = self.run_line("--check", "--events")
|
||||
self.assertEqual(events(proc, "record")[0]["status"], "unreadable")
|
||||
self.assertEqual(self.dests(proc), self.everything())
|
||||
|
||||
def test_a_record_for_another_folder_is_not_applied(self):
|
||||
self.run_line("--system", "nintendo-gba", "--yes")
|
||||
# A sibling folder shares the holder, never the record.
|
||||
other = self.dest.parent / "bios"
|
||||
proc = self.run_line("--check", "--events", dest=other)
|
||||
self.assertEqual(events(proc, "record"), [])
|
||||
self.assertEqual(self.dests(proc), self.everything())
|
||||
# The record copied under the sibling's name still names the first.
|
||||
shutil.copy(self.record, self.record.with_name("bios.install.json"))
|
||||
proc = self.run_line("--check", "--events", dest=other)
|
||||
self.assertEqual(events(proc, "record"), [])
|
||||
self.assertEqual(self.dests(proc), self.everything())
|
||||
# The record of another setup in the same folder is not this one's.
|
||||
proc = subprocess.run(
|
||||
[sys.executable, str(REPO_ROOT / "install.py"), "--platform", "batocera",
|
||||
"--dest", str(self.dest), "--check", "--events"],
|
||||
env=self.repo.env, capture_output=True, text=True, timeout=120, check=False,
|
||||
stdin=subprocess.DEVNULL)
|
||||
self.assertEqual(events(proc, "record"), [])
|
||||
self.assertEqual(self.dests(proc), self.everything())
|
||||
|
||||
def test_line_mode_chooses_what_the_screen_chooses(self):
|
||||
"""The plan's choice from the record is the same set of files on the
|
||||
screen and in line mode: the screen's options, given to a run, and a
|
||||
run given none."""
|
||||
self.run_line("--system", "nintendo-gba", "--yes")
|
||||
(self.dest / "gba_bios.bin").unlink()
|
||||
state = install.TuiState()
|
||||
state.platform, state.dest = "retroarch", self.dest
|
||||
install._tui_record_load(state)
|
||||
self.assertTrue(install.tui_record_kept(state))
|
||||
flags = [flag if value is None else f"{flag}={value}"
|
||||
for flag, value in install.tui_flags(state)]
|
||||
screen = self.run_line(*flags, "--dry-run", "--events")
|
||||
line = self.run_line("--dry-run", "--events")
|
||||
self.assertEqual(self.dests(screen), ["gba_bios.bin"])
|
||||
self.assertEqual(self.dests(line), self.dests(screen))
|
||||
self.assertEqual(events(line, "check")[0]["bytes_needed"],
|
||||
events(screen, "check")[0]["bytes_needed"])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
+194
-44
@@ -378,6 +378,14 @@ def screen_text(lines) -> str:
|
||||
return re.sub(r"(?<=[/\\]) ", "", " ".join(" ".join(lines).split()))
|
||||
|
||||
|
||||
def listed(state: install.TuiState) -> install.TuiState:
|
||||
"""The setups found, as Back shows them from the plan the screen opens
|
||||
on when it found one setup."""
|
||||
if state.opened_on_plan and state.screen != "setup":
|
||||
install.tui_update(state, Key("esc"))
|
||||
return state
|
||||
|
||||
|
||||
def fresh_state() -> install.TuiState:
|
||||
state = install.TuiState(os_type="linux", home=HOME)
|
||||
state.setups = [("retroarch", SYSTEM_DIR, "RetroArch"),
|
||||
@@ -761,7 +769,9 @@ class Flow(unittest.TestCase):
|
||||
mock.patch.object(install, "detect_platforms", return_value=[]), \
|
||||
mock.patch.object(install, "detect_frontends", return_value=[]):
|
||||
state, effects = install.tui_start(_args(), "linux")
|
||||
self.assertEqual((state.screen, effects), ("setup", []))
|
||||
# The one setup found: its plan first, the list one Back away.
|
||||
self.assertEqual((state.screen, effects), ("checking", [("fetch", "minui")]))
|
||||
self.assertEqual(listed(state).screen, "setup")
|
||||
label = f"MinUI SD card ({card.name})"
|
||||
self.assertEqual(state.setups, [("minui", card, label)])
|
||||
self.assertEqual([row.label for row in install.tui_rows(state)],
|
||||
@@ -1032,9 +1042,55 @@ def golden_states() -> dict:
|
||||
told = golden_states_result()
|
||||
told.stack.append("details")
|
||||
states["result-details"] = told
|
||||
states["plan-record"] = record_state()
|
||||
return states
|
||||
|
||||
|
||||
def record_setup(choice: list[str] | None = None) -> dict:
|
||||
"""A record kept on 3 November of this year: the plan says 3 Nov in
|
||||
any year it runs."""
|
||||
year = time.localtime().tm_year
|
||||
return {"written": f"{year}-11-03T12:00:00Z", "list": {"version": "v1", "generated": ""},
|
||||
"choice": ["--system", "nintendo-gba"] if choice is None else choice,
|
||||
"files": [{"dest": "gba_bios.bin", "root": "", "sha1": "0" * 40, "size": 16384,
|
||||
"from": "download"}]}
|
||||
|
||||
|
||||
def record_state(setup: dict | None = None) -> install.TuiState:
|
||||
"""The plan of a RetroArch folder whose record kept Game Boy Advance,
|
||||
its file changed by a release since, opened on the one setup found."""
|
||||
setup = record_setup() if setup is None else setup
|
||||
state = fresh_state()
|
||||
state.setups = state.setups[:1]
|
||||
manifest = json.loads(json.dumps(MANIFEST))
|
||||
manifest["files"][2]["sha1"] = "1" * 40
|
||||
with mock.patch.object(install, "setup_record",
|
||||
return_value=(setup, SYSTEM_DIR.parent / "x", "")), \
|
||||
mock.patch.object(install.Path, "exists", return_value=True), \
|
||||
mock.patch.object(install, "found_setups",
|
||||
return_value=(state.setups, set())), \
|
||||
mock.patch.object(install, "detect_frontends", return_value=[]), \
|
||||
mock.patch.object(install, "_mounted_cards", return_value=[]), \
|
||||
mock.patch.object(install, "_DETECTION_REFUSED", []), \
|
||||
mock.patch.object(install.Path, "home", return_value=HOME):
|
||||
state, effects = install.tui_start(_args(), "linux")
|
||||
assert effects == [("fetch", "retroarch")], effects
|
||||
# Drawn as the other screens are, whatever the shell running the tests.
|
||||
state.home, state.pad = HOME, "both"
|
||||
effects = install.tui_receive(state, ("manifest", "retroarch", manifest))
|
||||
assert effects == [("run", "check")], effects
|
||||
gba = [event for event in FILES if event["dest"] == "gba_bios.bin"]
|
||||
systems = [event for event in SYSTEMS if event["system"] == "nintendo-gba"]
|
||||
check = {**CHECK, "files": 1, "present": 0, "missing": 1, "wrong_hash": 0,
|
||||
"bytes_needed": 16384, "not_installable": 0}
|
||||
for event in [*gba, *systems, check]:
|
||||
install.tui_receive(state, ("event", state.run_id, event))
|
||||
with mock.patch.object(install, "_tui_folder_facts", return_value={
|
||||
"free": 50 * 1024 ** 3, "writable": True, "cores": ["pcsx_rearmed"]}):
|
||||
install.tui_receive(state, ("ended", state.run_id, 1, []))
|
||||
return state
|
||||
|
||||
|
||||
def golden_states_result() -> install.TuiState:
|
||||
"""The result golden_states draws, a file failed and one kept."""
|
||||
result = checked_state()
|
||||
@@ -1075,6 +1131,102 @@ def result_states() -> dict:
|
||||
}
|
||||
|
||||
|
||||
class RecordedPlan(unittest.TestCase):
|
||||
"""The plan of a folder with an install record: opened on the one setup
|
||||
found, on the recorded choice, one press from installing it again."""
|
||||
|
||||
def row(self, state: install.TuiState, action: str) -> install.TuiRow:
|
||||
return next(row for row in install.tui_rows(state) if row.action == action)
|
||||
|
||||
def test_opens_on_the_plan_of_the_one_setup_found(self):
|
||||
state = record_state()
|
||||
self.assertTrue(state.opened_on_plan)
|
||||
self.assertEqual(state.stack, ["setup", "plan"])
|
||||
self.assertEqual(install.tui_rows(state)[0].action, "install")
|
||||
press(state, "end", "up", "up", "up")
|
||||
self.assertEqual(install.tui_rows(state)[state.focus["plan"]].label, "Change where")
|
||||
press(state, "enter")
|
||||
self.assertEqual(state.screen, "setup")
|
||||
|
||||
def test_several_setups_open_the_list(self):
|
||||
with mock.patch.object(install, "found_setups", return_value=(
|
||||
fresh_state().setups, set())), \
|
||||
mock.patch.object(install, "detect_frontends", return_value=[]), \
|
||||
mock.patch.object(install, "_mounted_cards", return_value=[]), \
|
||||
mock.patch.object(install, "_DETECTION_REFUSED", []):
|
||||
state, effects = install.tui_start(_args(), "linux")
|
||||
self.assertEqual((state.screen, effects, state.opened_on_plan), ("setup", [], False))
|
||||
|
||||
def test_one_press_installs_the_recorded_choice(self):
|
||||
state = record_state()
|
||||
self.assertEqual(self.row(state, "record").label, "Same choice as on 3 Nov: yes")
|
||||
self.assertIn("For nintendo-gba.", screen_text(
|
||||
install.tui_view(state, 80, 24)))
|
||||
self.assertEqual(press(state, "enter"), [("run", "install")])
|
||||
argv = install.tui_argv(state, "install", "py", "install.py")
|
||||
self.assertIn("--system=nintendo-gba", argv)
|
||||
self.assertNotIn("--all-files", argv)
|
||||
|
||||
def test_no_takes_the_whole_list_and_yes_brings_it_back(self):
|
||||
state = record_state()
|
||||
state.focus["plan"] = install.tui_rows(state).index(self.row(state, "record"))
|
||||
with mock.patch.object(install, "games_probe", return_value=None):
|
||||
effects = press(state, "enter")
|
||||
self.assertEqual(effects, [("run", "check")])
|
||||
flags = install.tui_flags(state)
|
||||
self.assertIn(("--all-files", None), flags)
|
||||
self.assertFalse([flag for flag in flags if flag[0] == "--system"])
|
||||
self.assertFalse(install.tui_record_kept(state))
|
||||
for event in [*FILES, *SYSTEMS, CHECK]:
|
||||
install.tui_receive(state, ("event", state.run_id, event))
|
||||
with mock.patch.object(install, "_tui_folder_facts", return_value={
|
||||
"free": 50 * 1024 ** 3, "writable": True}):
|
||||
install.tui_receive(state, ("ended", state.run_id, 1, []))
|
||||
self.assertEqual(self.row(state, "record").label, "Same choice as on 3 Nov: no")
|
||||
self.assertEqual(install.tui_rows(state)[state.focus["plan"]].action, "record")
|
||||
self.assertEqual(press(state, "enter"), [("run", "check")])
|
||||
self.assertIn(("--system", "nintendo-gba"), install.tui_flags(state))
|
||||
self.assertTrue(install.tui_record_kept(state))
|
||||
|
||||
def test_the_command_line_choice_wins(self):
|
||||
with mock.patch.object(install, "setup_record",
|
||||
return_value=(record_setup(), SYSTEM_DIR, "")), \
|
||||
mock.patch.object(install.Path, "exists", return_value=True):
|
||||
state, _effects = install.tui_start(
|
||||
_args(platform="retroarch", dest=str(SYSTEM_DIR), system=["sony-playstation"]),
|
||||
"linux", detect=False)
|
||||
self.assertEqual(install._tui_system_flags(state), [("--system", "sony-playstation")])
|
||||
self.assertFalse(install.tui_record_kept(state))
|
||||
self.assertEqual(install._record_rows(state), [])
|
||||
|
||||
def test_a_record_that_cannot_be_read_is_said_once(self):
|
||||
problem = "The install record /x/system.install.json is damaged"
|
||||
install._RECORD_SAID.discard("/x/system.install.json")
|
||||
with mock.patch.object(install, "setup_record",
|
||||
return_value=(None, Path("/x/system.install.json"), problem)), \
|
||||
mock.patch.object(install.Path, "exists", return_value=True):
|
||||
state, _effects = install.tui_start(
|
||||
_args(platform="retroarch", dest=str(SYSTEM_DIR)), "linux", detect=False)
|
||||
self.assertEqual(str(state.status), f"{problem}, so it is ignored.")
|
||||
state.status, state.record_for = "", None
|
||||
install._tui_record_load(state)
|
||||
self.assertEqual(state.status, "")
|
||||
self.assertIsNone(state.record)
|
||||
self.assertNotIn("--all-files", str(install.tui_flags(state)))
|
||||
|
||||
def test_the_install_row_says_the_size_the_headline_says(self):
|
||||
"""14930 files to download, 6.8 GB stood above Install 6.6 GB: the
|
||||
data files counted in one, the copies in the other."""
|
||||
big = 2 * 1024 ** 3
|
||||
state = checked_state()
|
||||
state.files[0] = {**state.files[0], "size": big}
|
||||
state.check = {**state.check, "bytes_needed": state.check["bytes_needed"] + big,
|
||||
"data_missing": 3, "data_bytes": 300 * 1024 ** 2}
|
||||
headline = str(install._plan_lines(state.check, state.dest, state)[0])
|
||||
size = headline.rsplit(", ", 1)[1]
|
||||
self.assertEqual(install.tui_rows(state)[0].label, f"Install {size}")
|
||||
|
||||
|
||||
class Views(unittest.TestCase):
|
||||
"""Every screen as text, at the sizes a handheld and a desktop show."""
|
||||
|
||||
@@ -2387,6 +2539,9 @@ class CardsSpaceAndConfirm(unittest.TestCase):
|
||||
mock.patch.object(install, "detect_platforms", return_value=[]), \
|
||||
mock.patch.object(install, "detect_frontends", return_value=[]):
|
||||
state, effects = install.tui_start(_args(), "linux")
|
||||
self.assertEqual(effects, [("fetch", "retroarch")])
|
||||
self.assertEqual(state.dest, root / "MUOS" / "bios")
|
||||
listed(state)
|
||||
label = f"muOS SD card ({root.name})"
|
||||
self.assertEqual(state.setups, [("retroarch", root / "MUOS" / "bios", label)])
|
||||
text = screen_text(install.tui_view(state, 120, 40))
|
||||
@@ -4527,6 +4682,14 @@ class WindowsHasNoPosixModules(unittest.TestCase):
|
||||
# --- End to end, on a pseudo-terminal -------------------------------------
|
||||
|
||||
|
||||
def on_setups(term: Pty) -> str:
|
||||
"""The setups found, one Back from the plan the screen opens on when it
|
||||
found one setup: the first screen as it was before."""
|
||||
term.wait("> Install")
|
||||
term.send("\x1b")
|
||||
return term.wait("Where to install?")
|
||||
|
||||
|
||||
class Pty:
|
||||
"""install.py on a pseudo-terminal, its screen read back through pyte."""
|
||||
|
||||
@@ -4925,14 +5088,13 @@ class EndToEnd(unittest.TestCase):
|
||||
self.assertAppOnCard(root, "KNULLI")
|
||||
self.assertIn("--add-app", term.after())
|
||||
|
||||
def test_three_presses_install_everything(self):
|
||||
def test_two_presses_install_everything(self):
|
||||
repo = self.repo()
|
||||
term = self.start()
|
||||
screen = term.wait("Where to install?")
|
||||
self.assertIn("> RetroArch", screen)
|
||||
term.send("\r")
|
||||
# The one setup found here: its plan first.
|
||||
screen = term.wait("files to download")
|
||||
self.assertIn("5 files to download, 30 B", screen)
|
||||
self.assertIn("Change where", screen)
|
||||
self.assertIn("> Install", screen)
|
||||
term.send("\r")
|
||||
term.wait("5 files installed.")
|
||||
@@ -4979,8 +5141,6 @@ class EndToEnd(unittest.TestCase):
|
||||
self.assertIn("6 files installed", proc.stdout)
|
||||
else:
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
screen = term.wait("files to download")
|
||||
self.assertIn("6 files to download", screen)
|
||||
# The second folder the run writes to, named on the
|
||||
@@ -5159,7 +5319,7 @@ class EndToEnd(unittest.TestCase):
|
||||
def test_ctrl_c_on_the_first_screen(self):
|
||||
self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
term.send("\x03")
|
||||
self.assertEqual(term.close(), 130)
|
||||
self.assertIn(b"\x1b[?2004l\x1b[0m\x1b[?25h\x1b[?1049l", term.raw)
|
||||
@@ -5169,7 +5329,7 @@ class EndToEnd(unittest.TestCase):
|
||||
|
||||
self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
mark = len(term.raw)
|
||||
os.kill(term.pid, signal.SIGTSTP)
|
||||
end = time.monotonic() + 10
|
||||
@@ -5182,7 +5342,7 @@ class EndToEnd(unittest.TestCase):
|
||||
self.assertIn(b"\x1b[?25h\x1b[?1049l", term.raw[mark:])
|
||||
mark = len(term.raw)
|
||||
os.kill(term.pid, signal.SIGCONT)
|
||||
term.wait("A/Enter Continue")
|
||||
term.wait("A/Enter Install")
|
||||
end = time.monotonic() + 5
|
||||
while b"\x1b[?1049h" not in term.raw[mark:] and time.monotonic() < end:
|
||||
term._pump(0.05)
|
||||
@@ -5194,11 +5354,11 @@ class EndToEnd(unittest.TestCase):
|
||||
"""The terminal gone, the farewell has nowhere to go: the code is
|
||||
129 (SIGHUP), not 120 from the flush failing at exit."""
|
||||
self.repo()
|
||||
for screen_name, keys_first in (("Where to install?", ()),
|
||||
("files to download", ("\r",))):
|
||||
for screen_name, keys_first in (("files to download", ()),
|
||||
("Where to install?", ("\x1b",))):
|
||||
with self.subTest(screen=screen_name):
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.wait("files to download")
|
||||
term.send(*keys_first)
|
||||
term.wait(screen_name)
|
||||
os.close(term.fd)
|
||||
@@ -5247,12 +5407,12 @@ class EndToEnd(unittest.TestCase):
|
||||
self.repo()
|
||||
self.env[install.TUI_IDLE_ENV] = "1"
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
self.assertEqual(term.close(), install.QUIT_CODE)
|
||||
self.assertIn("No button pressed, closing.", term.after())
|
||||
# A key pressed, the screen stays: the person is there.
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
term.send(DOWN)
|
||||
end = time.monotonic() + 2.5
|
||||
while time.monotonic() < end:
|
||||
@@ -5282,7 +5442,7 @@ class EndToEnd(unittest.TestCase):
|
||||
with self.subTest(env=env):
|
||||
self.env.update(env)
|
||||
term = self.start(cols=40, rows=12)
|
||||
term.wait("Where to install?")
|
||||
on_setups(term)
|
||||
screen = term.wait(bar)
|
||||
self.assertEqual(screen.splitlines()[-1].strip(), bar)
|
||||
term.send("q")
|
||||
@@ -5293,7 +5453,7 @@ class EndToEnd(unittest.TestCase):
|
||||
def test_resize_redraws(self):
|
||||
self.repo()
|
||||
term = self.start(cols=40, rows=15)
|
||||
term.wait("Where to install?")
|
||||
on_setups(term)
|
||||
term.resize(100, 30)
|
||||
term.send(DOWN)
|
||||
screen = term.wait("> Another setup or folder")
|
||||
@@ -5379,7 +5539,7 @@ class EndToEnd(unittest.TestCase):
|
||||
self.env.pop("NO_COLOR", None)
|
||||
self.env.update({"TERM": "xterm", **env})
|
||||
term = self.start()
|
||||
screen = term.wait("Where to install?")
|
||||
screen = on_setups(term)
|
||||
self.assertIn("> RetroArch", screen)
|
||||
screens[name] = screen
|
||||
# pyte reads the colours drawn: RetroBIOS in the accent.
|
||||
@@ -5612,7 +5772,7 @@ class TheTerminalComesBack(unittest.TestCase):
|
||||
def ended(self, how) -> Pty:
|
||||
self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
# Every way out below starts with the clicks asked for, written
|
||||
# right after the frame.
|
||||
term.settle()
|
||||
@@ -5672,7 +5832,7 @@ class TheTerminalComesBack(unittest.TestCase):
|
||||
job control it stops, and fg brings the screen back."""
|
||||
term = self.shell()
|
||||
self.typed(term, f"{shlex.quote(sys.executable)} {REPO_ROOT / 'install.py'} --tui")
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
mark = len(term.raw)
|
||||
term.send("\x1a")
|
||||
end = time.monotonic() + 10
|
||||
@@ -5687,7 +5847,7 @@ class TheTerminalComesBack(unittest.TestCase):
|
||||
while b"\x1b[?1049h" not in term.raw[mark:] and time.monotonic() < end:
|
||||
term._pump(0.05)
|
||||
self.assertIn(b"\x1b[?1049h", term.raw[mark:])
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
self.assertFalse(termios.tcgetattr(term.fd)[3] & termios.ECHO)
|
||||
# The clicks come back with the screen.
|
||||
term.settle()
|
||||
@@ -5709,7 +5869,7 @@ class TheTerminalComesBack(unittest.TestCase):
|
||||
term = Pty(["--tui"], self.env, program=program)
|
||||
self.addCleanup(lambda term=term: term.status is None
|
||||
and os.killpg(term.pid, 9))
|
||||
term.wait("Where to install?")
|
||||
term.wait("> Install")
|
||||
term.send("\x1a")
|
||||
screen = term.wait("Ctrl-Z is ignored")
|
||||
self.assertIn("no shell started this installer", " ".join(screen.split()))
|
||||
@@ -5765,8 +5925,6 @@ class TheTerminalComesBack(unittest.TestCase):
|
||||
self.addCleanup(lambda: term.status is None and os.killpg(term.pid, 9))
|
||||
term.wait("PROMPT$")
|
||||
self.typed(term, f"sh {REPO_ROOT / 'install.sh'} --jobs 1")
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("to download")
|
||||
term.send("\r")
|
||||
term.wait("Installing")
|
||||
@@ -10803,7 +10961,7 @@ class MouseOnAPty(unittest.TestCase):
|
||||
def test_taps_choose_a_row_and_press_the_bar(self):
|
||||
self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
on_setups(term)
|
||||
term.settle()
|
||||
self.assertIn(install._MOUSE_ON.encode(), term.raw)
|
||||
row = self.line_of(term, "Another setup")
|
||||
@@ -11455,8 +11613,6 @@ class TapsOnAPty(unittest.TestCase):
|
||||
def test_taps_on_systems_tick_and_write_nothing(self):
|
||||
repo = self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("> Install")
|
||||
row = self.line_of(term, "Choose systems")
|
||||
self.click(term, 20, row)
|
||||
@@ -11482,8 +11638,6 @@ class TapsOnAPty(unittest.TestCase):
|
||||
def test_the_result_is_left_by_a_tap_on_exit(self):
|
||||
self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("files to download")
|
||||
row = self.line_of(term, "> Install")
|
||||
self.click(term, 20, row)
|
||||
@@ -12365,8 +12519,6 @@ class TapsOnAPtySeeFirst(unittest.TestCase):
|
||||
def test_one_tap_on_the_bar_install_installs_nothing(self):
|
||||
repo = self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("> Install")
|
||||
term.settle()
|
||||
self.click(term, *self.bar_entry(term, "Install"))
|
||||
@@ -12380,7 +12532,7 @@ class TapsOnAPtySeeFirst(unittest.TestCase):
|
||||
def test_a_double_tap_on_continue_neither_quits_nor_installs(self):
|
||||
repo = self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
on_setups(term)
|
||||
term.settle()
|
||||
col, line = self.bar_entry(term, "Continue")
|
||||
report = sgr(col + 1, line + 1) + sgr(col + 1, line + 1, release=True)
|
||||
@@ -12402,7 +12554,7 @@ class TapsOnAPtySeeFirst(unittest.TestCase):
|
||||
with self.subTest(gap=gap):
|
||||
repo = self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
on_setups(term)
|
||||
term.settle()
|
||||
time.sleep(install.TUI_TAP_SETTLE)
|
||||
col, line = self.bar_entry(term, "Continue")
|
||||
@@ -12422,8 +12574,6 @@ class TapsOnAPtySeeFirst(unittest.TestCase):
|
||||
def test_continue_then_install_in_one_cell_stops_on_confirm(self):
|
||||
repo = self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("> Install")
|
||||
row = self.line_of(term, "Choose systems")
|
||||
self.click(term, 20, row)
|
||||
@@ -12465,8 +12615,6 @@ class TapsOnAPtySeeFirst(unittest.TestCase):
|
||||
|
||||
repo = self.repo(GameDataRepository)
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("> Install")
|
||||
for _step in range(8):
|
||||
if "> Choose systems" in term.settle():
|
||||
@@ -12508,8 +12656,6 @@ class TapsOnAPtySeeFirst(unittest.TestCase):
|
||||
def test_two_taps_on_a_region_untick_it_where_it_was(self):
|
||||
self.repo()
|
||||
term = self.start()
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("> Install")
|
||||
term.send("o")
|
||||
term.wait("Preferred regions")
|
||||
@@ -12662,8 +12808,10 @@ class ChoiceStateInBothModes(unittest.TestCase):
|
||||
mock.patch.object(install, "detect_frontends", return_value=[]), \
|
||||
mock.patch.object(install.Path, "home", return_value=home):
|
||||
state, _effects = install.tui_start(_args(), "linux")
|
||||
text = self.screen(state)
|
||||
# Named on the first screen, its plan one Enter away.
|
||||
# Its plan first, the setups one Back away.
|
||||
self.assertEqual(state.dest, card / "bios")
|
||||
text = self.screen(listed(state))
|
||||
# Named on the setups, its plan one Enter away.
|
||||
self.assertIn(f"> ArkOS SD card ({name}", text)
|
||||
self.assertNotIn("Nothing was found here", text)
|
||||
install.tui_update(state, Key("enter"))
|
||||
@@ -12977,7 +13125,7 @@ class DriveIsACardByItsFiles(unittest.TestCase):
|
||||
mock.patch.object(install, "detect_frontends", return_value=[]), \
|
||||
mock.patch.object(install.Path, "home", return_value=self.root / "home"):
|
||||
state, _effects = install.tui_start(_args(), "linux")
|
||||
return state
|
||||
return listed(state)
|
||||
|
||||
def folder_screen(self, mounts: list) -> tuple[install.TuiState, str, list]:
|
||||
"""RetroArch chosen on the first screen: (state, Which folder? at
|
||||
@@ -13176,8 +13324,6 @@ class TheSettleRunsFromTheFrameShown(unittest.TestCase):
|
||||
env = {**self.env, "SLOW": "0.5"}
|
||||
term = Pty([], env, 80, 24, program=[sys.executable, str(wrapper)])
|
||||
self.addCleanup(lambda: term.status is None and os.kill(term.pid, 9))
|
||||
term.wait("Where to install?")
|
||||
term.send("\r")
|
||||
term.wait("> Install")
|
||||
term.settle()
|
||||
term.send("o")
|
||||
@@ -14949,6 +15095,10 @@ SCREEN_WORDS = {
|
||||
"quit": (14, 14, 12, 12), "help": (24, 26, 26, 26), "plan-games": (36, 46, 54, 54),
|
||||
"games": (36, 45, 44, 44), "plan-details": (30, 30, 29, 29),
|
||||
"result-details": (30, 30, 19, 19),
|
||||
# The plan's words, plus the recorded choice by name, its row (the one
|
||||
# press back to the whole list) and Change where (back to the setups,
|
||||
# the plan having opened on the one found).
|
||||
"plan-record": (38, 42, 42, 42),
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user