remove redundant _apply_choice_cb

app/__init__.py

@@ -1,7 +1,7 @@
 #
-# Copyright (c) Daniel Sheffield 2021
+# Copyright (c) Daniel Sheffield 2022
 #
 # All rights reserved
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
-COPYRIGHT = "Copyright (c) Daniel Sheffield 2021"
+COPYRIGHT = "Copyright (c) Daniel Sheffield 2021 - 2022"

app/activities/NewProduct.py

@@ -1,22 +1,25 @@
 #
-# Copyright (c) Daniel Sheffield 2022
+# Copyright (c) Daniel Sheffield 2022 - 2022
 #
 # All rights reserved
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
 from collections import OrderedDict
-from typing import Callable
 
 import urwid
-from app.db_utils import NON_IDENTIFIER_COLUMNS
+from app.activities import ActivityManager
+from app.db_utils import NON_IDENTIFIER_COLUMNS, QueryManager
 
 from ..widgets import AutoCompleteEdit, AutoCompletePopUp
 
 
 class NewProduct(urwid.Overlay):
 
-    def __init__(self, query_manager, under, name, data, autocomplete_cb, change_cb, apply_cb, esc_cb,
-        apply_choice_cb: Callable[[str, str], None]
+    def __init__(self,
+        activity_manager: ActivityManager,
+        query_manager: QueryManager,
+        under, name, data,
+        autocomplete_cb, change_cb, apply_cb, esc_cb,
     ):
         self.esc_cb = esc_cb
         self.under = under
@@ -41,14 +44,13 @@ class NewProduct(urwid.Overlay):
                     #urwid.Divider(),
                     urwid.AttrMap(title, 'banner'),
                     #urwid.Divider(),
-                    *[
-                        urwid.AttrMap(
-                            urwid.LineBox(urwid.AttrMap(
-                                AutoCompletePopUp(
-                                    v, apply_choice_cb
-                                ),'streak'), title=k.title(), title_align='left'), 'bg'
-                        ) for k,v in self.fields.items()
-                    ],
+                    *[urwid.AttrMap(urwid.LineBox(urwid.AttrMap(
+                        AutoCompletePopUp(
+                            v,
+                            self.apply_choice,
+                            lambda: activity_manager.show(self.update())
+                        ),'streak'), title=k.title(), title_align='left'), 'bg'
+                    ) for k,v in self.fields.items()],
                     urwid.Divider(),
                     urwid.AttrMap(ok, 'bg'),
                 ], focus_item=2),

app/activities/PriceCheck.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) Daniel Sheffield 2021
+# Copyright (c) Daniel Sheffield 2021 - 2022
 #
 # All rights reserved
 #
@@ -10,11 +10,12 @@ from typing import Callable, List, Union
 
 import numpy as np
 import urwid
+from app.db_utils import QueryManager
 
 from .. import COPYRIGHT
 from ..widgets import (AutoCompleteEdit, AutoCompleteFloatEdit,
                        AutoCompletePopUp, FocusWidget, NoTabCheckBox)
-from . import show_or_exit
+from . import ActivityManager, show_or_exit
 
 
 class PriceCheck(FocusWidget):
@@ -128,13 +129,14 @@ class PriceCheck(FocusWidget):
                     sort, product, unit, organic=organic) 
             )
 
-    def __init__(self, query_manager,
+    def __init__(self,
+        activity_manager: ActivityManager,
+        query_manager: QueryManager,
         fields: List[str],
         top_pane, left_pane, right_pane, bottom_pane, badge,
         autocomplete_cb: Callable[[
             Union[AutoCompleteEdit, AutoCompleteFloatEdit], str, dict
         ], None],
-        apply_choice_cb: Callable[[str, str], None]
     ):
         self.query_manager = query_manager
         self.top_pane = top_pane
@@ -200,9 +202,13 @@ class PriceCheck(FocusWidget):
         ])
         banner = urwid.AttrMap(banner, 'banner')
         fields = dict([
-            (k, urwid.LineBox(urwid.AttrMap(AutoCompletePopUp(
-                    self.edit_fields[k], apply_choice_cb
-                ), 'streak'), title=k.title(), title_align='left')) for k in self.edit_fields
+            (k, urwid.LineBox(urwid.AttrMap(
+                AutoCompletePopUp(
+                    self.edit_fields[k],
+                    self.apply_choice,
+                    lambda: activity_manager.show(self.update())
+                ), 'streak'), title=k.title(), title_align='left')
+            ) for k in self.edit_fields
         ])
         fields['organic'] = urwid.AttrMap(self.organic_checkbox, 'bg')
         fields.update({

app/activities/TransactionEditor.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) Daniel Sheffield 2021
+# Copyright (c) Daniel Sheffield 2021 - 2022
 #
 # All rights reserved
 #
@@ -8,6 +8,7 @@ from collections import OrderedDict
 from typing import Callable, List, Union
 
 import urwid
+from app.activities import ActivityManager
 from app.db_utils import QueryManager
 
 from .. import COPYRIGHT
@@ -88,6 +89,7 @@ class TransactionEditor(FocusWidget):
             path = self.container.get_focus_path()
 
     def __init__(self,
+        activity_manager: ActivityManager,
         query_manager: QueryManager,
         fields: List[str],
         layout, side_pane, bottom_pane,
@@ -95,7 +97,6 @@ class TransactionEditor(FocusWidget):
         autocomplete_cb: Callable[[
             Union[AutoCompleteEdit, AutoCompleteFloatEdit], str, dict
         ], None],
-        apply_choice_cb: Callable[[str, str], None]
     ):
         self.organic_checkbox = NoTabCheckBox(
             u"Organic",
@@ -136,15 +137,21 @@ class TransactionEditor(FocusWidget):
         ])
         banner = urwid.AttrMap(banner, 'banner')
         fields = dict([
-            (k, urwid.LineBox(urwid.AttrMap(AutoCompletePopUp(
-                    self.edit_fields[k], apply_choice_cb
-                ), 'streak'), title=k.title(), title_align='left')) for k in self.edit_fields if k != 'product'
+            (k, urwid.LineBox(
+                urwid.AttrMap(AutoCompletePopUp(
+                    self.edit_fields[k],
+                    self.apply_choice,
+                    lambda: activity_manager.show(self.update())
+                ), 'streak'), title=k.title(), title_align='left')
+            ) for k in self.edit_fields if k != 'product'
         ])
         fields.update({
             'product': urwid.LineBox(urwid.Columns([
-                        urwid.AttrMap(AutoCompletePopUp(
-                            self.edit_fields['product'], apply_choice_cb,
-                        ), 'streak'),
+                urwid.AttrMap(AutoCompletePopUp(
+                    self.edit_fields['product'],
+                    self.apply_choice,
+                    lambda: activity_manager.show(self.update())
+                ), 'streak'),
                 self.organic_checkbox
             ], dividechars=2), title='Product', title_align='left')
         })

app/db_utils.py

@@ -1,9 +1,10 @@
 #
-# Copyright (c) Daniel Sheffield 2021
+# Copyright (c) Daniel Sheffield 2021 - 2022
 #
 # All rights reserved
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
+from sqlite3 import Cursor
 import time
 from typing import Any, Callable
 from .txn_view import (
@@ -115,7 +116,7 @@ def get_insert_product_statement(product, category, group):
 
 class QueryManager(object):
     
-    def __init__(self, cursor, display: Callable[
+    def __init__(self, cursor: Cursor, display: Callable[
         [Any, str], str
     ]):
         self.display = display

app/widgets.py

@@ -1,11 +1,11 @@
 #
-# Copyright (c) Daniel Sheffield 2022
+# Copyright (c) Daniel Sheffield 2021 - 2022
 #
 # All rights reserved
 #
 # THIS SOFTWARE IS PROVIDED AS IS WITHOUT WARRANTY
 from decimal import Decimal
-from typing import Callable, Iterable, List, Union
+from typing import Any, Callable, Iterable, List, Union
 
 import urwid
 from additional_urwid_widgets import IndicativeListBox
@@ -231,11 +231,13 @@ class AutoCompletePopUp(PopUpLauncher):
     }
     def __init__(self,
         widget: Union[AutoCompleteEdit, AutoCompleteFloatEdit],
-        apply_choice_cb: Callable[[str, str], None]
+        apply_choice_cb: Callable[[str, str], None],
+        close_cb: Callable[[], Any]
     ):
         super().__init__(widget)
         self._pop_up_parameters = dict(**self._default_pop_up_parameters)
         self.apply_choice_cb = apply_choice_cb
+        self.close_cb = close_cb
         urwid.connect_signal(self._original_widget, 'open', lambda _, options: self._open_pop_up(options))
 
     def _open_pop_up(self, options):
@@ -259,13 +261,16 @@ class AutoCompletePopUp(PopUpLauncher):
         })
         self.open_pop_up()
     
+    def _close_pop_up(self):
+        self.close_pop_up()
+        self.close_cb()
+
     def create_pop_up(self):
         pop_up = SuggestionPopup(
             self._original_widget.name, self.options,
             self.apply_choice_cb,
         )
-        urwid.connect_signal(pop_up, 'close',
-            lambda _: self.close_pop_up())
+        urwid.connect_signal(pop_up, 'close', lambda _: self._close_pop_up())
         return pop_up
 
     def get_pop_up_parameters(self):

grocery_transactions.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 #
-# Copyright (c) Daniel Sheffield 2021
+# Copyright (c) Daniel Sheffield 2021 - 2022
 #
 # All rights reserved
 #
@@ -79,14 +79,6 @@ cols = [
     )
 ]
 
-def _apply_choice_callback(
-    activity_manager: ActivityManager,
-    base: str, name: str, value: str
-):
-    base = activity_manager.get(base)
-    base.apply_choice(name, value)
-    activity_manager.show(base.update())
-
 def _insert_new_product_callback(activity_manager, query_manager, product, category, group):
     activity_manager.app.log.write(
         '{};\n'.format(get_insert_product_statement(product, category, group)))
@@ -102,13 +94,13 @@ def _new_product_callback(
     txn : TransactionEditor = activity_manager.get('transaction')
     activity_manager.show(
         activity_manager.create(NewProduct, 'new_product',
-            query_manager, cur, name, txn.data,
+            activity_manager, query_manager,
+            cur, name, txn.data,
             lambda w, t, data: _autocomplete_callback(activity_manager, query_manager, w, t, data),
             txn.apply_changes,
             lambda product, category, group: _insert_new_product_callback(
                 activity_manager, query_manager, product, category, group),
             lambda: activity_manager.show(cur.update()),
-            lambda name, value: _apply_choice_callback(activity_manager, 'new_product', name, value)
         )
     )
 
@@ -206,10 +198,10 @@ activity_manager = ActivityManager()
 query_manager = QueryManager(cur, display_mapper)
 
 activity_manager.create(TransactionEditor, 'transaction',
-    query_manager, cols, grid_layout, side_pane, bottom_pane,
+    activity_manager, query_manager,
+    cols, grid_layout, side_pane, bottom_pane,
     lambda: _save_and_clear_callback(activity_manager),
     lambda widget, name, data: _autocomplete_callback(activity_manager, query_manager, widget, name, data),
-    lambda name, value: _apply_choice_callback(activity_manager, 'transaction', name, value),
 )
 
 app = None

price_check.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 #
-# Copyright (c) Daniel Sheffield 2021
+# Copyright (c) Daniel Sheffield 2021 - 2022
 #
 # All rights reserved
 #
@@ -86,14 +86,6 @@ inputs = filter(
     )
 )
 
-def _apply_choice_callback(
-    activity_manager: ActivityManager,
-    base: str, name: str, value: str
-):
-    base = activity_manager.get(base)
-    base.apply_choice(name, value)
-    activity_manager.show(base.update())
-
 def _autocomplete_callback(
     query_manager: QueryManager,
     widget: Union[AutoCompleteEdit, AutoCompleteFloatEdit],
@@ -118,9 +110,10 @@ activity_manager = ActivityManager()
 query_manager = QueryManager(cur, display_mapper)
 
 activity_manager.create(PriceCheck, 'price_check',
-    query_manager, inputs, top_pane, left_pane, right_pane, bottom_pane, badge,
+    activity_manager, query_manager,
+    inputs, top_pane, left_pane, right_pane, bottom_pane, badge,
     lambda widget, name, data: _autocomplete_callback(query_manager, widget, name, data),
-    lambda name, value: _apply_choice_callback(activity_manager, 'price_check', name, value))
+)
 
 app = GroceryPriceCheck(activity_manager)