diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-11-10 12:18:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-11-10 12:18:00 -0400 |
| commit | 275dbbc0086fd895ae8593f9d37798b57cf51d0f (patch) | |
| tree | 02721777ae92591531908f54bb0c02e7050b2681 /Assistant/XMPP.hs | |
| parent | b5b2eb90a83cb2720b21701a523b8a8dcc992215 (diff) | |
separate data type for push stages
This improves type safety.
Diffstat (limited to 'Assistant/XMPP.hs')
| -rw-r--r-- | Assistant/XMPP.hs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Assistant/XMPP.hs b/Assistant/XMPP.hs index 5532b8027..850a37d4f 100644 --- a/Assistant/XMPP.hs +++ b/Assistant/XMPP.hs @@ -137,7 +137,7 @@ canPush :: JID -> JID -> Message canPush = gitAnnexMessage $ gitAnnexTag canPushAttr T.empty decodeCanPush :: Message -> GitAnnexTagInfo -> Maybe NetMessage -decodeCanPush m _ = CanPush <$> (formatJID <$> messageFrom m) +decodeCanPush m _ = Pushing <$> (formatJID <$> messageFrom m) <*> pure CanPush canPushAttr :: Name canPushAttr = "canpush" @@ -146,7 +146,7 @@ pushRequest :: JID -> JID -> Message pushRequest = gitAnnexMessage $ gitAnnexTag pushRequestAttr T.empty decodePushRequest :: Message -> GitAnnexTagInfo -> Maybe NetMessage -decodePushRequest m _ = PushRequest <$> (formatJID <$> messageFrom m) +decodePushRequest m _ = Pushing <$> (formatJID <$> messageFrom m) <*> pure PushRequest pushRequestAttr :: Name pushRequestAttr = "pushrequest" @@ -158,7 +158,7 @@ startingPushAttr :: Name startingPushAttr = "startingpush" decodeStartingPush :: Message -> GitAnnexTagInfo -> Maybe NetMessage -decodeStartingPush m _ = StartingPush <$> (formatJID <$> messageFrom m) +decodeStartingPush m _ = Pushing <$> (formatJID <$> messageFrom m) <*> pure StartingPush receivePackOutput :: ByteString -> JID -> JID -> Message receivePackOutput = gitAnnexMessage . @@ -168,9 +168,9 @@ receivePackAttr :: Name receivePackAttr = "rp" decodeReceivePackOutput :: Message -> GitAnnexTagInfo -> Maybe NetMessage -decodeReceivePackOutput m i = ReceivePackOutput +decodeReceivePackOutput m i = Pushing <$> (formatJID <$> messageFrom m) - <*> decodeTagContent (tagElement i) + <*> (ReceivePackOutput <$> decodeTagContent (tagElement i)) sendPackOutput :: ByteString -> JID -> JID -> Message sendPackOutput = gitAnnexMessage . @@ -180,9 +180,9 @@ sendPackAttr :: Name sendPackAttr = "sp" decodeSendPackOutput :: Message -> GitAnnexTagInfo -> Maybe NetMessage -decodeSendPackOutput m i = SendPackOutput +decodeSendPackOutput m i = Pushing <$> (formatJID <$> messageFrom m) - <*> decodeTagContent (tagElement i) + <*> (SendPackOutput <$> decodeTagContent (tagElement i)) receivePackDone :: ExitCode -> JID -> JID -> Message receivePackDone = gitAnnexMessage . gitAnnexTag receivePackDoneAttr . T.pack . show . toi @@ -191,9 +191,9 @@ receivePackDone = gitAnnexMessage . gitAnnexTag receivePackDoneAttr . T.pack . s toi (ExitFailure i) = i decodeReceivePackDone :: Message -> GitAnnexTagInfo -> Maybe NetMessage -decodeReceivePackDone m i = ReceivePackDone +decodeReceivePackDone m i = Pushing <$> (formatJID <$> messageFrom m) - <*> (convert <$> readish (T.unpack $ tagValue i)) + <*> (ReceivePackDone . convert <$> readish (T.unpack $ tagValue i)) where convert 0 = ExitSuccess convert n = ExitFailure n |