mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 16:34:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

JSON done.

Browse source
This commit is contained in:
Eadaen1 2020-09-15 15:49:42 +01:00
parent 3f6d5ee793
commit 9a212b834d
3 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
xonsh/history/base.py
View file

@ -170,4 +170,9 @@ class History:
def clear(self): def clear(self):
"""Wipes the current session from both the disk and memory.""" """Wipes the current session from both the disk and memory."""
pass self.buffer = None
self.inps = None
self.rtns = None
self.tss = None
self.outs = None

18
xonsh/history/json.py
View file

@ -269,9 +269,6 @@ class JsonHistoryFlusher(threading.Thread):
load_hist_len = len(hist["cmds"]) load_hist_len = len(hist["cmds"])
hist["cmds"].extend(cmds) hist["cmds"].extend(cmds)
if self.at_exit: if self.at_exit:
#print(hist["ts"])
print(hist.__class__)
print(hist)
hist["ts"][1] = time.time() # apply end time hist["ts"][1] = time.time() # apply end time
hist["locked"] = False hist["locked"] = False
if not builtins.__xonsh__.env.get("XONSH_STORE_STDOUT", False): if not builtins.__xonsh__.env.get("XONSH_STORE_STDOUT", False):
@ -512,16 +509,15 @@ class JsonHistory(History):
time.sleep(0.1) # don't monopolize the thread (or Python GIL?) time.sleep(0.1) # don't monopolize the thread (or Python GIL?)
def clear(self): def clear(self):
def wipe_disk(hist):
with open(self.filename, "r") as f:
backup_metadata = json.load(f)
backup_metadata["data"]["cmds"] = []
print(backup_metadata)
with open(self.filename, "w") as f:
json.dump(backup_metadata, f)
def wipe_memory(hist): # todo is this enough? def wipe_memory(hist): # todo is this enough?
hist.buffer = [] hist.buffer = []
self.tss = JsonCommandField("ts", self)
self.inps = JsonCommandField("inp", self)
self.outs = JsonCommandField("out", self)
self.rtns = JsonCommandField("rtn", self)
wipe_disk(self)
wipe_memory(self) wipe_memory(self)
# Flush empty history object to disk. This overwrites the old commands.
self.flush()

4
xonsh/history/main.py
View file

@ -430,14 +430,12 @@ def history_main(
hf.join() hf.join()
elif ns.action == "off": elif ns.action == "off":
if hist.remember_history: if hist.remember_history:
hist.remember_history = False
hist.clear() hist.clear()
hist.remember_history = False
elif ns.action == "on": elif ns.action == "on":
if not hist.remember_history: if not hist.remember_history:
hist.remember_history = True hist.remember_history = True
hist.remake_file()
elif ns.action == "clear": elif ns.action == "clear":
hist.clear() hist.clear()
hist.remake_file()
else: else:
print("Unknown history action {}".format(ns.action), file=sys.stderr) print("Unknown history action {}".format(ns.action), file=sys.stderr)