mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

add a UUIDDesc type containing a ByteString

Browse source 
Groundwork for handling uuid.log using ByteString
This commit is contained in:
Joey Hess 2019-01-01 15:39:45 -04:00
parent b781fbcccf
commit 894716512d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
21 changed files with 94 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/Init.hs
View file

@ -45,6 +45,7 @@ import Annex.InodeSentinal
import Upgrade
import Annex.Perms
import Utility.UserInfo
import Utility.FileSystemEncoding
#ifndef mingw32_HOST_OS
import Utility.FileMode
import System.Posix.User
@ -68,14 +69,14 @@ checkCanInitialize (AutoInit False) a = fromRepo Git.repoWorkTree >>= \case
giveup "Not initialized."
)
genDescription :: Maybe String -> Annex String
genDescription (Just d) = return d
genDescription :: Maybe String -> Annex UUIDDesc
genDescription (Just d) = return $ UUIDDesc $ encodeBS d
genDescription Nothing = do
reldir <- liftIO . relHome =<< liftIO . absPath =<< fromRepo Git.repoPath
hostname <- fromMaybe "" <$> liftIO getHostname
let at = if null hostname then "" else "@"
v <- liftIO myUserName
return $ concat $ case v of
return $ UUIDDesc $ encodeBS $ concat $ case v of
Right username -> [username, at, hostname, ":", reldir]
Left _ -> [hostname, ":", reldir]