Fix default scanner autoselect

Author: CoolCat467

README.md

@@ -4,6 +4,7 @@ Kind of like CUPS but it's for scanning, not printing.
 [![Tests](https://github.com/CoolCat467/Scanner-Server/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/CoolCat467/Scanner-Server/actions/workflows/ci.yml)
 <!-- BADGIE TIME -->
 
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/CoolCat467/Scanner-Server/main.svg)](https://results.pre-commit.ci/latest/github/CoolCat467/Scanner-Server/main)
 [![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit)](https://github.com/pre-commit/pre-commit)
 [![code style: black](https://img.shields.io/badge/code_style-black-000000.svg)](https://github.com/psf/black)
 

pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
     "python-sane~=2.9.1",
     "quart~=0.20.0",
     "quart-trio~=0.12.0",
-    "trio~=0.30.0",
+    "trio~=0.31.0",
     "Werkzeug~=3.1.3",
     'exceptiongroup >= 1.2.0; python_version < "3.11"',
     'tomli >= 2.0.1; python_version < "3.11"',

src/sanescansrv/generate_pages.py

@@ -299,17 +299,13 @@ def generate_scanners() -> str:
         "name": "scanner",
         "value": htmlgen.jinja_expression("scanner.device_name"),
     }
-    jinja_properties: tuple[str, ...] = ()
-    default_tag = " ".join(
-        htmlgen._generate_html_attributes({"checked": "checked"}),
-    )
-    jinja_properties = (
+    jinja_properties: tuple[str, ...] = (
         htmlgen.jinja_if_block(
-            {f"scanner.device_name == {default}": default_tag},
+            {f"scanner.device_name == {default}": 'checked="checked" '},
             block=False,
         ),
         htmlgen.jinja_if_block(
-            {"not scanner.active": "disabled"},
+            {"not scanner.active": 'disabled="disabled" '},
             block=False,
         ),
     )
@@ -360,7 +356,7 @@ def generate_root_get() -> str:
     image_format = htmlgen.select_box(
         "img_format",
         {v.upper(): v for v in ("png", "jpeg", "pnm", "tiff")},
-        "png",
+        "jpeg",
         "Select Image format:",
     )
 
@@ -409,11 +405,11 @@ def generate_scanners_get() -> str:
     )
 
     scanner = " ".join(
-        [
+        (
             htmlgen.jinja_expression("scanner.vendor"),
             htmlgen.jinja_expression("scanner.model"),
             f"({scanner_type_italics})",
-        ],
+        ),
     )
 
     scanners = htmlgen.jinja_bullet_list(

src/sanescansrv/htmlgen.py

@@ -22,7 +22,7 @@
 __author__ = "CoolCat467"
 __license__ = "GNU General Public License Version 3"
 
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, TypeAlias, Union
 
 if TYPE_CHECKING:  # pragma: nocover
     from collections.abc import Generator, Iterable, Mapping
@@ -40,7 +40,7 @@ def deindent(level: int, text: str) -> str:
     return "\n".join(line.removeprefix(prefix) for line in text.splitlines())
 
 
-TagArg = Union[str, int, float, bool]
+TagArg: TypeAlias = Union[str, int, float, bool]
 
 
 def _quote_strings(values: Iterable[TagArg]) -> Generator[str, None, None]:
@@ -464,12 +464,16 @@ def jinja_arg_tag(
     /,
     **kwargs: TagArg,
 ) -> str:
-    """Return HTML tag. Removes trailing underscore from argument names."""
+    """Return HTML tag. Removes trailing underscore from argument names.
+
+    For properties, make sure jinja expression value ends with a space
+    if tag arguments are to follow.
+    """
     args = "".join(jinja_properties)
     if args:
         args = f" {args}"
     if kwargs:
-        args = f"{args} " + " ".join(_generate_html_attributes(kwargs))
+        args += " ".join(_generate_html_attributes(kwargs))
     return f"<{type_}{args}>"
 
 

src/sanescansrv/server.py

@@ -378,7 +378,7 @@ def value(
             return self.default
         return self._value
 
-    @value.setter
+    @value.setter  # type: ignore[override]
     def value(self, value: str | int | float | bool) -> None:
         if not self.settable:
             raise ValueError(f"Attribute {self.name} is not settable")
@@ -646,7 +646,7 @@ async def scan_status_get() -> (
 
     progress: ScanProgress | None = None
     time_deltas_ns: list[int] | None = None
-    delay = 5
+    delay = 2
     estimated_wait: int = 120
 
     if status == ScanStatus.STARTED:
@@ -658,6 +658,10 @@ async def scan_status_get() -> (
         assert isinstance(progress, ScanProgress)
         assert isinstance(time_deltas_ns, list)
 
+        # Remove first couple of values (takes time to start)
+        if len(time_deltas_ns) > 1:
+            time_deltas_ns = time_deltas_ns[1:]
+
         # Estimate when the scan will be done
         # Nanoseconds
         average_wait_ns = statistics.mean(time_deltas_ns)
@@ -678,11 +682,13 @@ async def scan_status_get() -> (
 
 def get_default_device() -> str:
     """Retrieve the default scan device."""
-    device = get_scanner(APP_STORAGE["default_device"])
+    device = get_scanner_by_vendor_model(APP_STORAGE["default_device"])
     if device is not None:
         return device.device_name
     try:
         device = APP_STORAGE["scanners"][0]
+        if not isinstance(device, Device):
+            return "None"
         return device.device_name
     except IndexError:
         return "None"
@@ -896,6 +902,18 @@ def get_scanner(scanner: str) -> Device | None:
     return item
 
 
+def get_scanner_by_vendor_model(vendor_model: str) -> Device | None:
+    """Get scanner device from globally stored devices."""
+    devices: list[Device] = APP_STORAGE.get("scanners", [])
+    models = [f"{device.vendor} {device.model}" for device in devices]
+    if vendor_model not in models:
+        return None
+    idx = models.index(vendor_model)
+    item = devices[idx]
+    assert isinstance(item, Device)
+    return item
+
+
 @app.get("/settings")
 async def settings_get() -> AsyncIterator[str] | WerkzeugResponse:
     """Handle settings page GET."""

src/sanescansrv/templates/root_get.html.jinja

@@ -15,10 +15,10 @@
           <span>Select Image format:</span>
           <br>
           <br>
-          <input type="radio" id="img_format_0" name="img_format" value="png" checked="checked">
+          <input type="radio" id="img_format_0" name="img_format" value="png">
           <label for="img_format_0">PNG</label>
           <br>
-          <input type="radio" id="img_format_1" name="img_format" value="jpeg">
+          <input type="radio" id="img_format_1" name="img_format" value="jpeg" checked="checked">
           <label for="img_format_1">JPEG</label>
           <br>
           <input type="radio" id="img_format_2" name="img_format" value="pnm">
@@ -32,7 +32,7 @@
           <span>Select a Scanner:</span>
           <br>
           {% for scanner in scanners %}
-          <input {% if scanner.device_name == default %}checked="checked"{% endif %}{% if not scanner.active %}disabled{% endif %} type="radio" id="scanner_{{ loop.index0 }}" name="scanner" value="{{ scanner.device_name }}">
+          <input {% if scanner.device_name == default %}checked="checked" {% endif %}{% if not scanner.active %}disabled="disabled" {% endif %}type="radio" id="scanner_{{ loop.index0 }}" name="scanner" value="{{ scanner.device_name }}">
           <label for="scanner_{{ loop.index0 }}">{{ scanner.vendor }} {{ scanner.model }} (<i>{{ scanner.type_ }}</i>)</label>
           <br>
           {% else %}