From 8ab37e0b07bb8d15222b40093687d4317cfe5f11 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 30 Oct 2018 11:59:00 +0000
Subject: [PATCH] fireinfo: Update vendors URL schema

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/base.html                       |  2 +-
 .../fireinfo/modules/table-devices.html       |  2 +-
 src/templates/fireinfo/vendors.html           |  4 +---
 src/web/__init__.py                           |  6 ++++--
 src/web/fireinfo.py                           | 21 ++++++++++---------
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/templates/base.html b/src/templates/base.html
index 70e6569d..91f36c52 100644
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -125,7 +125,7 @@
 						<div class="collapse navbar-collapse" id="navbar">
 							<ul class="navbar-nav ml-auto">
 								<li class="nav-item">
-									<a class="nav-link {% if request.path == "/device/vendors" %}active{% end %}" href="/device/vendors">
+									<a class="nav-link {% if request.path.startswith("/vendors") %}active{% end %}" href="/vendors">
 										{{ _("Vendors") }}
 									</a>
 								</li>
diff --git a/src/templates/fireinfo/modules/table-devices.html b/src/templates/fireinfo/modules/table-devices.html
index 32f89747..7002550f 100644
--- a/src/templates/fireinfo/modules/table-devices.html
+++ b/src/templates/fireinfo/modules/table-devices.html
@@ -10,7 +10,7 @@
 			</p>
 
 			<p class="mb-0">
-				<a href="/device/{{ d.subsystem }}/{{ d.vendor }}">{{ d.vendor_string }}</a>
+				<a href="/vendors/{{ d.subsystem }}/{{ d.vendor }}">{{ d.vendor_string }}</a>
 				&dash; {{ d.model_string or "N/A (%s)" % d.model }}
 
 				{% if d.driver %}
diff --git a/src/templates/fireinfo/vendors.html b/src/templates/fireinfo/vendors.html
index 117d7a62..5e66ed74 100644
--- a/src/templates/fireinfo/vendors.html
+++ b/src/templates/fireinfo/vendors.html
@@ -22,9 +22,7 @@
 							<dt class="col-sm-9">{{ vendor }}</dt>
 							<dd class="col-sm-3">
 								{% for subsystem, vendor_id in sorted(subsystems) %}
-									<a href="/device/{{ subsystem }}/{{ vendor_id }}">
-										{{ subsystem.upper() }}
-									</a>
+									<a href="/vendors/{{ subsystem }}/{{ vendor_id }}">{{ subsystem.upper() }}</a>
 								{% end %}
 							</dd>
 						{% end %}
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 2e0a6724..5f81d69a 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -186,8 +186,10 @@ class Application(tornado.web.Application):
 		self.add_handlers(r"fireinfo(\.dev)?\.ipfire\.org", [
 			(r"/", fireinfo.IndexHandler),
 			(r"/device/driver/(.*)", fireinfo.DeviceDriverDetail),
-			(r"/device/vendors", fireinfo.DeviceVendorsHandler),
-			(r"/device/(pci|usb)/([0-9a-f]{4})", fireinfo.DeviceVendorHandler),
+
+			# Vendors
+			(r"/vendors", fireinfo.VendorsHandler),
+			(r"/vendors/(pci|usb)/([0-9a-f]{4})", fireinfo.VendorHandler),
 
 			# Show profiles
 			(r"/profile/random", fireinfo.RandomProfileHandler),
diff --git a/src/web/fireinfo.py b/src/web/fireinfo.py
index dcb1de23..2b04da9d 100644
--- a/src/web/fireinfo.py
+++ b/src/web/fireinfo.py
@@ -182,13 +182,6 @@ class DeviceDriverDetail(BaseHandler):
 			driver_map=self.fireinfo.get_driver_map(driver, when=self.when))
 
 
-class DeviceVendorsHandler(BaseHandler):
-	def get(self):
-		vendors = self.fireinfo.get_vendor_list(when=self.when)
-
-		self.render("fireinfo/vendors.html", vendors=vendors)
-
-
 class StatsHandler(BaseHandler):
 	def get(self):
 		self.render("fireinfo/stats.html")
@@ -275,10 +268,18 @@ class StatsNetworkingHandler(BaseHandler):
 		return self.render("fireinfo/stats-network.html", network=network)
 
 
-class DeviceVendorHandler(BaseHandler):
+class VendorsHandler(BaseHandler):
+	def get(self):
+		vendors = self.fireinfo.get_vendor_list(when=self.when)
+
+		self.render("fireinfo/vendors.html", vendors=vendors)
+
+
+class VendorHandler(BaseHandler):
 	def get(self, subsystem, vendor_id):
-		devices = self.fireinfo.get_devices_by_vendor(subsystem, vendor_id,
-			when=self.when)
+		devices = self.fireinfo.get_devices_by_vendor(subsystem, vendor_id, when=self.when)
+		if not devices:
+			raise tornado.web.HTTPError(404)
 
 		vendor_name = self.fireinfo.get_vendor_string(subsystem, vendor_id)
 
-- 
2.39.2