Merge pull request #11 from clach04/issue_10_fix_corruption_data_loss

Fix #10 -  corruption data loss

simplenote_sync/notes.py

@@ -54,6 +54,20 @@ def __init__(self, config, logger):
                 self.log.debug("Exception: %s", sys.exc_info()[1])
                 sys.exit(1)
 
+    def write(self, note, filename, access_time):
+        try:
+            f = open(filename, 'w', encoding='utf-8')
+            f.write(note['content'])
+            f.close()
+            self.log.info("Writing %s", filename)
+
+            os.utime(filename, (access_time, float(note['modifydate'])))
+            return filename
+        except:
+            self.log.error("Error writing note id: %s, %r", note['key'], filename, exc_info=True)
+            self.log.debug("Exception: %s", sys.exc_info()[1])
+        return False
+
     def new(self, note):
         """
             Create a new note file, returns filename
@@ -67,18 +81,8 @@ def new(self, note):
             if os.path.isfile(path + "/" + filename):
                 filename = filetime + "_" + filename  # Don't blast over files with same name, i.e. same first line.
 
-            try:
-                f = open(path + "/" + filename, 'w')
-                f.write(note['content'])
-                f.close()
-                self.log.info("Writing %s", filename)
-
-                os.utime(path + "/" + filename, (access_time, float(note['modifydate'])))
-
-                return filename
-            except:
-                self.log.error("Error writing note: %s", note['key'])
-                self.log.debug("Exception: %s", sys.exc_info()[1])
+            result = self.write(note, path + "/" + filename, access_time)
+            return result
         else:
             self.log.error("Error generating filename for note: %s", note['key'])
 
@@ -145,19 +149,9 @@ def update(self, note, nf_meta):
         filename = nf_meta['filename']
         access_time = time.time()
 
-        try:
-            f = open(path + "/" + filename, 'w')
-            f.write(note['content'])
-            f.close()
-            self.log.info("Writing %s", filename)
-
-            os.utime(path + "/" + filename, (access_time, float(note['modifydate'])))
-
+        result = self.write(note, path + "/" + filename, access_time)
+        if result:
             return True
-        except:
-            self.log.error("Error writing note: %s", note['key'])
-            self.log.debug("Exception: %s", sys.exc_info()[1])
-
         return False
 
     def open(self, filename):
@@ -169,7 +163,7 @@ def open(self, filename):
 
         if os.path.isfile(path + "/" + filename):
             try:
-                f = open(path + "/" + filename, 'r')
+                f = open(path + "/" + filename, 'r', encoding='utf-8')
                 notefile['content'] = f.read()
                 f.close()
             except: