public
/
pyceo
27
1
Fork 3
Code Issues 25 Pull Requests 5 Projects Releases 1 Wiki Activity

Rewrite TUI #52

Merged
merenber merged 7 commits from tui-urwid into master 2022-05-22 14:09:48 -04:00
Conversation 4 Commits 7 Files Changed 116 +7 -20
15 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 88aec3e4ed - Show all commits

3
ceo/tui/controllers/CreateDatabaseController.py
View File

@ -3,7 +3,6 @@ import os
from zope import component
from ...utils import http_get, http_post, write_db_creds
from .Controller import Controller
from .SyncRequestController import SyncRequestController
import ceo.krb_check as krb
from ceo.tui.views import CreateDatabaseConfirmationView, CreateDatabaseResponseView
@ -37,10 +36,8 @@ class CreateDatabaseController(SyncRequestController):
def write_db_creds_to_file(self):
password = self.model.resp_json['password']
db_type = self.model.db_type
db_type_name = 'MySQL' if db_type == 'mysql' else 'PostgreSQL'
cfg = component.getUtility(IConfig)
db_host = cfg.get(f'{db_type}_host')
username = krb.get_username()
homedir = self.model.user_dict['home_directory']
filename = os.path.join(homedir, f"ceo-{db_type}-info")
wrote_to_file = write_db_creds(

3
ceo/tui/controllers/ResetDatabasePasswordController.py
View File

@ -3,7 +3,6 @@ import os
from zope import component
from ...utils import http_get, http_post, write_db_creds
from .Controller import Controller
from .SyncRequestController import SyncRequestController
import ceo.krb_check as krb
from ceo.tui.views import ResetDatabasePasswordConfirmationView, ResetDatabasePasswordResponseView
@ -37,10 +36,8 @@ class ResetDatabasePasswordController(SyncRequestController):
def write_db_creds_to_file(self):
password = self.model.resp_json['password']
db_type = self.model.db_type
db_type_name = 'MySQL' if db_type == 'mysql' else 'PostgreSQL'
cfg = component.getUtility(IConfig)
db_host = cfg.get(f'{db_type}_host')
username = self.model.user_dict['uid']
homedir = self.model.user_dict['home_directory']
filename = os.path.join(homedir, f"ceo-{db_type}-info")
wrote_to_file = write_db_creds(

2
ceo/tui/controllers/TransactionController.py
View File

@ -1,8 +1,6 @@
from threading import Thread
from typing import Dict, List
import urwid
from ...StreamResponseHandler import StreamResponseHandler
from ...utils import http_request, generic_handle_stream_response
from .Controller import Controller

1
ceo/tui/views/AddUserView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class AddUserView(ColumnView):

1
ceo/tui/views/CreateDatabaseView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class CreateDatabaseView(ColumnView):

1
ceo/tui/views/GetPositionsView.py
View File

@ -3,7 +3,6 @@ import urwid
from .ColumnView import ColumnView
from .position_names import position_names
from .utils import wrap_in_frame
from ceo_common.interfaces import IConfig

1
ceo/tui/views/GetUserView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class GetUserView(ColumnView):

1
ceo/tui/views/RemoveMemberFromGroupView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class RemoveMemberFromGroupView(ColumnView):

1
ceo/tui/views/RenewUserView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class RenewUserView(ColumnView):

1
ceo/tui/views/ResetDatabasePasswordView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class ResetDatabasePasswordView(ColumnView):

1
ceo/tui/views/ResetPasswordView.py
View File

@ -1,7 +1,6 @@
import urwid
from .ColumnView import ColumnView
from .utils import wrap_in_frame
class ResetPasswordView(ColumnView):

1
ceo/tui/views/SetPositionsView.py
View File

@ -4,7 +4,6 @@ import urwid
from .ColumnView import ColumnView
from .position_names import position_names
from .utils import wrap_in_frame
from ceo_common.interfaces import IConfig

2
ceo/tui/views/View.py
View File

@ -20,7 +20,7 @@ class View(ABC):
def popup(self, message):
button = CenterButton('OK')
body = urwid.Text(message + '\n'*2, align='center')
body = urwid.Text(message + '\n\n', align='center')
body = urwid.Pile([
body,
urwid.Columns([

2
ceo/tui/views/WelcomeView.py
View File

@ -1,9 +1,9 @@
import urwid
import ceo.tui.utils as utils
from .ColumnView import ColumnView
from .utils import decorate_button
class WelcomeView(ColumnView):
def __init__(self, model, controller, app):
super().__init__(model, controller, app)

6
setup.cfg
View File

@ -1,5 +1,9 @@
[flake8]
ignore =
# line too long
E501
E501,
# unable to detect undefined names
F403,
# name may be undefined or or defined from star imports
F405
exclude = .git,.vscode,venv,__pycache__,__init__.py,build,dist,one_time_scripts