split out daemonstatus types

Assistant/DaemonStatus.hs

@@ -10,8 +10,7 @@
 module Assistant.DaemonStatus where
 
 import Common.Annex
-import Assistant.Alert
-import Assistant.Pairing
+import Assistant.Types.DaemonStatus
 import Utility.TempFile
 import Utility.NotificationBroadcaster
 import Logs.Transfer
@@ -27,52 +26,6 @@ import Data.Time
 import System.Locale
 import qualified Data.Map as M
 
-data DaemonStatus = DaemonStatus
-	-- False when the daemon is performing its startup scan
-	{ scanComplete :: Bool
-	-- Time when a previous process of the daemon was running ok
-	, lastRunning :: Maybe POSIXTime
-	-- True when the sanity checker is running
-	, sanityCheckRunning :: Bool
-	-- Last time the sanity checker ran
-	, lastSanityCheck :: Maybe POSIXTime
-	-- Currently running file content transfers
-	, currentTransfers :: TransferMap
-	-- Messages to display to the user.
-	, alertMap :: AlertMap
-	, lastAlertId :: AlertId
-	-- Ordered list of remotes to sync with.
-	, syncRemotes :: [Remote]
-	-- Pairing request that is in progress.
-	, pairingInProgress :: Maybe PairingInProgress
-	-- Broadcasts notifications about all changes to the DaemonStatus
-	, changeNotifier :: NotificationBroadcaster
-	-- Broadcasts notifications when queued or current transfers change.
-	, transferNotifier :: NotificationBroadcaster
-	-- Broadcasts notifications when there's a change to the alerts
-	, alertNotifier :: NotificationBroadcaster
-	}
-
-type TransferMap = M.Map Transfer TransferInfo
-
-{- This TMVar is never left empty, so accessing it will never block. -}
-type DaemonStatusHandle = TMVar DaemonStatus
-
-newDaemonStatus :: IO DaemonStatus
-newDaemonStatus = DaemonStatus
-	<$> pure False
-	<*> pure Nothing
-	<*> pure False
-	<*> pure Nothing
-	<*> pure M.empty
-	<*> pure M.empty
-	<*> pure firstAlertId
-	<*> pure []
-	<*> pure Nothing
-	<*> newNotificationBroadcaster
-	<*> newNotificationBroadcaster
-	<*> newNotificationBroadcaster
-
 getDaemonStatus :: DaemonStatusHandle -> IO DaemonStatus
 getDaemonStatus = atomically . readTMVar