X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=file_writer.py;h=9f31945f2b14e8ce17170178aeac6c1185efa1e3;hb=bfde32ea8f021da27fb2cdf535efb0e9c465d6a2;hp=ad067104f4980d247f432c6b50789ed2d49c2998;hpb=c06bfef53f70551e7920bc4facce27f47b89e2ba;p=kiosk.git

diff --git a/file_writer.py b/file_writer.py
index ad06710..9f31945 100644
--- a/file_writer.py
+++ b/file_writer.py
@@ -1,22 +1,30 @@
 #!/usr/bin/env python3
 
-import constants
+import logging
 import os
+from uuid import uuid4
+
+import kiosk_constants
+
+
+logger = logging.getLogger(__file__)
 
 
 class file_writer:
     """Helper context to write a pages file."""
 
     def __init__(self, filename: str, *, transformations=[]):
-        self.full_filename = os.path.join(constants.pages_dir, filename)
+        temp = "temp-" + str(uuid4())
+        self.temp_filename = os.path.join(kiosk_constants.pages_dir, temp)
+        self.full_filename = os.path.join(kiosk_constants.pages_dir, filename)
         self.xforms = [file_writer.remove_tricky_unicode]
         self.xforms.extend(transformations)
         self.f = None
+        logger.info(f"Writing {self.temp_filename}...")
 
     @staticmethod
     def remove_tricky_unicode(x: str) -> str:
         try:
-            x = x.decode("utf-8")
             x = x.replace("\u2018", "'").replace("\u2019", "'")
             x = x.replace("\u201c", '"').replace("\u201d", '"')
             x = x.replace("\u2e3a", "-").replace("\u2014", "-")
@@ -30,11 +38,15 @@ class file_writer:
         self.f.write(data.encode("utf-8"))
 
     def __enter__(self):
-        self.f = open(self.full_filename, "wb")
+        self.f = open(self.temp_filename, "wb")
         return self
 
     def __exit__(self, exc_type, exc_value, exc_traceback):
         self.close()
+        logger.info(f"Copying {self.temp_filename} to {self.full_filename}")
+        cmd = f'/bin/mv -f {self.temp_filename} "{self.full_filename}"'
+        os.system(cmd)
+        print(cmd)
 
     def done(self):
         self.close()
@@ -46,6 +58,6 @@ class file_writer:
 # Test
 # def toupper(x):
 #   return x.upper()
-#
+
 # with file_writer("test", transformations=[toupper]) as fw:
-#    fw.write(u"Another test!!")
+#   fw.write(u"Another test!!")