chellow 1690534443.0.0__py3-none-any.whl → 1690551015.0.0__py3-none-any.whl

chellow/e/hh_importer.py

@@ -99,16 +99,19 @@ def start_hh_import_process(dc_contract_id, istream, file_name, file_size):
     return process
 
 
+lock = threading.RLock()
+
+
 class HhImportTask(threading.Thread):
     def __init__(self, contract_id):
         super().__init__(name=f"HH Automatic Import: contract {contract_id}")
-        self.lock = threading.RLock()
         self.messages = deque()
         self.contract_id = contract_id
         self.importer = None
         self.stopped = threading.Event()
         self.going = threading.Event()
         self.is_error = False
+        self.wait_seconds = 30 * 60
 
     def stop(self):
         self.stopped.set()
@@ -118,8 +121,8 @@ class HhImportTask(threading.Thread):
         self.going.set()
 
     def is_locked(self):
-        if self.lock.acquire(False):
-            self.lock.release()
+        if lock.acquire(False):
+            lock.release()
             return False
         else:
             return True
@@ -138,7 +141,6 @@ class HhImportTask(threading.Thread):
 
     def import_file(self, sess):
         found_new = False
-        self.wait_seconds = 30 * 60
 
         try:
             contract = Contract.get_dc_by_id(sess, self.contract_id)
@@ -173,7 +175,7 @@ class HhImportTask(threading.Thread):
         return found_new
 
     def import_now(self):
-        if self.lock.acquire(False):
+        if lock.acquire(False):
             sess = None
             try:
                 sess = Session()
@@ -185,7 +187,7 @@ class HhImportTask(threading.Thread):
             finally:
                 if sess is not None:
                     sess.close()
-                self.lock.release()
+                lock.release()
 
     def run(self):
         while not self.stopped.isSet():

{chellow-1690534443.0.0.dist-info → chellow-1690551015.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1690534443.0.0
+Version: 1690551015.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

{chellow-1690534443.0.0.dist-info → chellow-1690551015.0.0.dist-info}/RECORD

@@ -22,7 +22,7 @@ chellow/e/computer.py,sha256=P-8ZaLnD5GrAKkzuuLs314Ci-umszNuvYK03HysYkeA,66311
 chellow/e/dno_rate_parser.py,sha256=3IqGM2v6Str7S3Rc9FZ7lRWBKthfb3zSjpJLSETPcEE,20631
 chellow/e/duos.py,sha256=SLP2KpHlllMBMNzE70u0V3SHnScxWNOLQMjat28mu8U,29089
 chellow/e/energy_management.py,sha256=AnmaWsYqX4RTisqXx8AuWJJ_QG9vKy_GXEAFVYVaJ5M,11490
-chellow/e/hh_importer.py,sha256=P9KiHxpVUsD2Hqn_DfASw2w0KobmAjHYje7Z8-0QV4Y,16466
+chellow/e/hh_importer.py,sha256=xnonyt-XkxF04EzBeno_Xk0t5IAA_5zlJfikcHw-7Wc,16435
 chellow/e/hh_parser_bg_csv.py,sha256=IOjM-QliKzvSXyhslmxz504XWnsGkVKEaCQ48SNeNeQ,2423
 chellow/e/hh_parser_df2.py,sha256=G4kt4N4mNjUa1Z7B1Ov6rAyZmWDyGEVFYscdghToMRo,3558
 chellow/e/hh_parser_simple_csv.py,sha256=lVRprIEjDpTQdeXm2xcLmRAyre2LWec8ueVwcCISZPo,2082
@@ -352,6 +352,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1690534443.0.0.dist-info/METADATA,sha256=Jpn1zGsNMQmtmEyZPXOKlR0xY4NPnXI14IsVYZeoBhQ,12161
-chellow-1690534443.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-chellow-1690534443.0.0.dist-info/RECORD,,
+chellow-1690551015.0.0.dist-info/METADATA,sha256=I9OVq5ATkHIdFjol7NTWY6hXK92bC0sFRL_18NFzduA,12161
+chellow-1690551015.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+chellow-1690551015.0.0.dist-info/RECORD,,