From 7ea8452e61c6d897b901cdcee829dad4fd9c9b1b Mon Sep 17 00:00:00 2001 From: Daniel Sun Date: Mon, 9 Jan 2023 19:33:17 +0000 Subject: [PATCH] fix ci --- ceo/cli/groups.py | 3 ++- ceo/tui/controllers/SearchGroupController.py | 3 +-- ceo/tui/views/SearchGroupResponseView.py | 9 +++----- ceo/tui/views/SearchGroupView.py | 1 + ceod/api/groups.py | 24 +++++++++++++------- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/ceo/cli/groups.py b/ceo/cli/groups.py index 4ee6c45..5866f40 100644 --- a/ceo/cli/groups.py +++ b/ceo/cli/groups.py @@ -159,4 +159,5 @@ def search(query, count): resp = http_get(f'/api/groups/search/{query}/{count}') result = handle_sync_response(resp) for cn in result: - if cn != "": click.echo(cn) + if cn != "": + click.echo(cn) diff --git a/ceo/tui/controllers/SearchGroupController.py b/ceo/tui/controllers/SearchGroupController.py index dc97d33..e6fe35a 100644 --- a/ceo/tui/controllers/SearchGroupController.py +++ b/ceo/tui/controllers/SearchGroupController.py @@ -4,7 +4,6 @@ from .SyncRequestController import SyncRequestController from ceo.tui.views import SearchGroupResponseView - class SearchGroupController(SyncRequestController): def __init__(self, model, app): super().__init__(model, app) @@ -18,7 +17,7 @@ class SearchGroupController(SyncRequestController): def on_next_button_pressed(self, button): try: self.model.query = self.get_username_from_view() - #self.model.count = 10 + self.model.count = 10 except Controller.InvalidInput: return self.on_confirmation_button_pressed(button) diff --git a/ceo/tui/views/SearchGroupResponseView.py b/ceo/tui/views/SearchGroupResponseView.py index 0b39f5c..7403474 100644 --- a/ceo/tui/views/SearchGroupResponseView.py +++ b/ceo/tui/views/SearchGroupResponseView.py @@ -1,12 +1,9 @@ -import urwid - from .ColumnResponseView import ColumnResponseView - class SearchGroupResponseView(ColumnResponseView): def __init__(self, model, controller, app): - super().__init__(model, controller,app) - l = self.model.resp_json.copy() - rows = [(str(i), resp) for i, resp in enumerate(l) if resp != ''] + super().__init__(model, controller, app) + matches = self.model.resp_json.copy() + rows = [(str(i), resp) for i, resp in enumerate(matches) if resp != ''] self.set_pairs(rows) diff --git a/ceo/tui/views/SearchGroupView.py b/ceo/tui/views/SearchGroupView.py index 03b6384..c20bb99 100644 --- a/ceo/tui/views/SearchGroupView.py +++ b/ceo/tui/views/SearchGroupView.py @@ -2,6 +2,7 @@ import urwid from .ColumnView import ColumnView + class SearchGroupView(ColumnView): def __init__(self, model, controller, app): super().__init__(model, controller, app) diff --git a/ceod/api/groups.py b/ceod/api/groups.py index 30730f2..3a7ccd6 100644 --- a/ceod/api/groups.py +++ b/ceod/api/groups.py @@ -39,8 +39,10 @@ def get_group(group_name): def search_group(query, count): # compute levenshtein edit distance, adapted from rosetta code def _fuzzy_match(s1, s2): - if len(s1) == 0: return len(s2) - if len(s2) == 0: return len(s1) + if len(s1) == 0: + return len(s2) + if len(s2) == 0: + return len(s1) edits = [i for i in range(len(s2) + 1)] for i in range(len(s1)): corner = i @@ -60,12 +62,18 @@ def search_group(query, count): self.string = string self.score = score # consider a score worse if the edit distance is larger - def __lt__(self, other): return self.score > other.score - def __gt__(self, other): return self.score < other.score - def __le__(self, other): return self.score >= other.score - def __ge__(self, other): return self.score <= other.score - def __eq__(self, other): return self.score == other.score - def __ne__(self, other): return self.score != other.score + def __lt__(self, other): + return self.score > other.score + def __gt__(self, other): + return self.score < other.score + def __le__(self, other): + return self.score >= other.score + def __ge__(self, other): + return self.score <= other.score + def __eq__(self, other): + return self.score == other.score + def __ne__(self, other): + return self.score != other.score query = str(query) count = int(count)