chellow 1707314900.0.0__py3-none-any.whl → 1707388338.0.0__py3-none-any.whl

chellow/dloads.py

@@ -48,9 +48,13 @@ class DloadFile:
         if not self.running_name.exists():
             raise BadRequest("Output file has been deleted.")
 
+    def flush(self, *args, **kwargs):
+        self._check_exists()
+        return self.f.flush(*args, **kwargs)
+
     def write(self, *args, **kwargs):
         self._check_exists()
-        self.f.write(*args, **kwargs)
+        return self.f.write(*args, **kwargs)
 
     def seek(self, *args, **kwargs):
         self._check_exists()
@@ -72,7 +76,7 @@ class DloadFile:
         self.close()
 
 
-def make_names(base, user):
+def open_file(base, user, mode="r", newline=None, is_zip=False):
     global download_id
 
     base = base.replace("/", "").replace(" ", "")
@@ -95,11 +99,7 @@ def make_names(base, user):
         uname = un.replace("@", "").replace(".", "").replace("\\", "")
 
     names = tuple("_".join((serial, v, uname, base)) for v in ("RUNNING", "FINISHED"))
-    return tuple(download_path / name for name in names)
-
-
-def open_file(base, user, mode="r", newline=None, is_zip=False):
-    running_name, finished_name = make_names(base, user)
+    running_name, finished_name = tuple(download_path / name for name in names)
     return DloadFile(running_name, finished_name, mode, newline, is_zip)
 
 

chellow/reports/report_g_monthly_duration.py

@@ -1,4 +1,3 @@
-import os
 import sys
 import threading
 import traceback
@@ -14,7 +13,7 @@ from sqlalchemy.sql.expression import null
 from werkzeug.exceptions import BadRequest
 
 import chellow.e.computer
-from chellow.dloads import make_names, open_file
+from chellow.dloads import open_file
 from chellow.e.computer import contract_func
 from chellow.gas.engine import GDataSource
 from chellow.models import (
@@ -203,8 +202,7 @@ def content(
                 base_name.append(str(g_supply.id))
                 sites = sites.filter(GEra.g_supply == g_supply)
 
-            running_name, finished_name = make_names("_".join(base_name) + ".ods", user)
-            rf = open(running_name, mode="wb")
+            rf = open_file("_".join(base_name) + ".ods", user, mode="wb")
             site_rows = []
             g_era_rows = []
 
@@ -345,7 +343,6 @@ def content(
     finally:
         try:
             rf.close()
-            os.rename(running_name, finished_name)
         except BaseException:
             msg = traceback.format_exc()
             ef = open_file("error.txt", user, mode="w")

{chellow-1707314900.0.0.dist-info → chellow-1707388338.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chellow
-Version: 1707314900.0.0
+Version: 1707388338.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-1707314900.0.0.dist-info → chellow-1707388338.0.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ chellow/__init__.py,sha256=_9hq4MlC2YB7kUh4iH9hwmx7BqMV6JeyvGVB8uWk8Cs,10127
 chellow/api.py,sha256=mk17TfweR76DPFC8lX2SArTjai6y6YshASxqO1w-_-s,11036
 chellow/bank_holidays.py,sha256=22EdNPvUQG_hFt82OKkeKzRFht78Urhu0Sc6Kpj-1wo,4488
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
-chellow/dloads.py,sha256=iNp8qcww8fRY57_Ctz0KTLkc1qcVTVhX6aoKh4_N1tg,5034
+chellow/dloads.py,sha256=ce8EtOt5GeMczc0RWO8YaUv6cLt9MzIwXaeCsf_R7lw,5090
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
 chellow/general_import.py,sha256=4LduwzNipxOiHYHQLb0x96_m3RPuDnQMbJzOFDbOqTg,65039
 chellow/models.py,sha256=7EX1oRpIcVRsjpzIC4ROOr-zp1-C7kdoj3WSNp2AKr0,236400
@@ -95,7 +95,7 @@ chellow/reports/report_csv_llfcs.py,sha256=XbVGcTbjLSrJL7zdgqIPX_FvN4Pa_lUSMDtku
 chellow/reports/report_csv_site_hh_data.py,sha256=v6VKdPX0PcvOljVQvWtF977jmORktdTrnr4MykFGROE,4376
 chellow/reports/report_csv_site_snags.py,sha256=XrJmIW0G4SyhpMJFZw1rqLom84wzLVqid44EBS0UT9s,2747
 chellow/reports/report_ecoes_comparison.py,sha256=QT0bIA5YbCOU6eygep1sSS7B8wYua9EHZs_Jy5emaVE,21466
-chellow/reports/report_g_monthly_duration.py,sha256=balpjLEEF0b76GQBSUtCxUWKTr4CxAaUSHf66wXyxfE,12139
+chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
 chellow/reports/report_g_virtual_bills.py,sha256=17jKVjSrvQ91qE924InSzdxSebLo_QkvR2M1ugnRglo,4604
@@ -363,6 +363,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-1707314900.0.0.dist-info/METADATA,sha256=BPjOyNHRFVGZ3-l9jJ29kqnBk6ILZNbrm_SS215to88,12203
-chellow-1707314900.0.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
-chellow-1707314900.0.0.dist-info/RECORD,,
+chellow-1707388338.0.0.dist-info/METADATA,sha256=AhyvitvJT46wtS3-60PA83X_l7kV0qbGN-jbpIcDBSk,12203
+chellow-1707388338.0.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
+chellow-1707388338.0.0.dist-info/RECORD,,