xfnw/nboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

reformat with black

Browse source
This commit is contained in:
xfnw 2022-01-26 21:29:17 -05:00
parent 0e0fe9204f
commit 2570562a8d
3 changed files with 91 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clean.py
View file

@ -2,15 +2,14 @@
import json import json
with open('nboard.json', 'r') as file: with open("nboard.json", "r") as file:
data = json.load(file) data = json.load(file)
print(len(data)) print(len(data))
data = {k:v for k, v in data.items() if v is not " "} data = {k: v for k, v in data.items() if v is not " "}
print(len(data)) print(len(data))
with open('nboard.json', 'w') as file: with open("nboard.json", "w") as file:
json.dump(data, file) json.dump(data, file)

9
getkey.py
View file

@ -1,20 +1,17 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import curses import curses
def main(stdscr): def main(stdscr):
while True: while True:
k = stdscr.getkey() k = stdscr.getkey()
if k == '\x1b': if k == "\x1b":
k="" k = ""
for i in range(5): for i in range(5):
k += stdscr.getkey() k += stdscr.getkey()
print(repr(k)) print(repr(k))
curses.wrapper(main) curses.wrapper(main)

136
nboard
View file

@ -1,120 +1,125 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import curses,time,json,sys,os,subprocess import curses, time, json, sys, os, subprocess
dataPath = os.path.expanduser('~')+'/.nboard/nboard.json' dataPath = os.path.expanduser("~") + "/.nboard/nboard.json"
allowedChars = " `~1234567890-=!@#$%^&*()_+qwertyuiop[]\\QWERTYUIOP{}|asdfghjkl;'ASDFGHJKL:\"zxcvbnm,./ZXCVBNM<>?" allowedChars = " `~1234567890-=!@#$%^&*()_+qwertyuiop[]\\QWERTYUIOP{}|asdfghjkl;'ASDFGHJKL:\"zxcvbnm,./ZXCVBNM<>?"
data = {} data = {}
def main(stdscr): def main(stdscr):
curses.halfdelay(5) curses.halfdelay(5)
curses.use_default_colors() curses.use_default_colors()
stdscr.erase() stdscr.erase()
stdscr.refresh() stdscr.refresh()
k='NOU' k = "NOU"
height, width = stdscr.getmaxyx() height, width = stdscr.getmaxyx()
vx = vy = tx = ty = nl = 0 vx = vy = tx = ty = nl = 0
cx = width // 2 cx = width // 2
cy = height // 2 cy = height // 2
stdscr.move(cy,cx) stdscr.move(cy, cx)
while True: while True:
try: try:
cx = width // 2 cx = width // 2
cy = height // 2 cy = height // 2
#stdscr.clear() # stdscr.clear()
height, width = stdscr.getmaxyx() height, width = stdscr.getmaxyx()
if k == '\x0c': if k == "\x0c":
stdscr.clear() stdscr.clear()
# detect where to move cursor # detect where to move cursor
if k == 'KEY_UP': if k == "KEY_UP":
vy += -1 vy += -1
nl = vx nl = vx
if k == 'KEY_DOWN': if k == "KEY_DOWN":
vy += 1 vy += 1
nl = vx nl = vx
if k == 'KEY_LEFT': if k == "KEY_LEFT":
vx += -1 vx += -1
nl = vx nl = vx
if k == 'KEY_RIGHT': if k == "KEY_RIGHT":
vx += 1 vx += 1
nl = vx nl = vx
if k == '[1;5A' or k == 'kUP5': if k == "[1;5A" or k == "kUP5":
vy += 0-(height//2) vy += 0 - (height // 2)
nl = vx nl = vx
if k == '[1;5B' or k == 'kDN5': if k == "[1;5B" or k == "kDN5":
vy += height//2 vy += height // 2
nl = vx nl = vx
if k == '[1;5D' or k == 'kLFT5': if k == "[1;5D" or k == "kLFT5":
vx += 0-(width//2) vx += 0 - (width // 2)
nl = vx nl = vx
if k == '[1;5C' or k == 'kRIT5': if k == "[1;5C" or k == "kRIT5":
vx += width//2 vx += width // 2
nl = vx nl = vx
if k == '\n': if k == "\n":
vx = nl vx = nl
vy += 1 vy += 1
if k == 'KEY_BACKSPACE' or k == '\x7f': if k == "KEY_BACKSPACE" or k == "\x7f":
vx += -1 vx += -1
# make sure the cursor is on the screen # make sure the cursor is on the screen
# this is not nessesary for the view as it is infinite # this is not nessesary for the view as it is infinite
cx = max(0, cx) cx = max(0, cx)
cx = min(width-1, cx) cx = min(width - 1, cx)
cy = max(0, cy) cy = max(0, cy)
cy = min(height-2, cy) cy = min(height - 2, cy)
# calculate true position # calculate true position
tx = cx + (vx) - width // 2 tx = cx + (vx) - width // 2
ty = cy + (vy) - (height-1) // 2 ty = cy + (vy) - (height - 1) // 2
# get json data # get json data
with open(dataPath, 'r') as openfile: with open(dataPath, "r") as openfile:
data = json.load(openfile) data = json.load(openfile)
# if valid key pressed, write it # if valid key pressed, write it
if k in allowedChars: if k in allowedChars:
data[str((ty,tx))] = k data[str((ty, tx))] = k
if k == ' ': if k == " ":
data.pop(str((ty,tx))) data.pop(str((ty, tx)))
vx = vx+1 vx = vx + 1
time.sleep(0) time.sleep(0)
with open(dataPath, 'w') as outfile: with open(dataPath, "w") as outfile:
json.dump(data, outfile, indent=1) json.dump(data, outfile, indent=1)
tx = cx + (vx) - width // 2 tx = cx + (vx) - width // 2
# draw the screen # draw the screen
stdscr.move(0, 0) stdscr.move(0, 0)
for y in range(height-1): for y in range(height - 1):
for x in range(width): for x in range(width):
stdscr.move(y,x) stdscr.move(y, x)
stdscr.addstr(data.get(str((ty - cy + y,tx - cx + x)), ' ')) stdscr.addstr(data.get(str((ty - cy + y, tx - cx + x)), " "))
# display some info # display some info
stdscr.addstr(height-1, 0, 'x: {}, y: {}, arrow keys to move, ctrl to go faster '.format(tx, 1-ty)[:width-1]) stdscr.addstr(
height - 1,
0,
"x: {}, y: {}, arrow keys to move, ctrl to go faster ".format(
tx, 1 - ty
)[: width - 1],
)
# move the cursor where its actually supposed to be # move the cursor where its actually supposed to be
stdscr.move(cy,cx) stdscr.move(cy, cx)
# print(str(k)) # debug keycodes
#print(str(k)) # debug keycodes
try: try:
k = stdscr.getkey() k = stdscr.getkey()
except curses.error: except curses.error:
k = 'NOU' k = "NOU"
time.sleep(0) time.sleep(0)
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
time.sleep(0.1) time.sleep(0.1)
@ -124,13 +129,18 @@ if __name__ == "__main__":
try: try:
dExists = os.path.isfile(dataPath) dExists = os.path.isfile(dataPath)
if not dExists: if not dExists:
with open(dataPath, 'w') as f: with open(dataPath, "w") as f:
f.write('{}') f.write("{}")
dExists = True dExists = True
except: except:
dExists = False dExists = False
if not dExists or len(sys.argv) > 1 and (sys.argv[1] == '--help' or sys.argv[1] == 'help'): if (
print(""" not dExists
or len(sys.argv) > 1
and (sys.argv[1] == "--help" or sys.argv[1] == "help")
):
print(
"""
nboard is like yourworldoftext.com, except its in a terminal. nboard is like yourworldoftext.com, except its in a terminal.
how to get started: how to get started:
@ -152,15 +162,39 @@ hold ctrl while pressing the arrow keys to go faster
bugs and stuff: bugs and stuff:
please report any bugs to ~xfnw on IRC, anywhere you can find him, or please report any bugs to ~xfnw on IRC, anywhere you can find him, or
on the tildegit page, https://tildegit.org/xfnw/nboard on the tildegit page, https://tildegit.org/xfnw/nboard
""") """
elif len(sys.argv) > 1 and sys.argv[1] == 'pull': )
branches=subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard/.git','for-each-ref','refs/remotes','--format','%(refname)'], capture_output=True).stdout.decode().splitlines() elif len(sys.argv) > 1 and sys.argv[1] == "pull":
subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard/.git','fetch','--all']) branches = (
subprocess.run(['git','--git-dir='+os.path.expanduser('~')+'/.nboard/.git','merge']+branches) subprocess.run(
[
"git",
"--git-dir=" + os.path.expanduser("~") + "/.nboard/.git",
"for-each-ref",
"refs/remotes",
"--format",
"%(refname)",
],
capture_output=True,
)
.stdout.decode()
.splitlines()
)
subprocess.run(
[
"git",
"--git-dir=" + os.path.expanduser("~") + "/.nboard/.git",
"fetch",
"--all",
]
)
subprocess.run(
["git", "--git-dir=" + os.path.expanduser("~") + "/.nboard/.git", "merge"]
+ branches
)
print("pulled all remotes!") print("pulled all remotes!")
else: else:
try: try:
curses.wrapper(main) curses.wrapper(main)
except KeyboardInterrupt: except KeyboardInterrupt:
print('bye!') print("bye!")