X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=81ebb8b69dcd281767682b6b03b958cec511e6a7;hb=848595d1288804d6de43625f9e6f1cf76295c285;hp=481d3ad9fa6f1a74a049f46793a6c0b8f957bc21;hpb=7d9088b54956fe56c36ca8d01ec386b48f0a1c47;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 481d3ad..81ebb8b 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -6,13 +6,14 @@ import Utils.Devices
 import iTasks
 import mTask
 import Data.List
+import Data.Tuple
 from Data.Func import $
 from StdFunc import flip
 
 derive class iTask MTaskShare
 
 manageShares :: Task [MTaskDevice]
-manageShares = whileUnchanged deviceStore
+manageShares = whileUnchanged deviceStoreNP
 	$ \devs->case devs of
 		[] = viewInformation "No devices yet" [] []
 		_ = allTasks (map manageSharesOnDevice devs)
@@ -24,7 +25,7 @@ manageSharesOnDevice dev = (case dev.deviceShares of
 	) >>| treturn dev
 
 updateShares :: MTaskDevice ([MTaskShare] -> [MTaskShare]) -> Task [MTaskShare]
-updateShares dev tfun = upd (map upFun) deviceStore 
+updateShares dev tfun = upd (map upFun) (sdsFocus (Just (dev, -1)) deviceStore)
 		@ (\d->d.deviceShares) o fromJust o find ((==)dev)
 	where
 		upFun d = if (dev == d) ({d&deviceShares=tfun d.deviceShares}) d
@@ -66,12 +67,6 @@ makeShare withTask identifier value = {MTaskShare
 		,value=value
 		}
 
-updateShareFromPublish :: MTaskDevice Int BCValue -> Task [MTaskShare]
-updateShareFromPublish dev ident val = updateShares dev $ map $ up ident val
-	where
-		up :: Int BCValue MTaskShare -> MTaskShare
-		up i v s = if (s.identifier == i) {MTaskShare | s & value=val} s
-
 import GenPrint, StdMisc, StdDebug, TTY
 derive gPrint MTaskDevice, MTaskShare, Maybe, MTaskResource, MTaskTask, TaskId, TTYSettings, TCPSettings, DateTime
 derive gPrint Parity, BaudRate, ByteSize
@@ -90,33 +85,39 @@ cleanSharesTask taskid d = updateShares d id //TODO
 //		up :: [String] MTaskShare -> MTaskShare
 //		up ns s = {MTaskShare | s & withTask=[t\\t<-s.withTask|not (isMember t ns)]}
 
+instance == MTaskShare where
+	(==) a b = a.identifier == b.identifier
+
 getRealShare :: MTaskDevice MTaskShare -> Shared BCValue
-getRealShare dev {identifier} = SDSSource {SDSSource
-	| name = "mTaskShareMap-" +++ toString identifier, read=rr, write=ww}
-	where
-		rr name iworld = case read deviceStore iworld of
-			(Error e, iworld) = (Error e, iworld)
-			(Ok devices, iworld) = case find ((==)dev) devices of
-				Nothing = (Error $ exception "Device doesn't exist anymore", iworld)
-				Just {deviceShares} = case find (\s->s.identifier == identifier) deviceShares of
-					Nothing = (Error $ exception "Share doesn't exist", iworld)
-					Just share = (Ok share.MTaskShare.value, iworld)
-			
-		// Also send messages
-		ww name value iworld
-		| not (trace_tn ("Update to: " +++ printToString value)) = undef
-		= case modify (\r->((), map (modFun value) r)) deviceStore iworld of
-			(Error e, iworld) = (Error e, iworld)
-			(Ok _, iworld) = case sendMessagesIW [MTUpd identifier value] dev iworld of
-				(Error e, iworld) = (Error e, iworld)
-				(Ok _, iworld) = (Ok $ const True, iworld)
-
-		//Selects the correct device
-		modFun value d
-		| d == dev = {d & deviceShares=map (modFun2 value) d.deviceShares}
-		= d
-
-		//Selects the correct share
-		modFun2 value share
-		| identifier == share.MTaskShare.identifier = {MTaskShare | share & value=value}
-		= share
+getRealShare dev share = sdsFocus ()
+	$ mapReadWriteError (deviceLens dev share)
+	$ sdsFocus (Just (dev, share.identifier))
+	$ deviceStore
+
+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
+	
+	mwrite :: BCValue [MTaskDevice] -> MaybeError TaskException (Maybe [MTaskDevice])
+	mwrite val devs = case partition ((==)dev) devs of
+		([], _) = Error $ exception "Device doesn't exist anymore"
+		([_,_:_], _) = Error $ exception "Multiple matching devices"
+		([d=:{deviceShares}], devs) = case partition ((==)share) deviceShares of
+			([], _) = Error $ exception "Share doesn't exist anymore"
+			([_,_:_], _) = Error $ exception "Multiple matching shares"
+			([s], shares)
+				# s = {MTaskShare | s & value=val}
+				# d = {MTaskDevice | d & deviceShares=[s:shares]}
+				= Ok $ Just [d:devs]
+
+updateShareFromPublish :: MTaskDevice Int BCValue -> Task BCValue
+updateShareFromPublish dev ident val = set val 
+	$ mapReadWriteError (deviceLens dev dummy)
+	$ deviceStoreNP
+where
+	dummy = {MTaskShare|value=BCValue 0,identifier=ident,withTask=[]}