Skip to content

Fix CTRL+C Interrupt #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danner26 merged 1 commit into from
Jan 21, 2025
Merged

Fix CTRL+C Interrupt #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions bullet/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@

# Reusable private utility class
class myInput:
def __init__(self,
word_color: str = colors.foreground["default"],
password: bool = False,
def __init__(self,
word_color: str = colors.foreground["default"],
password: bool = False,
hidden: str = '*'
):
''' Constructor for myInput
''' Constructor for myInput
Args:
word_color: color of input characters.
password: Whether input is password.
Expand Down Expand Up @@ -97,8 +97,8 @@ def input(self):
self.deleteChar()
elif i == ARROW_RIGHT_KEY:
self.moveCursor(self.pos + 1)
elif i == ARROW_LEFT_KEY:
self.moveCursor(self.pos - 1)
elif i == INTERRUPT_KEY:
raise KeyboardInterrupt
else:
if self.password:
if c != ' ':
Expand All @@ -109,10 +109,10 @@ def input(self):
@keyhandler.init
class Bullet:
def __init__(
self,
self,
prompt: str = "",
choices: list = [],
bullet: str = "●",
choices: list = [],
bullet: str = "●",
bullet_color: str = colors.foreground["default"],
word_color: str = colors.foreground["default"],
word_on_switch: str = colors.REVERSE,
Expand Down Expand Up @@ -153,12 +153,12 @@ def __init__(

self.max_width = len(max(self.choices, key = len)) + self.pad_right
self.return_index = return_index

def renderBullets(self):
for i in range(len(self.choices)):
self.printBullet(i)
utils.forceWrite('\n')

def printBullet(self, idx):
utils.forceWrite(' ' * (self.indent + self.align))
back_color = self.background_on_switch if idx == self.pos else self.background_color
Expand Down Expand Up @@ -230,10 +230,10 @@ def launch(self, default = None):
@keyhandler.init
class Check:
def __init__(
self,
self,
prompt: str = "",
choices: list = [],
check: str = "√",
choices: list = [],
check: str = "√",
check_color: str = colors.foreground["default"],
check_on_switch: str = colors.REVERSE,
word_color: str = colors.foreground["default"],
Expand Down Expand Up @@ -277,12 +277,12 @@ def __init__(

self.max_width = len(max(self.choices, key = len)) + self.pad_right
self.return_index = return_index

def renderRows(self):
for i in range(len(self.choices)):
self.printRow(i)
utils.forceWrite('\n')

def printRow(self, idx):
utils.forceWrite(' ' * (self.indent + self.align))
back_color = self.background_on_switch if idx == self.pos else self.background_color
Expand Down Expand Up @@ -408,10 +408,10 @@ def launch(self):

class Input:
def __init__(
self,
self,
prompt,
default = "",
indent = 0,
indent = 0,
word_color = colors.foreground["default"],
strip = False,
pattern = ""
Expand All @@ -424,7 +424,7 @@ def __init__(
self.word_color = word_color
self.strip = strip
self.pattern = pattern

def valid(self, ans):
if ans is None:
return False
Expand Down Expand Up @@ -461,10 +461,10 @@ def launch(self):

class Password:
def __init__(
self,
prompt,
indent = 0,
hidden = '*',
self,
prompt,
indent = 0,
hidden = '*',
word_color = colors.foreground["default"]
):
self.indent = indent
Expand All @@ -473,16 +473,16 @@ def __init__(
self.prompt = prompt
self.hidden = hidden
self.word_color = word_color

def launch(self):
utils.forceWrite(' ' * self.indent + self.prompt)
return myInput(password = True, hidden = self.hidden, word_color = self.word_color).input()

class Numbers:
def __init__(
self,
prompt,
indent = 0,
self,
prompt,
indent = 0,
word_color = colors.foreground["default"],
type = float
):
Expand All @@ -492,7 +492,7 @@ def __init__(
self.prompt = prompt
self.word_color = word_color
self.type = type

def valid(self, ans):
try:
self.type(ans)
Expand All @@ -503,7 +503,7 @@ def valid(self, ans):
utils.forceWrite(' ' * len(ans))
utils.forceWrite('\b' * len(ans))
return False

def launch(self, default = None):
if default is not None:
try:
Expand All @@ -523,9 +523,9 @@ def launch(self, default = None):

class VerticalPrompt:
def __init__(
self,
components,
spacing = 1,
self,
components,
spacing = 1,
separator = "",
separator_color = colors.foreground["default"]
):
Expand All @@ -542,7 +542,7 @@ def __init__(
def summarize(self):
for prompt, answer in self.result:
print(prompt, answer)

def launch(self):
for ui in self.components:
self.result.append((ui.prompt, ui.launch()))
Expand All @@ -555,9 +555,9 @@ def launch(self):
@keyhandler.init
class ScrollBar:
def __init__(
self,
self,
prompt: str = "",
choices: list = [],
choices: list = [],
pointer = "→",
up_indicator: str = "↑",
down_indicator: str = "↓",
Expand Down Expand Up @@ -613,7 +613,7 @@ def __init__(
# scrollbar moves down if pos > top + height - 1

self.return_index = return_index

def renderRows(self):
self.printRow(self.top, indicator = self.up_indicator if self.top != 0 else '')
utils.forceWrite('\n')
Expand All @@ -626,7 +626,7 @@ def renderRows(self):
if i < len(self.choices) - 1:
self.printRow(i + 1, indicator= self.down_indicator if self.top + self.height != len(self.choices) else '')
utils.forceWrite('\n')

def printRow(self, idx, indicator=''):
utils.forceWrite(' ' * (self.indent + self.align))
back_color = self.background_on_switch if idx == self.pos else self.background_color
Expand Down Expand Up @@ -711,7 +711,7 @@ def launch(self):

class SlidePrompt:
def __init__(
self,
self,
components
):
self.idx = 0
Expand Down