diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/Main.hs | 5 | ||||
| -rw-r--r-- | main/Test.hs | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/main/Main.hs b/main/Main.hs index 6a6c565..04ae057 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -403,7 +403,7 @@ interactiveLoop st opts = withTerminal commandCompletion $ \term -> do peerIdentity peer >>= \case pid@(PeerIdentityFull _) -> do dropped <- isPeerDropped peer - let shown = showPeer pid $ peerAddress peer + shown <- showPeer pid <$> getPeerAddress peer let update [] = ([(peer, shown)], (Nothing, "NEW")) update ((p,s):ps) | p == peer && dropped = (ps, (Nothing, "DEL")) @@ -880,9 +880,10 @@ cmdDetails :: Command cmdDetails = do getSelectedOrManualContext >>= \case SelectedPeer peer -> do + paddr <- getPeerAddress peer cmdPutStrLn $ unlines [ "Network peer:" - , " " <> show (peerAddress peer) + , " " <> show paddr ] peerIdentity peer >>= \case PeerIdentityUnknown _ -> do diff --git a/main/Test.hs b/main/Test.hs index 093d3ac..1167bee 100644 --- a/main/Test.hs +++ b/main/Test.hs @@ -557,9 +557,12 @@ cmdStartServer = do peer <- getNextPeerChange rsServer let printPeer TestPeer {..} = do - params <- peerIdentity tpPeer >>= return . \case - PeerIdentityFull pid -> ("id":) $ map (maybe "<unnamed>" T.unpack . idName) (unfoldOwners pid) - _ -> [ "addr", show (peerAddress tpPeer) ] + params <- peerIdentity tpPeer >>= \case + PeerIdentityFull pid -> do + return $ ("id":) $ map (maybe "<unnamed>" T.unpack . idName) (unfoldOwners pid) + _ -> do + paddr <- getPeerAddress tpPeer + return $ [ "addr", show paddr ] outLine out $ unwords $ [ "peer", show tpIndex ] ++ params update ( tpIndex, [] ) = do @@ -611,9 +614,10 @@ cmdPeerList = do forM_ peers $ \peer -> do Just tp <- return $ find ((peer ==) . tpPeer) . snd $ tpeers mbpid <- peerIdentity peer + paddr <- getPeerAddress peer cmdOut $ unwords $ concat [ [ "peer-list-item", show (tpIndex tp) ] - , [ "addr", show (peerAddress peer) ] + , [ "addr", show paddr ] , case mbpid of PeerIdentityFull pid -> ("id":) $ map (maybe "<unnamed>" T.unpack . idName) (unfoldOwners pid) _ -> [] ] |