partsdb

commit 4bbb7c35ba690f2ed44eaed04db06cded5be147b
parent ea6d85d9023b60bdbc34b32d0ed8ca81366d87b3
Author: Paco Esteban <paco@e1e0.net>
Date:   Thu, 29 Dec 2022 09:24:42 +0100

show mpn on reports and guard against empty images and datasheets

Diffstat:
M
partsdb/database.py
 | 
2
+-
M
partsdb/exports/templates/part.html
 | 
2
+-
M
partsdb/helpers.py
 | 
2
+-
M
partsdb/partsdb.py
 | 
4
++--

4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/partsdb/database.py b/partsdb/database.py
@@ -16,7 +16,7 @@ LIST_PARTS_QUERY = """
     GROUP BY p.id
 """
 LIST_PARTS_CATEGORY_QUERY = """
-    SELECT p.id, p.pn, p.manufacturer, p.description,
+    SELECT p.id, p.pn, p.mpn, p.manufacturer, p.description,
            p.footprint, p.quantity, p.part_type, c.name as cname
     FROM parts as p, categories as c
         INNER JOIN categories
diff --git a/partsdb/exports/templates/part.html b/partsdb/exports/templates/part.html
@@ -17,7 +17,7 @@
   <tbody>
     <tr>
       <td><span class="field">Id:</span> {{ part.id }}</td>
-      <td><span class="field">PN:</span> {{ part.pn }}</td>
+      <td><span class="field">PN:</span> {{ part.pn }} / <span class="field">MPN:</span> {{ part.mpn }}</td>
       <td><span class="field">Manufacturer:</span> {{ part.manufacturer }}</td>
     </tr>
     <tr>
diff --git a/partsdb/helpers.py b/partsdb/helpers.py
@@ -90,7 +90,7 @@ def print_part(p, history, output="full"):
 
 
 def _part_ascii(p, history):
-    print(f"PN: {p['pn']}\tManufacturer: {p['manufacturer']}")
+    print(f"PN: {p['pn']}\tManufacturer: {p['manufacturer']}\tMPN: {p['mpn']}")
     print(
         f"Category: {p['cat']}\tType: {p['part_type']}" f"\tFootprint: {p['footprint']}"
     )
diff --git a/partsdb/partsdb.py b/partsdb/partsdb.py
@@ -84,7 +84,7 @@ def add_part(mpn, quantity, category, storage, part_type):
     if not specs:
         specs = None
 
-    if "best_datasheet" in p:
+    if "best_datasheet" in p and p["best_datasheet"]:
         if p["best_datasheet"]["mime_type"] == "application/pdf":
             datasheet = p["best_datasheet"]["url"]
         elif "document_collections" in p:
@@ -99,7 +99,7 @@ def add_part(mpn, quantity, category, storage, part_type):
         req = urllib.request.Request(datasheet, headers=headers)
         datasheet = urllib.request.urlopen(req).read()
 
-    if "best_image" in p:
+    if "best_image" in p and p["best_image"]:
         image = p["best_image"]["url"]
     if image is not None:
         req = urllib.request.Request(image, headers=headers)