diff options
| -rw-r--r-- | Annex/UUID.hs | 10 | ||||
| -rw-r--r-- | Command/AddUrl.hs | 1 | ||||
| -rw-r--r-- | Command/ImportFeed.hs | 1 | ||||
| -rw-r--r-- | Command/RmUrl.hs | 1 | ||||
| -rw-r--r-- | Logs/Web.hs | 5 | ||||
| -rw-r--r-- | Remote/BitTorrent.hs | 5 | ||||
| -rw-r--r-- | Remote/Web.hs | 1 |
7 files changed, 15 insertions, 9 deletions
diff --git a/Annex/UUID.hs b/Annex/UUID.hs index 5ed887689..ec642a0fe 100644 --- a/Annex/UUID.hs +++ b/Annex/UUID.hs @@ -23,6 +23,8 @@ module Annex.UUID ( storeUUID, storeUUIDIn, setUUID, + webUUID, + bitTorrentUUID, ) where import Common.Annex @@ -98,3 +100,11 @@ setUUID :: Git.Repo -> UUID -> IO Git.Repo setUUID r u = do let s = show configkey ++ "=" ++ fromUUID u Git.Config.store s r + +-- Dummy uuid for the whole web. Do not alter. +webUUID :: UUID +webUUID = UUID "00000000-0000-0000-0000-000000000001" + +-- Dummy uuid for bittorrent. Do not alter. +bitTorrentUUID :: UUID +bitTorrentUUID = UUID "00000000-0000-0000-0000-000000000002" diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs index 8688c8a57..1833cc2a7 100644 --- a/Command/AddUrl.hs +++ b/Command/AddUrl.hs @@ -22,6 +22,7 @@ import qualified Backend.URL import qualified Remote import qualified Types.Remote as Remote import Annex.Content +import Annex.UUID import Logs.Web import Types.Key import Types.KeySource diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs index d827d549f..c45fad961 100644 --- a/Command/ImportFeed.hs +++ b/Command/ImportFeed.hs @@ -30,6 +30,7 @@ import qualified Utility.Format import Utility.Tmp import Command.AddUrl (addUrlFile, downloadRemoteFile, relaxedOption) import Annex.Perms +import Annex.UUID import Backend.URL (fromUrl) #ifdef WITH_QUVI import Annex.Quvi diff --git a/Command/RmUrl.hs b/Command/RmUrl.hs index 570004266..514dcc689 100644 --- a/Command/RmUrl.hs +++ b/Command/RmUrl.hs @@ -10,6 +10,7 @@ module Command.RmUrl where import Common.Annex import Command import Logs.Web +import Annex.UUID import qualified Remote cmd :: [Command] diff --git a/Logs/Web.hs b/Logs/Web.hs index c3e5c3432..a728d152b 100644 --- a/Logs/Web.hs +++ b/Logs/Web.hs @@ -7,7 +7,6 @@ module Logs.Web ( URLString, - webUUID, getUrls, getUrlsWithPrefix, setUrlPresent, @@ -35,10 +34,6 @@ import qualified Git import qualified Git.LsFiles import Utility.Url --- Dummy uuid for the whole web. Do not alter. -webUUID :: UUID -webUUID = UUID "00000000-0000-0000-0000-000000000001" - {- Gets all urls that a key might be available from. -} getUrls :: Key -> Annex [URLString] getUrls key = do diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs index 1f616f658..1e90717f5 100644 --- a/Remote/BitTorrent.hs +++ b/Remote/BitTorrent.hs @@ -23,15 +23,12 @@ import Utility.Metered import Utility.Tmp import Backend.URL import Annex.Perms +import Annex.UUID import qualified Annex.Url as Url import qualified Data.Map as M import Network.URI --- Dummy uuid for bittorrent. Do not alter. -bitTorrentUUID :: UUID -bitTorrentUUID = UUID "00000000-0000-0000-0000-000000000002" - remote :: RemoteType remote = RemoteType { typename = "bittorrent", diff --git a/Remote/Web.hs b/Remote/Web.hs index 7d6cd2938..594f90b97 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -16,6 +16,7 @@ import qualified Git.Construct import Annex.Content import Config.Cost import Logs.Web +import Annex.UUID import Types.Key import Utility.Metered import qualified Annex.Url as Url |