quenousimporte
/
notes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cli tool: historize more stuff

This commit is contained in:
quenousimporte 2023-09-21 14:02:38 +02:00
parent 8bf3a8a140
commit 2c05a1b314
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cli/app.py
View File

@ -41,7 +41,8 @@ def writetextfile(path, content):
def editnote(note): def editnote(note):
content = note["content"] content = note["content"]
writetextfile("data/" + filename(note) + ".bak", content) backupfilepath = "history/" + filename(note) + str(time.time())
writetextfile(backupfilepath, content)
writetextfile("data/" + filename(note), content) writetextfile("data/" + filename(note), content)
subprocess.call(settings["commands"]["editor"] + ["data/" + filename(note)]) subprocess.call(settings["commands"]["editor"] + ["data/" + filename(note)])
@ -49,7 +50,7 @@ def editnote(note):
if newcontent != content: if newcontent != content:
subprocess.call(["cp", "data/" + filename(note), "history/" + filename(note) + str(time.time())]) subprocess.call(["cp", "data/" + filename(note), "history/" + filename(note) + str(time.time())])
subprocess.call(settings["commands"]["diff"] + ["data/" + filename(note) + ".bak", "data/" + filename(note)]) subprocess.call(settings["commands"]["diff"] + [backupfilepath, "data/" + filename(note)])
note["content"] = newcontent note["content"] = newcontent
data.remove(note) data.remove(note)
data.insert(0, note) data.insert(0, note)
@ -75,9 +76,15 @@ def savedata():
def loaddata(): def loaddata():
if settings["mode"] == "remote": if settings["mode"] == "remote":
subprocess.call(["curl", "-X", "POST", "-F", "action=fetch", "-F", "password=" + settings["password"], "-o", "data/data.acs.bak", settings["url"] + "/handler.php"]) timestamp = str(time.time())
subprocess.call([settings["commands"]["gpg"], "-q", "--yes", "--output", "data/data.json.bak", "--decrypt", "data/data.acs.bak"])
return json.loads(readtextfile("data/data.json.bak")) subprocess.call(["curl", "-X", "POST", "-F", "action=fetch", "-F", "password=" + settings["password"], "-o", "history/data.acs" + timestamp, settings["url"] + "/handler.php"])
subprocess.call(["cp", "history/data.acs" + timestamp, "data/data.acs"])
subprocess.call([settings["commands"]["gpg"], "-q", "--yes", "--output", "history/data.json" + timestamp, "--decrypt", "history/data.acs" + timestamp])
subprocess.call(["cp", "history/data.json" + timestamp, "data/data.json"])
return json.loads(readtextfile("data/data.json"))
else: else:
return json.loads(readtextfile("data/local.json")) return json.loads(readtextfile("data/local.json"))
@ -90,8 +97,8 @@ def initdatapath():
os.mkdir("data") os.mkdir("data")
if not os.path.exists("history"): if not os.path.exists("history"):
os.mkdir("history") os.mkdir("history")
if os.path.isfile("data/data.acs.bak"): if os.path.isfile("data/data.acs"):
os.remove("data/data.acs.bak") os.remove("data/data.acs")
abspath = os.path.abspath(__file__) abspath = os.path.abspath(__file__)
dname = os.path.dirname(abspath) dname = os.path.dirname(abspath)