Driver rename and icons: `Driver.display_name` plus a `DriverIcon` table, both global/shared like the `Driver` row they hang off, so a rename or an icon is what every Owner sees. The rename/icon dialog keeps its forms as siblings (nested forms are invalid HTML) and the icon routes return an `hx-swap-oob` thumbnail refresh rather than re-rendering the table, which would tear the open `<dialog>` out of the DOM. Web image picker: `GET /web/images` renders a pickable grid for a printer or a driver icon, with the search term prefilled from the entity name and editable. Picking one downloads it server-side and normalizes it. Driver download search: `GET /web/drivers` searches for a vendor-wide driver (the term is rewritten into the vendor's real product name for 15 brands) or for the exact model as typed. Links only — nothing is downloaded, and the fragment says the results are unvetted. Icon uploads no longer reject off-size or non-PNG files: `normalize_icon()` letterboxes any decodable raster into a 256x256 PNG. An already-exact 256x256 PNG is returned byte-identical, because icon storage is content-addressed and re-encoding would move the file on every save. `fetch_image()` makes the request from the server, so `assert_fetchable()` refuses any URL resolving to a private, loopback, or link-local address, and re-runs on every redirect. ImpTune sits on the same LAN as the printers it configures; an unguarded fetcher would be a port scanner for anyone who can reach the UI. DuckDuckGo is scraped, not called through an API — no key needed, but fragile, so both search functions swallow parse failures and return [] instead of 500ing a page. `WEB_SEARCH=false` disables every outbound request and hides the controls, for air-gapped installs. Also: one shared `Jinja2Templates` in `templating.py` instead of five per-router instances, so a template global is declared once; `_add_missing_columns()` in `database.py` adds new nullable columns to a pre-existing table, which `create_tables(safe=True)` skips; `db_env` in test_db.py now closes its connection on teardown, or the next test's ORM writes land in the previous test's DB file. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
55 lines
1.4 KiB
Python
55 lines
1.4 KiB
Python
import os
|
|
from contextlib import asynccontextmanager
|
|
from pathlib import Path
|
|
|
|
from fastapi import FastAPI
|
|
from fastapi.staticfiles import StaticFiles
|
|
|
|
from imptune.api import (
|
|
clients,
|
|
drivers,
|
|
health,
|
|
icons,
|
|
packages,
|
|
pages,
|
|
printers,
|
|
scripts,
|
|
session,
|
|
web,
|
|
)
|
|
from imptune.config import DATA_DIR, DRIVERS_DIR, ICONS_DIR
|
|
from imptune.db.database import db, init_db
|
|
from imptune.services.session import OwnerSessionMiddleware
|
|
|
|
|
|
@asynccontextmanager
|
|
async def lifespan(app: FastAPI):
|
|
os.makedirs(DATA_DIR, exist_ok=True)
|
|
os.makedirs(DRIVERS_DIR, exist_ok=True)
|
|
os.makedirs(ICONS_DIR, exist_ok=True)
|
|
init_db()
|
|
yield
|
|
# Close DB connection on shutdown so test fixtures can re-initialize cleanly
|
|
if not db.is_closed():
|
|
db.close()
|
|
|
|
|
|
app = FastAPI(title="ImpTune", lifespan=lifespan)
|
|
app.add_middleware(OwnerSessionMiddleware)
|
|
|
|
# Serve baked-in static assets (pico.min.css, htmx.min.js, alpine.min.js)
|
|
_static_dir = Path(__file__).parent / "static"
|
|
app.mount("/static", StaticFiles(directory=str(_static_dir)), name="static")
|
|
|
|
# Register routers
|
|
app.include_router(health.router)
|
|
app.include_router(pages.router)
|
|
app.include_router(drivers.router)
|
|
app.include_router(printers.router)
|
|
app.include_router(clients.router)
|
|
app.include_router(scripts.router)
|
|
app.include_router(packages.router)
|
|
app.include_router(icons.router)
|
|
app.include_router(session.router)
|
|
app.include_router(web.router)
|