Merge 1b8ad23a19 into f2e207de85

jrnl.py

@@ -358,6 +358,14 @@ if __name__ == "__main__":
         with open(CONFIG_PATH) as f:
             config = json.load(f)
 
+        # update config file with settings introduced in a later version
+        missing_keys = set(default_config).difference(config)
+        if missing_keys:
+            for key in missing_keys:
+                config[key] = default_config[key]
+            with open(CONFIG_PATH, 'w') as f:
+                json.dump(config, f, indent=2)
+
     parser = argparse.ArgumentParser()
     composing = parser.add_argument_group('Composing', 'Will make an entry out of whatever follows as arguments')
     composing.add_argument('-date', dest='date', help='Date, e.g. "yesterday at 5pm"')
@@ -396,12 +404,16 @@ if __name__ == "__main__":
         if config['editor']:
             tmpfile = os.path.join(tempfile.gettempdir(), "jrnl")
             subprocess.call(config['editor'].split() + [tmpfile])
+            if os.path.exists(tmpfile):
                 with open(tmpfile) as f:
                     raw = f.read()
                 os.remove(tmpfile)
-
+            else:
+                print('nothing saved to file')
+                raw = ''
         else:
             raw = raw_input("Compose Entry: ")
+
         if raw:
             args.text = [raw]
         else: