itkdb-gtk 0.18.0.dev2__tar.gz → 0.19.0__tar.gz

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itkdb_gtk
-Version: 0.18.0.dev2
+Version: 0.19.0
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/CreateShipments.py

@@ -15,7 +15,7 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, QRScanner
 
 import gi
 gi.require_version("Gtk", "3.0")
@@ -51,7 +51,7 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         self.set_border_width(10)
 
         # intercept keyboard
-        dbGtkUtils.setup_scanner(self.get_qrcode)
+        self.scanner = QRScanner.QRScanner(self.get_qrcode)
 
         # Prepare HeaderBar
         self.hb.props.title = "Create Shipment"
@@ -300,9 +300,8 @@ class CreateShipments(dbGtkUtils.ITkDBWindow):
         else:
             self.write_message("No attachment found\n")
 
-    def get_qrcode(self, fd, state, reader):
+    def get_qrcode(self, txt):
         """Gets data from QR scanner."""
-        txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("{}\n".format(txt))
 
         # Try to add item to the list

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/GetShipments.py

@@ -10,7 +10,7 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, QRScanner
 import gi
 
 gi.require_version("Gtk", "3.0")
@@ -77,7 +77,7 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
         self.set_border_width(10)
 
         # intercept keyboard
-        dbGtkUtils.setup_scanner(self.get_qrcode)
+        self.scanner = QRScanner.QRScanner(self.get_qrcode)
 
         # Prepare HeaderBar
         self.hb.props.title = "{} shipments".format(self.recipient)
@@ -183,9 +183,8 @@ class ReceiveShipments(dbGtkUtils.ITkDBWindow):
 
         return scrolled
 
-    def get_qrcode(self, fd, state, reader):
+    def get_qrcode(self, txt):
         """Gets data from QR scanner."""
-        txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("{}\n".format(txt))
 
         if txt.find("J-SD") == 0:

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/ITkDButils.py

@@ -1,6 +1,4 @@
 """Utilities for the inteaction with the ITkDB."""
-import mimetypes
-import traceback
 from collections.abc import Iterable
 from datetime import datetime
 from pathlib import Path
@@ -8,8 +6,6 @@ import getpass
 
 import dateutil.parser
 import itkdb
-import magic
-import locale
 
 # The response of the DB
 db_response = ""
@@ -205,7 +201,7 @@ def create_component_attachment(client, SN, file_path, title=None, description="
     global db_response
     db_response = None
     path = Path(file_path).expanduser().resolve()
-    filetype = mimetypes.guess_type(path)
+    filetype =   itkdb.utils.get_mimetype(path, None)
     if title is None:
         title = path.name
 
@@ -380,7 +376,7 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                     if newRn not in runN:
                         data["runNumber"] = newRn
                         break
-                        
+
     # Try to upload the test
     try:
         db_response = client.post("uploadTestRunResults", json=data)
@@ -390,7 +386,7 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
     except Exception as e:
         msg = "Could not upload the test:\n{}".format(str(e))
         return msg
-    
+
     try:
         # Handle attachments.
         attachment_urls = {}
@@ -410,7 +406,7 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
                         print("File {} does not exist".format(path))
                         continue
 
-                    data["url"] = str(path.as_uri())
+                    data["url"] = path.as_uri()
                     filetype = itkdb.utils.get_mimetype(path.as_posix(), None)
                     attachment = {'data': (path.as_posix(), open(path.as_posix(), 'rb'), filetype)}
                 else:
@@ -432,9 +428,8 @@ def upload_test(client, data, attachments=None, check_runNumber=False):
         return None
 
     except Exception as e:
-        print(traceback.format_exc())
         return "Could not upload attachment:\n{}".format(str(e))
-    
+
 
 def set_test_run_parameter(session, test_run, parameter, value):
     """Modify testRun Parameter

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/PanelVisualInspection.py

@@ -11,7 +11,7 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, QRScanner
 from itkdb_gtk.ShowComments import ShowComments
 from itkdb_gtk.ShowDefects import ShowDefects
 from itkdb_gtk.UploadTest import create_json_data_editor
@@ -120,8 +120,7 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
 
 
         self.show_all()
-
-        dbGtkUtils.setup_scanner(self.get_qrcode)
+        self.scanner = QRScanner.QRScanner(self.get_qrcode)
 
     def on_global_image(self, *args):
         """We choose the global image."""
@@ -553,9 +552,8 @@ class PanelVisualInspection(dbGtkUtils.ITkDBWindow):
             lv_iter = model.iter_next(lv_iter)
 
 
-    def get_qrcode(self, fd, state, reader):
+    def get_qrcode(self,txt):
         """Read SN from scanner."""
-        txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("SN: {}\n".format(txt))
         self.SN_ready(txt, self.SN.widget)
 

itkdb_gtk-0.19.0/itkdb_gtk/QRScanner.py

@@ -0,0 +1,119 @@
+#!/usr/bin/env python3
+"""A set of utilities for teh warp scanner."""
+import pathlib
+import serial
+import serial.tools.list_ports as list_ports
+
+import gi
+gi.require_version("Gtk", "3.0")
+from gi.repository import GLib
+
+class QRScanner:
+    """Contains information to detect the scanner."""
+    def __init__(self, callback):
+        self.reader = None
+        self.callback = callback
+        self.timer_id = None
+        self.source_id = None
+        self.init_scanner()
+
+    def init_scanner(self):
+        """Sets the scanner."""
+        self.setup_scanner()
+        if self.reader is None:
+            self.timer_id = GLib.timeout_add(500, self.find_scanner)
+        else:
+            print("Found scanner in {}".format(self.reader.name))
+
+    def find_scanner(self, *args):
+        """Check if the scanner is there."""
+        # if the reader is there, stop the timeput
+        if self.reader is not None:
+            return False
+
+        # Try to setup the scanner
+        self.setup_scanner()
+        if self.reader is not None:
+            self.timer_id = None
+            print("Found scanner in {}".format(self.reader.name))
+            return False
+        else:
+            return True
+
+
+    def setup_scanner(self):
+        """Setup scanner and callback function."""
+        if self.reader is not None:
+            return
+
+        self.reader = None
+        device_signature = '05f9:4204'
+        candidates = list(list_ports.grep(device_signature))
+        if not candidates:
+            return
+
+        self.reader = serial.Serial(candidates[0].device, 9600)
+        self.source_id = GLib.unix_fd_add_full(
+                GLib.PRIORITY_DEFAULT,
+                self.reader.fileno(),
+                GLib.IOCondition.IN | GLib.IOCondition.ERR | GLib.IOCondition.NVAL,
+                self.get_line,
+                self.callback,
+                )
+
+
+    def finish_timeout(self):
+        """Finishes the timeout."""
+        GLib.source_remove(self.source_id)
+        self.source_id = None
+
+        self.reader.close()
+        self.reader = None
+
+        # re-start the search of the scanner
+        self.timer_id = GLib.timeout_add(500, self.find_scanner)
+
+    def get_line(self, fd, state, callback):
+        """Has to info to read."""
+        if state == GLib.IOCondition.IN:
+            try:
+                available = self.reader.in_waiting
+                while True:
+                    delta = self.reader.in_waiting - available
+                    if not delta:
+                        break
+
+                # Get data from serial device passed in via
+                data = self.reader.read_until(expected='\r', size=self.reader.in_waiting).strip()
+                txt = data.decode('utf-8')
+                if callback:
+                    callback(txt)
+
+            except OSError:
+                if not pathlib.Path(self.reader.name).exists():
+                    print("Device unplugged.")
+                    self.finish_timeout()
+                    return False
+
+            return True
+
+
+        else:
+            self.finish_timeout()
+            return False
+
+def get_text_from_scanner(txt):
+    """Callback where the scanners sends the text."""
+    print("### {}".format(txt))
+
+def test_scanner():
+    """Test the thing."""
+    scanner = QRScanner(get_text_from_scanner)
+    loop = GLib.MainLoop()
+    try:
+        loop.run()
+    except KeyboardInterrupt:
+        loop.quit()
+
+if __name__ == "__main__":
+    test_scanner()

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/VisualInspection.py

@@ -11,7 +11,7 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, QRScanner
 from itkdb_gtk.ShowComments import ShowComments
 from itkdb_gtk.ShowDefects import ShowDefects
 from itkdb_gtk.ShowAttachments import ShowAttachments
@@ -142,7 +142,7 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
         self.write_message("Module Visual Inspection\n")
         self.show_all()
 
-        dbGtkUtils.setup_scanner(self.get_qrcode)
+        self.scanner = QRScanner.QRScanner(self.get_qrcode)
 
     def on_institute(self, combo):
         """A new recipient has been chosen."""
@@ -261,9 +261,8 @@ class ModuleVisualInspection(dbGtkUtils.ITkDBWindow):
 
 
 
-    def get_qrcode(self, fd, state, reader):
+    def get_qrcode(self, txt):
         """Read SN from scanner."""
-        txt = dbGtkUtils.scanner_get_line(reader)
         self.write_message("SN: {}\n".format(txt))
         self.SN_ready(txt, self.SN.widget)
 

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/__init__.py

@@ -1,6 +1,6 @@
 """ itkdb-gtk python module
 """
-__version__ = "0.18.0.dev2"
+__version__ = "0.19.0"
 
 
 def dash_board():

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/dbGtkUtils.py

@@ -8,7 +8,6 @@ from collections.abc import Iterable
 from copy import deepcopy
 from datetime import datetime
 import webbrowser
-import serial
 
 import dateutil.parser
 import numpy as np
@@ -29,34 +28,6 @@ except ImportError:
 from itkdb_gtk import ITkDButils
 
 
-def setup_scanner(callback):
-    """Setup scanner and callback function."""
-    for fnam in ["/dev/ttyACM0", "/dev/cu.usbmodemS_N_G19F204881"]:
-        P = pathlib.Path(fnam)
-        if P.exists():
-            rdr = serial.Serial(fnam, 9600)
-            GLib.unix_fd_add_full(
-                GLib.PRIORITY_DEFAULT,
-                rdr.fileno(),
-                GLib.IOCondition.IN,
-                callback,
-                rdr,
-            )
-            break
-
-def scanner_get_line(reader):
-    """Reads a line from serial."""
-    available = reader.in_waiting
-    while True:
-        delta = reader.in_waiting - available
-        if not delta:
-            break
-
-    # Get data from serial device passed in via
-    data = reader.read_until(expected='\r', size=reader.in_waiting).strip()
-    txt = data.decode('utf-8')
-    return txt
-
 def parse_date(txt):
     """Parse a date."""
     try:

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk/findComponent.py

@@ -12,7 +12,7 @@ except ImportError:
     cwd = Path(__file__).parent.parent
     sys.path.append(cwd.as_posix())
 
-from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils
+from itkdb_gtk import dbGtkUtils, ITkDBlogin, ITkDButils, QRScanner
 from itkdb_gtk.GetShipments import find_vtrx
 
 
@@ -32,6 +32,7 @@ class FindComponent(dbGtkUtils.ITkDBWindow):
 
         """
         super().__init__(session=session, title="Find Component", help_link=help_link)
+        self.scanner = QRScanner.QRScanner(self.get_qrcode)
         self.init_window()
 
     def init_window(self):
@@ -44,7 +45,7 @@ class FindComponent(dbGtkUtils.ITkDBWindow):
 
         # Object Data
         lbl = Gtk.Label(label="Scan your QR or bar code. Information will appear below.")
-        self.mainBox.pack_start(lbl, True, True, 0)
+        self.mainBox.pack_start(lbl, False, False, 10)
 
         #btn = Gtk.Button(label="Test Button")
         #btn.connect("clicked", self.test_qrcode)
@@ -52,14 +53,11 @@ class FindComponent(dbGtkUtils.ITkDBWindow):
 
         # The text view
         self.mainBox.pack_start(self.message_panel.frame, True, True, 0)
-        
+
         self.show_all()
-        
-    def get_qrcode(self, fd, state, reader):
-        """Gets data from QR scanner."""
-        txt = dbGtkUtils.scanner_get_line(reader)
-        self.write_message("{}\n".format(txt))
 
+    def get_qrcode(self, txt):
+        """Gets data from QR scanner."""
         if txt.find("J-SD") == 0:
             try:
                 SN = find_vtrx(self.session, txt)
@@ -68,20 +66,21 @@ class FindComponent(dbGtkUtils.ITkDBWindow):
                 return
         else:
             SN = txt
-            
+
         obj = ITkDButils.get_DB_component(self.session, SN)
         if obj is None:
             self.write_message("Object not found in DB\n")
             return
-        
-        msg = "\nObject SN: {}\nObject Alt. ID: {}\nObject Type: {}\nObject Loc. {}\nObject stage: {} - {}".format(
-            obj["serialNumber"], 
+
+        msg = "\n{}\nObject SN: {}\nObject Alt. ID: {}\nObject Type: {}\nObject Loc. {}\nObject stage: {} - {}\n".format(
+            txt,
+            obj["serialNumber"],
             obj["alternativeIdentifier"],
             obj["componentType"]["name"],
             obj["currentLocation"]["name"],
             obj["currentStage"]["code"],
             obj["currentStage"]["name"])
-        
+
         self.write_message(msg)
 
     def test_qrcode(self, *args):
@@ -97,22 +96,23 @@ class FindComponent(dbGtkUtils.ITkDBWindow):
                 return
         else:
             SN = txt
-            
+
         obj = ITkDButils.get_DB_component(self.session, SN)
         if obj is None:
             self.write_message("Object not found in DB\n")
             return
-        
-        
+
+
         msg = "\n\nObject SN: {}\nObject Alt. ID: {}\nObject Type: {}\nObject Loc.: {}\nObject stage: {} - {}\n".format(
-            obj["serialNumber"], 
+            obj["serialNumber"],
             obj["alternativeIdentifier"],
             obj["componentType"]["name"],
             obj["currentLocation"]["name"],
             obj["currentStage"]["code"],
             obj["currentStage"]["name"])
-        
+
         self.write_message(msg)
+        self.write_message("")
 
 def main():
     """Main entry."""
@@ -129,6 +129,10 @@ def main():
     client.user_gui = dlg
 
     window = FindComponent(client, help_link=HELP_LINK)
+    window.set_accept_focus(True)
+    window.present()
+    window.connect("destroy", Gtk.main_quit)
+
     try:
         Gtk.main()
 

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itkdb_gtk
-Version: 0.18.0.dev2
+Version: 0.19.0
 Summary: A collection of Gtk based GUI to access ITkDB.
 Author-email: Carlos Lacasta <carlos.lacasta@cern.ch>
 Project-URL: Homepage, https://gitlab.cern.ch/atlas-itk/sw/db/itk-pdb-gtk-gui-utils

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/itkdb_gtk.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ itkdb_gtk/ITkDB.svg
 itkdb_gtk/ITkDBlogin.py
 itkdb_gtk/ITkDButils.py
 itkdb_gtk/PanelVisualInspection.py
+itkdb_gtk/QRScanner.py
 itkdb_gtk/SensorUtils.py
 itkdb_gtk/ShowAttachments.py
 itkdb_gtk/ShowComments.py

{itkdb_gtk-0.18.0.dev2 → itkdb_gtk-0.19.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itkdb_gtk"
-version = "0.18.0.dev2"
+version = "0.19.0"
 authors = [
   { name="Carlos Lacasta", email="carlos.lacasta@cern.ch" },
 ]