Call init_utils only once.

Author: jimdeekepler

scrolltext/cli.py

@@ -26,7 +26,7 @@ def main():
     try:
         cfg = init_utils(write_config)
         action = action or _str_to_action_type(cfg["main"]["action"])
-        action(write_config)
+        action(cfg)
     except KeyError as e:
         print("KeyError occured: " + str(e) +
               "\nProbalby check config?")

scrolltext/cursestext.py

@@ -4,7 +4,7 @@
 from curses import wrapper, error
 import curses
 import logging
-from .utils import CharacterScroller, IS_WINDOWS, init_utils
+from .utils import CharacterScroller, IS_WINDOWS
 
 
 QUIT_CHARACTERS = ["\x1B", "Q", "q"]
@@ -13,19 +13,18 @@
 log = logging.getLogger(__name__)
 
 
-def curses_scroller(win, write_config):
+def curses_scroller(win, cfg):
     """
     Curses-main: render a text in a side-scrolling manner, using curses.
 
     :param win: Internal curses based object
     :type win: curses._window
-    :param write_config: Write initial config
-    :type: bool
+    :param cfg: Config object
+    :type: configerparser.ConfigParser
     """
     winsize = win.getmaxyx()
     log.debug("win dimensions: (columns, rows) (%d, %d)", winsize[1], winsize[0])
 
-    cfg = init_utils(write_config)
     box = cfg["cursestext"].getboolean("box")
     # try:
     if box:
@@ -86,11 +85,11 @@ def check_quit(win):
     return False
 
 
-def work(write_config):
+def work(cfg):
     """Main usese curses.wrapper. See curses doc for details.
     """
     try:  # noqa: C901 ignoring 'TryExcept 42' is too complex - fix later
-        wrapper(curses_scroller, write_config)
+        wrapper(curses_scroller, cfg)
     except error as ex:
         log.exception(ex)
     finally:

scrolltext/linescroller.py

@@ -3,7 +3,7 @@
 """
 import shutil
 from time import sleep
-from .utils import CLEAR, HOME, IS_WINDOWS, UP_ONE_ROW, CharacterScroller, init_utils
+from .utils import CLEAR, HOME, IS_WINDOWS, UP_ONE_ROW, CharacterScroller
 
 if not IS_WINDOWS:
     from scrolltext.getchtimeout import GetchWithTimeout
@@ -12,29 +12,28 @@
 VISIBILE_TEXT_LENGTH = shutil.get_terminal_size()[0]
 
 
-def linescroller(write_config):
+def linescroller(cfg):
     """
     Main entry point for linescroller.
-    :param write_config: Write initial config
-    :type: bool
+    :param cfg: Config object
+    :type: configparser.ConfigParser
     """
     getch = None
     if not IS_WINDOWS:
         getch = GetchWithTimeout()
     try:
-        _linescroller(getch, write_config)
+        _linescroller(getch, cfg)
     except RuntimeError:
         pass
     finally:
         if not IS_WINDOWS:
             getch.cleanup()
 
 
-def _linescroller(getch, write_config):
+def _linescroller(getch, cfg):
     """
     Prints a text in a side-scrolling manner.
     """
-    cfg = init_utils(write_config)
     argv = {}
     argv["term_rows"] = shutil.get_terminal_size()[1]
     argv["term_columns"] = shutil.get_terminal_size()[0] - (1 if IS_WINDOWS else 0)