Cleanup and security updates.

ptlinux/cli.py

@@ -25,6 +25,7 @@ from .depot import SyncProgress, sync_managed_game
 from .doctor import inspect_host
 from .download import OFFICIAL_LAUNCHER_URL, fetch_official_launcher
 from .importer import GameImportResult, discover_existing_game, import_existing_game
+from .import_state import game_import_requires_verification, mark_game_import_verified
 from .launcher import (
 	LauncherError,
 	configure_launcher_prefix,
@@ -292,7 +293,6 @@ def main(argv: Sequence[str] | None = None) -> int:
 				paths,
 				arguments.game_dir,
 				arguments.no_box,
-				arguments.publisher_dll,
 				arguments.dry_run,
 				arguments.skip_runtime_setup,
 				arguments.json,
@@ -422,10 +422,6 @@ def _login_diagnostics(
 				f"Depot:         build {report.depot_build} "
 				f"({report.depot_version or 'unknown version'})"
 			)
-		world_fix_status = "enabled" if report.world_fix_enabled else "retired"
-		print(f"World fix:     {world_fix_status}")
-		if report.world_fix_disabled_reason:
-			print(f"Reason:        {report.world_fix_disabled_reason}")
 		if report.runtime_kind:
 			print(f"Runtime:       {report.runtime_kind} ({report.runtime_path or 'unknown path'})")
 		else:
@@ -532,13 +528,22 @@ def _native_update(
 				runner,
 				announce=not as_json,
 			)
+		verify_import = game_import is not None or game_import_requires_verification(paths)
 		_print_operation_status(as_json, 2, 3, "Synchronizing official game files…")
 		result = sync_managed_game(
 			paths,
-			repair=repair,
+			repair=repair or verify_import,
+			quarantine_unmanaged=verify_import,
 			dry_run=dry_run,
 			progress=None if as_json else _print_sync_progress,
 		)
+		if verify_import and not dry_run:
+			mark_game_import_verified(
+				paths,
+				build=result.build,
+				files_quarantined=result.files_quarantined,
+				quarantine_directory=result.quarantine_directory,
+			)
 		overlay = None
 		if not dry_run and paths.source_game.is_dir():
 			_print_operation_status(as_json, 3, 3, "Preparing the clean game runtime view…")
@@ -587,6 +592,23 @@ def _wine_update(
 				announce=not as_json,
 			)
 		updater = launch_official_updater(paths, tools, runner)
+		native_verification = None
+		verify_import = not dry_run and (
+			game_import is not None or game_import_requires_verification(paths)
+		)
+		if verify_import:
+			native_verification = sync_managed_game(
+				paths,
+				repair=True,
+				quarantine_unmanaged=True,
+				progress=None if as_json else _print_sync_progress,
+			)
+			mark_game_import_verified(
+				paths,
+				build=native_verification.build,
+				files_quarantined=native_verification.files_quarantined,
+				quarantine_directory=native_verification.quarantine_directory,
+			)
 		overlay = None
 		if not dry_run and paths.source_game.is_dir():
 			overlay = asdict(prepare_runtime_view(paths, paths.source_game))
@@ -595,6 +617,9 @@ def _wine_update(
 		"dry_run": dry_run,
 		"game_import": asdict(game_import) if game_import else None,
 		"updater": asdict(updater),
+		"native_verification": (
+			asdict(native_verification) if native_verification is not None else None
+		),
 		"runtime_view": overlay,
 	}
 	_emit(value, as_json)
@@ -662,6 +687,11 @@ def _maybe_import_game(
 
 
 def _prepare(paths: AppPaths, game_dir: Path | None, as_json: bool) -> int:
+	if game_dir is None and game_import_requires_verification(paths):
+		raise LauncherError(
+			"the imported game has not completed its full publisher verification; "
+			"run pristontale-eu update"
+		)
 	settings = ensure_settings(paths)
 	source = _source_game(paths, settings, game_dir)
 	result = prepare_runtime_view(paths, source)
@@ -673,7 +703,6 @@ def _play(
 	paths: AppPaths,
 	game_dir: Path | None,
 	no_box: bool,
-	publisher_dll: bool,
 	dry_run: bool,
 	skip_runtime_setup: bool,
 	as_json: bool,
@@ -683,7 +712,6 @@ def _play(
 			paths,
 			game_dir,
 			no_box,
-			publisher_dll,
 			dry_run,
 			skip_runtime_setup,
 			as_json,
@@ -694,14 +722,15 @@ def _play_locked(
 	paths: AppPaths,
 	game_dir: Path | None,
 	no_box: bool,
-	publisher_dll: bool,
 	dry_run: bool,
 	skip_runtime_setup: bool,
 	as_json: bool,
 ) -> int:
-	# The legacy flag is retained for command-line compatibility. V21 performs
-	# periodic module-code checks, so every production launch is publisher-pristine.
-	_ = publisher_dll
+	if game_dir is None and game_import_requires_verification(paths):
+		raise LauncherError(
+			"the imported game has not completed its full publisher verification; "
+			"run pristontale-eu update before playing"
+		)
 	settings = _load_or_default_settings(paths, persist=not dry_run)
 	source = _source_game(paths, settings, game_dir)
 	overlay = None
@@ -729,7 +758,6 @@ def _play_locked(
 			selection,
 			runner,
 			use_gamebox=not no_box,
-			use_world_fix=False,
 		)
 	except KeyboardInterrupt:
 		current_game_log = _current_game_log(
@@ -751,7 +779,6 @@ def _play_locked(
 		and runtime_issues["host_futex_fatal_count"]
 	):
 		runtime_issues["recommended_one_variable_comparison"] = "proton7"
-	world_fix_status = None
 	_emit(
 		{
 			"ok": outcome.returncode == 0,
@@ -762,7 +789,6 @@ def _play_locked(
 			"game": asdict(outcome),
 			"current_game_log": current_game_log,
 			"runtime_issues": runtime_issues,
-			"world_fix": world_fix_status,
 		},
 		as_json,
 	)