move local repo list out of control menu

Assistant/WebApp/Configurators/Local.hs

@@ -148,8 +148,6 @@ getNewRepositoryR = page "Add another repository" (Just Configuration) $ do
 			u <- liftIO $ initRepo True path Nothing
 			runAnnex () $ setStandardGroup u ClientGroup
 			liftIO $ addAutoStart path
-			otherrepos <- liftIO $ listOtherRepos
-			modifyWebAppState $ \s -> s { otherRepos = otherrepos }
 			redirect $ SwitchToRepositoryR path
 		_ -> $(widgetFile "configurators/newrepository")
 

Assistant/WebApp/OtherRepos.hs

@@ -11,15 +11,31 @@ module Assistant.WebApp.OtherRepos where
 
 import Assistant.Common
 import Assistant.WebApp.Types
+import Assistant.WebApp.Page
 import qualified Git.Construct
 import qualified Git.Config
 import Locations.UserConfig
 import qualified Utility.Url as Url
+import Utility.Yesod
 
 import Yesod
 import Control.Concurrent
 import System.Process (cwd)
 
+getRepositorySwitcherR :: Handler RepHtml
+getRepositorySwitcherR = page "Switch repository" Nothing $ do
+	repolist <- liftIO listOtherRepos
+	$(widgetFile "control/repositoryswitcher")
+
+listOtherRepos :: IO [(String, String)]
+listOtherRepos = do
+	f <- autoStartFile
+	pwd <- getCurrentDirectory
+	dirs <- filter (\d -> not $ d `dirContains` pwd) . nub
+		<$> ifM (doesFileExist f) ( lines <$> readFile f, return [])
+	names <- mapM relHome dirs
+	return $ sort $ zip names dirs
+
 {- Starts up the assistant in the repository, and waits for it to create
  - a gitAnnexUrlFile. Waits for the assistant to be up and listening for
  - connections by testing the url. Once it's running, redirect to it.

Assistant/WebApp/Types.hs

@@ -76,7 +76,6 @@ type Form x = Html -> MForm WebApp WebApp (FormResult x, Widget)
 
 data WebAppState = WebAppState
 	{ showIntro :: Bool -- should the into message be displayed?
-	, otherRepos :: [(String, String)] -- name and path to other repos
 	}
 
 data RepoSelector = RepoSelector

Assistant/WebApp/routes

@@ -15,6 +15,7 @@
 
 /config/repository/new/first FirstRepositoryR GET
 /config/repository/new NewRepositoryR GET
+/config/repository/switcher RepositorySwitcherR GET
 /config/repository/switchto/#FilePath SwitchToRepositoryR GET
 /config/repository/edit/#UUID EditRepositoryR GET
 /config/repository/edit/new/#UUID EditNewRepositoryR GET