webapp: Generate better git remote names.

Wrote a better git remote name sanitizer. Git blows up on lots of weird
stuff, especially if it starts the remote name, but I managed to get
some common punctuation working.

2 files changed, 6 insertions, 10 deletions

diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs
index 8f5d903e6..0cd3369be 100644
--- a/Assistant/MakeRemote.hs
+++ b/Assistant/MakeRemote.hs
@@ -19,10 +19,10 @@ import qualified Git.Command
 import qualified Command.InitRemote
 import Logs.UUID
 import Logs.Remote
+import Git.Remote
 
 import qualified Data.Text as T
 import qualified Data.Map as M
-import Data.Char
 
 {- Sets up and begins syncing with a new ssh or rsync remote. -}
 makeSshRemote :: Bool -> SshData -> Assistant Remote
@@ -112,6 +112,4 @@ uniqueRemoteName basename n r
 	name
 		| n == 0 = legalbasename
 		| otherwise = legalbasename ++ show n
-	legalbasename = filter legal basename
-	legal '_' = True
-	legal c = isAlphaNum c
+	legalbasename = makeLegalName basename
diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs
index 69e633ac8..0b957cce9 100644
--- a/Assistant/Ssh.hs
+++ b/Assistant/Ssh.hs
@@ -10,6 +10,7 @@ module Assistant.Ssh where
 import Common.Annex
 import Utility.TempFile
 import Utility.UserInfo
+import Git.Remote
 
 import Data.Text (Text)
 import qualified Data.Text as T
@@ -51,14 +52,11 @@ sshDir = do
 genSshHost :: Text -> Maybe Text -> String
 genSshHost host user = maybe "" (\v -> T.unpack v ++ "@") user ++ T.unpack host
 
-{- host_dir, with all / in dir replaced by _, and bad characters removed -}
+{- Generates a git remote name, like host_dir or host -}
 genSshRepoName :: String -> FilePath -> String
 genSshRepoName host dir
-	| null dir = filter legal host
-	| otherwise = filter legal $ host ++ "_" ++ replace "/" "_" dir
-  where
-	legal '_' = True
-	legal c = isAlphaNum c
+	| null dir = makeLegalName host
+	| otherwise = makeLegalName $ host ++ "_" ++ dir
 
 {- The output of ssh, including both stdout and stderr. -}
 sshTranscript :: [String] -> String -> IO (String, Bool)