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

cli tool: renamed folders and historize sessions

This commit is contained in:
quenousimporte 2023-09-21 14:09:13 +02:00
parent 2c05a1b314
commit 89cedfa56a
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
cli/app.py
View File

@ -43,14 +43,14 @@ def editnote(note):
backupfilepath = "history/" + filename(note) + str(time.time()) backupfilepath = "history/" + filename(note) + str(time.time())
writetextfile(backupfilepath, content) writetextfile(backupfilepath, content)
writetextfile("data/" + filename(note), content) writetextfile("session/" + filename(note), content)
subprocess.call(settings["commands"]["editor"] + ["data/" + filename(note)]) subprocess.call(settings["commands"]["editor"] + ["session/" + filename(note)])
newcontent = readtextfile("data/" + filename(note) ) newcontent = readtextfile("session/" + filename(note) )
if newcontent != content: if newcontent != content:
subprocess.call(["cp", "data/" + filename(note), "history/" + filename(note) + str(time.time())]) subprocess.call(["cp", "session/" + filename(note), "history/" + filename(note) + str(time.time())])
subprocess.call(settings["commands"]["diff"] + [backupfilepath, "data/" + filename(note)]) subprocess.call(settings["commands"]["diff"] + [backupfilepath, "session/" + filename(note)])
note["content"] = newcontent note["content"] = newcontent
data.remove(note) data.remove(note)
data.insert(0, note) data.insert(0, note)
@ -61,44 +61,43 @@ def editnote(note):
def savedata(): def savedata():
if settings["mode"] == "remote": if settings["mode"] == "remote":
writetextfile("data/data.json", json.dumps(data)) writetextfile("session/data.json", json.dumps(data))
subprocess.call([settings["commands"]["gpg"], "-q", "--encrypt", "--yes", "--trust-model", "always", "--output", "data/data.acs", "--armor", "-r", settings["gpguser"], "data/data.json"]); subprocess.call([settings["commands"]["gpg"], "-q", "--encrypt", "--yes", "--trust-model", "always", "--output", "session/data.acs", "--armor", "-r", settings["gpguser"], "session/data.json"]);
newdata = readtextfile("data/data.acs") newdata = readtextfile("session/data.acs")
postdata = "action=push&password=" + settings["password"] + "&data=" + urllib.parse.quote_plus(newdata) postdata = "action=push&password=" + settings["password"] + "&data=" + urllib.parse.quote_plus(newdata)
writetextfile("data/postdata", postdata) writetextfile("session/postdata", postdata)
output = subprocess.check_output(["curl", "-X", "POST", "-d", "@data/postdata", settings["url"] + "/handler.php"]).decode("utf-8") output = subprocess.check_output(["curl", "-X", "POST", "-d", "@session/postdata", settings["url"] + "/handler.php"]).decode("utf-8")
print("curl output: " + output) print("curl output: " + output)
if output != '{"result": "ok"}': if output != '{"result": "ok"}':
if ask("Save failed. Try again?"): if ask("Save failed. Try again?"):
savedata() savedata()
else: else:
writetextfile("data/local.json", json.dumps(data)) writetextfile("session/local.json", json.dumps(data))
def loaddata(): def loaddata():
if settings["mode"] == "remote": if settings["mode"] == "remote":
timestamp = str(time.time()) timestamp = str(time.time())
subprocess.call(["curl", "-X", "POST", "-F", "action=fetch", "-F", "password=" + settings["password"], "-o", "history/data.acs" + timestamp, settings["url"] + "/handler.php"]) 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(["cp", "history/data.acs" + timestamp, "session/data.acs"])
subprocess.call([settings["commands"]["gpg"], "-q", "--yes", "--output", "history/data.json" + timestamp, "--decrypt", "history/data.acs" + timestamp]) 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"]) subprocess.call(["cp", "history/data.json" + timestamp, "session/data.json"])
return json.loads(readtextfile("data/data.json")) return json.loads(readtextfile("session/data.json"))
else: else:
return json.loads(readtextfile("data/local.json")) return json.loads(readtextfile("session/local.json"))
def ask(question): def ask(question):
answer = input(question + " [Y/n] ") answer = input(question + " [Y/n] ")
return answer == "y" or answer == "yes" or answer == "" return answer == "y" or answer == "yes" or answer == ""
def initdatapath(): def initdatapath():
if not os.path.exists("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"): if os.path.exists("session"):
os.remove("data/data.acs") os.rename("session", "history/session" + str(time.time()))
os.mkdir("session")
abspath = os.path.abspath(__file__) abspath = os.path.abspath(__file__)
dname = os.path.dirname(abspath) dname = os.path.dirname(abspath)
@ -157,7 +156,7 @@ while not (command == "quit" or command == "exit" or command == "q"):
subprocess.call(["curl", "-s", "-X", "POST", "-F", "action=sms", "-F", "password=" + settings["password"], "-F", "data=" + urllib.parse.quote_plus(note["content"]), settings["url"] + "/handler.php"]) subprocess.call(["curl", "-s", "-X", "POST", "-F", "action=sms", "-F", "password=" + settings["password"], "-F", "data=" + urllib.parse.quote_plus(note["content"]), settings["url"] + "/handler.php"])
elif action == "export": elif action == "export":
if note: if note:
writetextfile("data/" + note["title"] + ".md", note["content"]) writetextfile("session/" + note["title"] + ".md", note["content"])
elif action == "settings": elif action == "settings":
subprocess.call(settings["commands"]["editor"] + ["settings.json"]) subprocess.call(settings["commands"]["editor"] + ["settings.json"])
settings = json.loads(readtextfile("settings.json")) settings = json.loads(readtextfile("settings.json"))