summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-13 16:16:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-13 16:30:34 -0400
commit571cd1c57aeb4e8071b30caf529a0845e8ddc7cf (patch)
treee895c99334d675cec3f7996cb6c298fb7751b33b /Assistant
parent89cc1d2a38a1abaaecdfb7766739f3c2b5dbf963 (diff)
split cost out into its own module
Added a function to insert a new cost into a list, which could be used to asjust costs after a drag and drop.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/MakeRemote.hs3
-rw-r--r--Assistant/Pairing/MakeRemote.hs1
-rw-r--r--Assistant/Types/ScanRemotes.hs2
3 files changed, 4 insertions, 2 deletions
diff --git a/Assistant/MakeRemote.hs b/Assistant/MakeRemote.hs
index 8d4e3a1ba..448f7ad97 100644
--- a/Assistant/MakeRemote.hs
+++ b/Assistant/MakeRemote.hs
@@ -21,12 +21,13 @@ import Logs.UUID
import Logs.Remote
import Git.Remote
import Config
+import Config.Cost
import qualified Data.Text as T
import qualified Data.Map as M
{- Sets up and begins syncing with a new ssh or rsync remote. -}
-makeSshRemote :: Bool -> SshData -> Maybe Int -> Assistant Remote
+makeSshRemote :: Bool -> SshData -> Maybe Cost -> Assistant Remote
makeSshRemote forcersync sshdata mcost = do
r <- liftAnnex $
addRemote $ maker (sshRepoName sshdata) sshurl
diff --git a/Assistant/Pairing/MakeRemote.hs b/Assistant/Pairing/MakeRemote.hs
index e4aab434d..ff5688bd3 100644
--- a/Assistant/Pairing/MakeRemote.hs
+++ b/Assistant/Pairing/MakeRemote.hs
@@ -13,6 +13,7 @@ import Assistant.Pairing
import Assistant.Pairing.Network
import Assistant.MakeRemote
import Config
+import Config.Cost
import Network.Socket
import qualified Data.Text as T
diff --git a/Assistant/Types/ScanRemotes.hs b/Assistant/Types/ScanRemotes.hs
index d2f0c588f..8219f9baf 100644
--- a/Assistant/Types/ScanRemotes.hs
+++ b/Assistant/Types/ScanRemotes.hs
@@ -13,7 +13,7 @@ import Control.Concurrent.STM
import qualified Data.Map as M
data ScanInfo = ScanInfo
- { scanPriority :: Int
+ { scanPriority :: Float
, fullScan :: Bool
}