Show pretty language names for help

Author: johntyree

executables/MainCLI.hs

@@ -12,15 +12,17 @@ import Traduisons.Client
 import Traduisons.API
 import Traduisons.Types
 
+
 main :: IO ()
 main = do
-  eitherAppState <- runExceptT createAppState
+  eitherAppState <- runExceptT $ do
+    emptyAppState <- createAppState
+    -- Get an auth token before we do anything else.
+    authAppState <- snd <$> runStateT renewToken emptyAppState
+    updateLanguageMap authAppState
   case eitherAppState of
     Left err -> putStrLn ("Failed to initialize: " ++ renderError err)
-    Right appState -> do
-      -- Immediately get an auth token. This lowers our initial response time.
-      void $ runExceptT (runStateT renewToken appState)
-      runInputT defaultSettings (loop appState)
+    Right appState -> runInputT defaultSettings (loop appState)
   where
     loop appState = do
       let promptString = renderAppState appState

executables/UI/QML.hs

@@ -39,8 +39,8 @@ defaultGUIAppState = GAS False (Right "")
 runGUI :: AppState -> IO ()
 runGUI initialAppState = do
     qmlPath <- getDataFileName "executables/UI/ui.qml"
-    asyncRenewToken initialAppState
     guiAppState <- newIORef (defaultGUIAppState [initialAppState])
+    asyncInitAppState guiAppState
     langPairSignal <- newSignalKey
     gasResultSignal <- newSignalKey
     gasIsLoadingSignal <- newSignalKey
@@ -71,8 +71,17 @@ runGUI initialAppState = do
   where
     fireSignals keys obj = mapM_ (`fireSignal` obj) keys
 
-asyncRenewToken :: AppState -> IO ()
-asyncRenewToken = void . forkIO . void . runExceptT  . runStateT renewToken
+asyncInitAppState :: IORef GUIAppState -> IO ()
+asyncInitAppState gsRef = void . forkIO $ do
+  gAS <- readIORef gsRef
+  let (old:olds) = gasAppStates gAS
+  new <- runExceptT $ do
+    authed <- snd <$> runStateT renewToken old
+    lift $ writeIORef gsRef gAS { gasAppStates = authed:olds }
+    updateLanguageMap authed
+  case new of
+    Left err -> writeIORef gsRef gAS { gasResult = Left err }
+    Right appState -> writeIORef gsRef gAS {gasAppStates = appState:olds}
 
 clipboardContentsProperty :: IORef GUIAppState -> IO T.Text
 clipboardContentsProperty guiAppState =  render <$> readIORef guiAppState