sh-edraft.de/sh_cpl
3
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects 1 Releases 12 Wiki Activity

Merge pull request 'Fixed invalid output after console spinner #122' (#132) from #122 into 2022.12

Browse Source 
Reviewed-on: #132
Closes #122
This commit is contained in:
Sven Heidemann
2022-12-03 23:31:20 +01:00
parent 301768b842 e4aedb354b
commit 099a51ed93
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpl_core/console/console.py
View File

@@ -500,7 +500,7 @@ class Console:
return return
if cls._hold_back: if cls._hold_back:
cls._hold_back_calls.append(ConsoleCall(cls.write, args)) cls._hold_back_calls.append(ConsoleCall(cls.write, *args))
return return
string = ' '.join(map(str, args)) string = ' '.join(map(str, args))
@@ -523,7 +523,7 @@ class Console:
return return
if cls._hold_back: if cls._hold_back:
cls._hold_back_calls.append(ConsoleCall(cls.write_at, x, y, args)) cls._hold_back_calls.append(ConsoleCall(cls.write_at, x, y, *args))
return return
string = ' '.join(map(str, args)) string = ' '.join(map(str, args))
@@ -542,7 +542,7 @@ class Console:
return return
if cls._hold_back: if cls._hold_back:
cls._hold_back_calls.append(ConsoleCall(cls.write_line, args)) cls._hold_back_calls.append(ConsoleCall(cls.write_line, *args))
return return
string = ' '.join(map(str, args)) string = ' '.join(map(str, args))
@@ -567,7 +567,7 @@ class Console:
return return
if cls._hold_back: if cls._hold_back:
cls._hold_back_calls.append(ConsoleCall(cls.write_line_at, x, y, args)) cls._hold_back_calls.append(ConsoleCall(cls.write_line_at, x, y, *args))
return return
string = ' '.join(map(str, args)) string = ' '.join(map(str, args))

43
tests/custom/console/main.py
View File

@@ -3,7 +3,12 @@ from cpl_core.console import Console, ForegroundColorEnum
def test_spinner(): def test_spinner():
Console.write_line('test1')
Console.write_line('test2', 2)
Console.write_line('test3', 2, 3)
Console.write_line('test4', 2, 3, 4)
time.sleep(2) time.sleep(2)
Console.write_line('test5')
def test_console(): def test_console():
@@ -17,22 +22,22 @@ def test_console():
if __name__ == '__main__': if __name__ == '__main__':
Console.write_line('Hello World\n') Console.write_line('Hello World\n')
# Console.spinner('Test:', test_spinner, spinner_foreground_color=ForegroundColorEnum.cyan, text_foreground_color='green') Console.spinner('Test:', test_spinner, spinner_foreground_color=ForegroundColorEnum.cyan, text_foreground_color='green')
opts = [ # opts = [
'Option 1', # 'Option 1',
'Option 2', # 'Option 2',
'Option 3', # 'Option 3',
'Option 4' # 'Option 4'
] # ]
selected = Console.select( # selected = Console.select(
'>', # '>',
'Select item:', # 'Select item:',
opts, # opts,
header_foreground_color=ForegroundColorEnum.blue, # header_foreground_color=ForegroundColorEnum.blue,
option_foreground_color=ForegroundColorEnum.green, # option_foreground_color=ForegroundColorEnum.green,
cursor_foreground_color=ForegroundColorEnum.red # cursor_foreground_color=ForegroundColorEnum.red
) # )
Console.write_line(f'You selected: {selected}') # Console.write_line(f'You selected: {selected}')
# test_console() # # test_console()
#
Console.write_line() # Console.write_line()