fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-20 04:58:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

These are changes made for concurrent access. This will deal with the

Browse source 
case when the editor is not opening from vim. Simple Concurrent issue
when dealing with os.mkstemp
This commit is contained in:
palashahuja 2018-01-15 19:27:31 +05:30
parent 919094c256
commit b383e2b4d7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
jrnl/util.py
View file

@ -9,6 +9,7 @@ if "win32" in sys.platform:
import colorama import colorama
colorama.init() colorama.init()
import re import re
import threading
import tempfile import tempfile
import subprocess import subprocess
import codecs import codecs
@ -126,13 +127,15 @@ def load_and_fix_json(json_path):
sys.exit(1) sys.exit(1)
def get_text_from_editor(config, template=""): def get_text_from_editor(config, template=""):
_, tmpfile = tempfile.mkstemp(prefix="jrnl", text=True, suffix=".txt") fd, tmpfile = tempfile.mkstemp(prefix="jrnl", text=True, suffix=".txt")
with codecs.open(tmpfile, 'w', "utf-8") as f: with codecs.open(tmpfile, 'w', "utf-8") as f:
if template: if template:
f.write(template) f.write(template)
subprocess.call(config['editor'].split() + [tmpfile]) process = subprocess.Popen(config['editor'].split() + [tmpfile])
process.wait()
with codecs.open(tmpfile, "r", "utf-8") as f: with codecs.open(tmpfile, "r", "utf-8") as f:
raw = f.read() raw = f.read()
os.close(fd)
os.remove(tmpfile) os.remove(tmpfile)
if not raw: if not raw:
prompt('[Nothing saved to file]') prompt('[Nothing saved to file]')