ge-aerospace/shopdb-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

printers: resolve installer vendor via the model + fix batch download base URL

Browse Source 
Two fixes for the printer install-batch on prod data:

1. Vendor was read only from the printer's direct vendorid, which the legacy
   import never sets (it sets the model; legacy resolved vendor through the
   model). Every prod printer came back vendor "unknown", so all fell into the
   manual group and the universal PrinterInstaller.exe block never emitted. Now
   resolve vendor via the model's vendor when the printer has no direct one, as
   the classic installprinter.asp did.

2. Harden the download base URL. Behind IIS the app sees http on a loopback
   port and url_root drops the /shopdb mount, giving a broken download URL when
   site_base_url is unset. Fall back to https + the forwarded Host + script_root.

Test: a printer with no vendorid but an HP/Xerox model now groups universal.
This commit is contained in:
cproudlock
2026-07-29 12:56:31 -04:00
parent 0d40780f53
commit 3eaaee0e50
2 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/printers/api/asset_routes.py
View File

@@ -364,12 +364,29 @@ UNIVERSAL_INSTALL_VENDORS = frozenset({'HP', 'Xerox'})
def _batch_base_url():
"""Base URL the generated .bat downloads installers from. Prefer the
configured site_base_url (already includes the /shopdb mount); fall back to
the request root so a site that never set it still produces a usable batch."""
configured site_base_url (it already includes scheme + the /shopdb mount).
Fallback matters: behind IIS the app sees http on a loopback port and its
url_root drops the mount, so a naive request.url_root yields a broken
http://127.0.0.1/installers/... URL. Rebuild from the forwarded Host + the
mount (script_root) and force https instead."""
base = (Setting.get('site_base_url') or '').strip().rstrip('/')
if base:
return base
return request.url_root.rstrip('/')
host = request.headers.get('X-Forwarded-Host') or request.host
root = (request.script_root or '').rstrip('/')
return 'https://%s%s' % (host, root)
def _printer_vendor(printer):
"""Vendor name for install grouping. The legacy import sets the printer's
model but not its direct vendorid, so resolve via the model's vendor (as the
classic installprinter.asp did) when the printer has no direct vendor."""
if printer.vendor:
return (printer.vendor.vendor or '').strip()
if printer.model and printer.model.vendor:
return (printer.model.vendor.vendor or '').strip()
return ''
def _installer_url(installpath, base):
@@ -429,7 +446,7 @@ def printer_install_batch():
name = _install_name(printer, asset)
if not name:
continue
vendor = (printer.vendor.vendor if printer.vendor else '').strip()
vendor = _printer_vendor(printer)
installpath = (printer.installpath or '').strip()
if vendor in UNIVERSAL_INSTALL_VENDORS:
universal.append(name)