Merge pull request #3550 from pkilar/epassport-startup-segfault
Fix ePassport viewer segfault on startup
This commit is contained in:
2 files changed
+100
-14
No files matched your search
@@ -32,17 +32,6 @@ if not _VERBOSE:
|
||||
os.environ.setdefault("OPENCV_LOG_LEVEL", "DEBUG" if _VERBOSE else "ERROR")
|
||||
os.environ.setdefault("OPENCV_VIDEOIO_DEBUG", "1" if _VERBOSE else "0")
|
||||
|
||||
from kivy.config import Config # noqa: E402
|
||||
|
||||
# Set the minimum size here rather than on Window: assigning Window.minimum_*
|
||||
# warns while the other half of the pair is still zero, whichever order it is
|
||||
# done in.
|
||||
# Screen space is worth being careful with: the passport page scales as a
|
||||
# unit, so the window can go a long way down before anything stops being
|
||||
# readable.
|
||||
Config.set("graphics", "minimum_width", "760")
|
||||
Config.set("graphics", "minimum_height", "520")
|
||||
|
||||
from kivy.app import App # noqa: E402
|
||||
from kivy.clock import Clock # noqa: E402
|
||||
from kivy.core.window import Window # noqa: E402
|
||||
@@ -70,11 +59,29 @@ log = logging.getLogger("epassport")
|
||||
#: What the window manager shows.
|
||||
APP_TITLE = "ePassport"
|
||||
|
||||
#: The smallest window the passport page stays readable in.
|
||||
MIN_WINDOW_SIZE = (760, 520)
|
||||
|
||||
#: How many files a full dump writes, for the progress bar's denominator when
|
||||
#: EF_COM has not been read yet.
|
||||
DEFAULT_EXPECTED_FILES = 9
|
||||
|
||||
|
||||
def apply_minimum_window_size(window) -> None:
|
||||
"""Constrain the window, once it exists.
|
||||
|
||||
Setting this through Config instead makes Kivy apply it inside
|
||||
create_window(), where the resize recurses until the stack gives out.
|
||||
"""
|
||||
minimum_width, minimum_height = MIN_WINDOW_SIZE
|
||||
window.size = (
|
||||
max(window.width, minimum_width),
|
||||
max(window.height, minimum_height),
|
||||
)
|
||||
window.minimum_width = minimum_width
|
||||
window.minimum_height = minimum_height
|
||||
|
||||
|
||||
class Root(BoxLayout):
|
||||
"""The window: screen manager plus the status bar."""
|
||||
|
||||
@@ -139,8 +146,10 @@ class Pm3PassportApp(App):
|
||||
def _restore_window_size(self) -> None:
|
||||
"""Reopen at the size the user last left, not a size we insist on."""
|
||||
width, height = self.settings.window_width, self.settings.window_height
|
||||
if width >= 760 and height >= 520:
|
||||
minimum_width, minimum_height = MIN_WINDOW_SIZE
|
||||
if width >= minimum_width and height >= minimum_height:
|
||||
Window.size = (width, height)
|
||||
apply_minimum_window_size(Window)
|
||||
Window.bind(on_resize=self._remember_window_size)
|
||||
|
||||
def _remember_window_size(self, _window, width: int, height: int) -> None:
|
||||
@@ -639,7 +648,11 @@ class _KivyNoise(logging.Filter):
|
||||
something the app never uses.
|
||||
"""
|
||||
|
||||
NOISE = ("Cutbuffer", "Unable to find any valuable Cutbuffer provider")
|
||||
NOISE = (
|
||||
"Cutbuffer",
|
||||
"Unable to find any valuable Cutbuffer provider",
|
||||
"Both Window.minimum_width and Window.minimum_height",
|
||||
)
|
||||
|
||||
def filter(self, record: logging.LogRecord) -> bool:
|
||||
message = record.getMessage()
|
||||
@@ -652,7 +665,11 @@ def _install_kivy_logging(verbose: bool) -> None:
|
||||
|
||||
if verbose:
|
||||
return # Kivy kept its own console handler
|
||||
handler = logging.StreamHandler()
|
||||
if sys.__stderr__ is None:
|
||||
return # pythonw and some frozen builds have no stderr
|
||||
# Not sys.stderr: Kivy replaces it with a stream that feeds writes back
|
||||
# in as warnings, so a handler on its own logger would loop.
|
||||
handler = logging.StreamHandler(sys.__stderr__)
|
||||
handler.setFormatter(logging.Formatter("%(levelname)s kivy: %(message)s"))
|
||||
handler.addFilter(_KivyNoise())
|
||||
Logger.addHandler(handler)
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
"""Startup checks. These run in a subprocess: importing the app builds the
|
||||
Kivy window, so a segfault would take the test session down with it."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
import pytest
|
||||
|
||||
ROOT = Path(__file__).resolve().parent.parent
|
||||
LAUNCHER = ROOT / "ePassport.py"
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")),
|
||||
reason="starting the app needs a display",
|
||||
)
|
||||
def test_the_launcher_starts() -> None:
|
||||
"""--help must not die on a signal."""
|
||||
proc = subprocess.run(
|
||||
[sys.executable, str(LAUNCHER), "--help"],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=180,
|
||||
env={**os.environ, "KIVY_NO_CONSOLELOG": "1"},
|
||||
)
|
||||
how = (
|
||||
f"killed by signal {-proc.returncode}"
|
||||
if proc.returncode < 0
|
||||
else f"exited {proc.returncode}"
|
||||
)
|
||||
assert proc.returncode == 0, f"--help {how}\n{proc.stderr[-2000:]}"
|
||||
assert "--dump" in proc.stdout
|
||||
|
||||
|
||||
@pytest.mark.skipif(
|
||||
not (os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY")),
|
||||
reason="importing the app builds a window, which needs a display",
|
||||
)
|
||||
def test_a_kivy_warning_does_not_take_the_app_down_with_it() -> None:
|
||||
"""A Kivy warning must not loop through the stderr Kivy replaced."""
|
||||
proc = subprocess.run(
|
||||
[
|
||||
sys.executable,
|
||||
"-c",
|
||||
"import sys; sys.path.insert(0, %r)\n" % str(ROOT)
|
||||
+ "from epassport.app import _install_kivy_logging\n"
|
||||
+ "from kivy.logger import Logger\n"
|
||||
+ "_install_kivy_logging(False)\n"
|
||||
+ "Logger.warning('an ordinary kivy warning')\n",
|
||||
],
|
||||
capture_output=True,
|
||||
text=True,
|
||||
timeout=180,
|
||||
)
|
||||
assert proc.returncode == 0, f"exited {proc.returncode}\n{proc.stderr[-2000:]}"
|
||||
assert "RecursionError" not in proc.stderr
|
||||
|
||||
|
||||
def test_the_window_minimum_is_not_pre_seeded_into_kivy_config() -> None:
|
||||
"""Read the source: importing the app to check is what crashed."""
|
||||
source = (ROOT / "epassport" / "app.py").read_text()
|
||||
assert not re.search(
|
||||
r"""Config\.set\(\s*['"]graphics['"]\s*,\s*['"]minimum_""", source
|
||||
), "the minimum size must be set on Window, not pre-seeded into Config"
|
||||
Reference in new issue
Block a user