summaryrefslogtreecommitdiff
path: root/Logs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-15 17:47:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-15 17:47:03 -0400
commitee9af605bc6c59365e6080e34d7c615978ba21d8 (patch)
tree2c69d7dd4d652f16a9b4f8acca822986664e0d78 /Logs
parentec169f84b1cc140b6d4c316fbd0e8407297d038a (diff)
break out non-log stuff to separate module
Diffstat (limited to 'Logs')
-rw-r--r--Logs/Location.hs1
-rw-r--r--Logs/Remote.hs1
-rw-r--r--Logs/Trust.hs2
-rw-r--r--Logs/UUID.hs54
-rw-r--r--Logs/Web.hs1
5 files changed, 0 insertions, 59 deletions
diff --git a/Logs/Location.hs b/Logs/Location.hs
index 4e8b2b535..8868912db 100644
--- a/Logs/Location.hs
+++ b/Logs/Location.hs
@@ -24,7 +24,6 @@ module Logs.Location (
import Common.Annex
import qualified Git
import qualified Annex.Branch
-import Logs.UUID
import Logs.Presence
{- Log a change in the presence of a key's value in a repository. -}
diff --git a/Logs/Remote.hs b/Logs/Remote.hs
index 47c2d7472..e2b04bf47 100644
--- a/Logs/Remote.hs
+++ b/Logs/Remote.hs
@@ -21,7 +21,6 @@ import Data.Char
import Common.Annex
import qualified Annex.Branch
import Types.Remote
-import Logs.UUID
import Logs.UUIDBased
{- Filename of remote.log. -}
diff --git a/Logs/Trust.hs b/Logs/Trust.hs
index 6966ffdd6..372d8b360 100644
--- a/Logs/Trust.hs
+++ b/Logs/Trust.hs
@@ -19,8 +19,6 @@ import Common.Annex
import Types.TrustLevel
import qualified Annex.Branch
import qualified Annex
-
-import Logs.UUID
import Logs.UUIDBased
{- Filename of trust.log. -}
diff --git a/Logs/UUID.hs b/Logs/UUID.hs
index baf665001..8a93b43fe 100644
--- a/Logs/UUID.hs
+++ b/Logs/UUID.hs
@@ -14,12 +14,6 @@
-}
module Logs.UUID (
- UUID,
- getUUID,
- getRepoUUID,
- getUncachedUUID,
- prepUUID,
- genUUID,
describeUUID,
uuidMap
) where
@@ -28,61 +22,13 @@ import qualified Data.Map as M
import Data.Time.Clock.POSIX
import Common.Annex
-import qualified Git
import qualified Annex.Branch
-import Types.UUID
-import qualified Build.SysConfig as SysConfig
-import Config
import Logs.UUIDBased
-configkey :: String
-configkey = "annex.uuid"
-
{- Filename of uuid.log. -}
logfile :: FilePath
logfile = "uuid.log"
-{- Generates a UUID. There is a library for this, but it's not packaged,
- - so use the command line tool. -}
-genUUID :: IO UUID
-genUUID = pOpen ReadFromPipe command params hGetLine
- where
- command = SysConfig.uuid
- params = if command == "uuid"
- -- request a random uuid be generated
- then ["-m"]
- -- uuidgen generates random uuid by default
- else []
-
-getUUID :: Annex UUID
-getUUID = getRepoUUID =<< gitRepo
-
-{- Looks up a repo's UUID. May return "" if none is known. -}
-getRepoUUID :: Git.Repo -> Annex UUID
-getRepoUUID r = do
- g <- gitRepo
-
- let c = cached g
- let u = getUncachedUUID r
-
- if c /= u && u /= ""
- then do
- updatecache g u
- return u
- else return c
- where
- cached g = Git.configGet g cachekey ""
- updatecache g u = when (g /= r) $ setConfig cachekey u
- cachekey = "remote." ++ fromMaybe "" (Git.repoRemoteName r) ++ ".annex-uuid"
-
-getUncachedUUID :: Git.Repo -> UUID
-getUncachedUUID r = Git.configGet r configkey ""
-
-{- Make sure that the repo has an annex.uuid setting. -}
-prepUUID :: Annex ()
-prepUUID = whenM (null <$> getUUID) $
- setConfig configkey =<< liftIO genUUID
-
{- Records a description for a uuid in the log. -}
describeUUID :: UUID -> String -> Annex ()
describeUUID uuid desc = do
diff --git a/Logs/Web.hs b/Logs/Web.hs
index 4c8ef7fc0..605797079 100644
--- a/Logs/Web.hs
+++ b/Logs/Web.hs
@@ -16,7 +16,6 @@ module Logs.Web (
import Common.Annex
import Logs.Presence
import Logs.Location
-import Logs.UUID
type URLString = String