X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=1ccbcc4f3a95affecd5d3cb1f9a62ad4a7fcdb5e;hb=d99f9bb5fdcf3a58381281b5927a65f82b44b494;hp=bf8f2a1c107d4eb2db0b1dc1e0d612b20077e393;hpb=778d5d97bc6f8a0f37d59177301348a960079e13;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index bf8f2a1..1ccbcc4 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -6,14 +6,16 @@ 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
 
 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)
@@ -25,7 +27,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
@@ -60,14 +62,18 @@ updateShares dev tfun = upd (map upFun) deviceStore
 //viewShare m = viewSharedInformation "" [] (getSDSShare m)
 //	<<@ Title ("SDS: " +++ toString m.identifier)
 
-makeShare :: String Int BCValue -> MTaskShare
-makeShare withTask identifier value = {MTaskShare
+makeShare :: String String Int BCValue -> MTaskShare
+makeShare withTask human identifier value = {MTaskShare
 		|withTask=[withTask]
 		,identifier=identifier
 		,value=value
+		,humanName=human
 		}
 
 import GenPrint, StdMisc, StdDebug, TTY
+
+gPrint{|BCState|} x st = gPrint{|*|} "BCState..." st
+
 derive gPrint MTaskDevice, MTaskShare, Maybe, MTaskResource, MTaskTask, TaskId, TTYSettings, TCPSettings, DateTime
 derive gPrint Parity, BaudRate, ByteSize
 
@@ -88,42 +94,32 @@ cleanSharesTask taskid d = updateShares d id //TODO
 instance == MTaskShare where
 	(==) a b = a.identifier == b.identifier
 
-getRealShare :: MTaskDevice MTaskShare -> Shared BCValue
-getRealShare dev share=:{identifier} = sdsFocus (Just 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 ((==)share) deviceShares of
-					Nothing = (Error $ exception "Share doesn't exist", iworld)
-					Just s = (Ok s.MTaskShare.value, iworld)
-			
-		// Also send messages
-		ww name value iworld
-		| not (trace_tn ("Update to: " +++ printToString value)) = undef
-		= case modify (tuple () o modifyValue value) 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 $ maybe True ((==) identifier), iworld)
-
-		modifyValue :: BCValue [MTaskDevice] -> [MTaskDevice]
-		modifyValue v ds = filterMap ((==)dev) (updateShare identifier v) ds
-
-filterMap :: (a -> Bool) (a -> a) [a] -> [a]
-filterMap f t xs = [if (f x) (t x) x\\x<-xs]
-
-getDeviceStoreForShare :: Int -> Shared [MTaskDevice]
-getDeviceStoreForShare ident = sdsFocus (Just ident) $ sdsFocus () deviceStore
-
-updateShareFromPublish :: MTaskDevice Int BCValue -> Task [MTaskDevice]
-updateShareFromPublish dev ident val 
-	= upd (filterMap ((==)dev) (updateShare ident val)) $ getDeviceStoreForShare ident
-
-updateShare :: Int BCValue MTaskDevice -> MTaskDevice
-updateShare ident val dev = {MTaskDevice | dev & deviceShares=filterMap 
-	(\s->s.identifier==ident)
-	(\s->{MTaskShare | s & value=val})
-	dev.deviceShares}
+shareShare :: MTaskDevice MTaskShare -> Shared BCValue
+shareShare 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 = 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
+		([], _) = 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) = Ok $ Just [{MTaskDevice | d &
+				deviceShares=[{MTaskShare | s & value=val}:shares]}:devs]
+
+updateShareFromPublish :: MTaskDevice Int BCValue -> Task BCValue
+updateShareFromPublish dev ident val = set val 
+	$ mapReadWriteError (deviceLens dev dummy)
+	$ deviceStoreNP
+where
+	dummy = {MTaskShare|humanName="",value=BCValue 0,identifier=ident,withTask=[]}