X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;fp=Shares%2FmTaskShare.icl;h=a9ebf5600632271d4121e9dde64ebbe021db5cde;hb=1e18ef692756fa4a6f163994e7edb5ad4f11b3db;hp=e8ed9a2077b3e50fe27ddb78e0dacf8575f77e87;hpb=6d956995e169ae8fd44d62e26e35d499a9660225;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index e8ed9a2..a9ebf56 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -6,7 +6,9 @@ import Utils.Devices
 import iTasks
 import mTask
 import Data.List
+import Data.Error
 import Data.Tuple
+from Control.Monad import `b`
 from Data.Func import $
 from StdFunc import flip
 
@@ -123,11 +125,9 @@ getRealShare dev share = sdsFocus ()
 deviceLens dev share = (mread, mwrite)
 where
 	mread :: [MTaskDevice] -> MaybeError TaskException BCValue
-	mread devs = case find ((==)dev) devs of
-		Nothing = Error $ exception "Device doesn't exist anymore"
-		Just {deviceShares} = case find ((==)share) deviceShares of
-			Nothing = Error $ exception "Share doesn't exist anymore"
-			Just share = Ok share.MTaskShare.value
+	mread devs = mb2error (exception "Device lost") (find ((==)dev) devs)
+		`b` \d->mb2error (exception "Share lost") (find ((==)share) d.deviceShares)
+		`b` \s->Ok s.MTaskShare.value
 	
 	mwrite :: BCValue [MTaskDevice] -> MaybeError TaskException (Maybe [MTaskDevice])
 	mwrite val devs = case partition ((==)dev) devs of