Merge pull request #11 from 3dem/devel

Release 0.1.3

emtools/__init__.py

@@ -24,5 +24,5 @@
 # *
 # **************************************************************************
 
-__version__ = '0.1.2'
+__version__ = '0.1.3'
 

emtools/metadata/sqlite.py

@@ -80,7 +80,8 @@ def iterTable(self, tableName, **kwargs):
                 limit: limit to this number of elements
                 classes: read column names from a 'classes' table
         """
-        query = f"SELECT * FROM {tableName}"
+        where = kwargs.get('where', '1')
+        query = f"SELECT * FROM {tableName} WHERE {where}"
 
         if 'start' in kwargs and 'limit' not in kwargs:
             kwargs['limit'] = -1

emtools/pwx/monitors.py

@@ -121,12 +121,11 @@ def __init__(self, SetClass, filename, *args, **kwargs):
         self._filename = filename
         self.lastUpdate = None
         self.streamClosed = None
-        self.inputCount = 0  # Count all input elements
 
         # Black list some items to not be monitored again
         # We are not interested in the items but just skip them from
         # the processing
-        blacklist = kwargs.get('blacklist', None)
+        blacklist = kwargs.get('blacklist', [])
         if blacklist:
             for item in blacklist:
                 self[item.getObjId()] = True
@@ -140,7 +139,6 @@ def update(self):
             setInstance = self._SetClass(filename=self._filename)
             setInstance.loadAllProperties()
             for item in setInstance.iterItems():
-                self.inputCount += 1
                 iid = item.getObjId()
                 if iid not in self:
                     itemClone = item.clone()

emtools/utils/time.py

@@ -15,6 +15,7 @@
 # **************************************************************************
 
 from datetime import datetime
+from functools import wraps
 
 from .pretty import Pretty
 
@@ -51,3 +52,13 @@ def __enter__(self):
 
     def __exit__(self, type, value, traceback):
         self.toc(self.message)
+
+    @staticmethod
+    def timeit(func):
+        @wraps(func)
+        def wrap(*args, **kw):
+            t = Timer()
+            result = func(*args, **kw)
+            t.toc(f"Function {func.__name__} took: ")
+            return result
+        return wrap