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

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 0999cc2..481d3ad 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -5,53 +5,118 @@ import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
+import Data.List
 from Data.Func import $
+from StdFunc import flip
 
-derive class iTask MTaskShareType
-
-derive gEditor MTaskShare
-derive gText MTaskShare
-derive JSONEncode MTaskShare
-derive JSONDecode MTaskShare
-derive gDefault MTaskShare
-gEq{|MTaskShare|} m1 m2 = m1.identifier == m2.identifier
-
-manageShares :: [MTaskShare] -> Task ()
-manageShares shares =
-	forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares
-	>&^ \st->whileUnchanged st $ \msh->case msh of
-		Nothing = viewShares shares
-		Just sh = forever (
-				viewSharedInformation "View value" [] (getSDSShare sh) >>| treturn sh
-//			>>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
-//			>>= updateShare sh
-			)
-			
-	) @! ()
+derive class iTask MTaskShare
+
+manageShares :: Task [MTaskDevice]
+manageShares = whileUnchanged deviceStore
+	$ \devs->case devs of
+		[] = viewInformation "No devices yet" [] []
+		_ = allTasks (map manageSharesOnDevice devs)
+
+manageSharesOnDevice :: MTaskDevice -> Task MTaskDevice
+manageSharesOnDevice dev = (case dev.deviceShares of
+		[] = viewInformation dev.deviceName [] "No shares yet"
+		shs = enterChoice dev.deviceName [ChooseFromGrid id] shs @ const ""
+	) >>| treturn dev
 
-//updateShare :: MTaskShare a -> Task MTaskShare | toByteCode, iTask a
-//updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
-//	>>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
-//	>>| treturn sh
+updateShares :: MTaskDevice ([MTaskShare] -> [MTaskShare]) -> Task [MTaskShare]
+updateShares dev tfun = upd (map upFun) deviceStore 
+		@ (\d->d.deviceShares) o fromJust o find ((==)dev)
+	where
+		upFun d = if (dev == d) ({d&deviceShares=tfun d.deviceShares}) d
 
+//manageShares shares = withShared Nothing $ \cs->forever $
+//	(viewSharesGrid cs shares -|| updateShares shares <<@ ArrangeVertical) 
+//	@! ()
 
-viewShares :: [MTaskShare] -> Task MTaskShare
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal
-	>>| return (hd sh)
+//updateShares :: [MTaskShare] -> Task BCValue
+//updateShares shares = anyTask (map updateS shares) <<@ ArrangeWithTabs
 
-viewShare :: MTaskShare -> Task BCValue
-viewShare m = viewSharedInformation "" [] (getSDSShare m)
-	<<@ Title ("SDS: " +++ toString m.identifier)
+//updateS :: MTaskShare -> Task BCValue
+//updateS sh = flip (<<@) (Title $ toString sh.identifier) $ forever $
+//		viewSharedInformation "Current value" [] (getSDSShare sh)
+//	||- (
+//			updateSharedInformation "New value" [] (getSDSShare sh)
+//		>>= \nv->allTasks (map (withDevice treturn) sh.withDevice)
+//		>>= \devs->allTasks (map (sendMessages [MTUpd sh.identifier nv]) devs)
+//		>>| treturn nv
+//		)
+//	<<@ ArrangeHorizontal
 
-getSDSShare :: MTaskShare -> Shared BCValue
-getSDSShare s=:{realShare=(MTaskWithShare id)}
-	= memoryShare id s.MTaskShare.value
+//viewSharesGrid :: (Shared (Maybe MTaskShare)) [MTaskShare] -> Task [BCValue]
+//viewSharesGrid _ [] = viewInformation "No shares yet" [] []
+//viewSharesGrid cs sh = (allTasks [watch (getSDSShare m)\\m<-sh] <<@ NoUserInterface)
+//	>&^ \st->flip (<<@) NoUserInterface $ whileUnchanged st $ \mshs->enterChoice "" [ChooseFromGrid id]
+//		[{MTaskShare|ss&value=s}\\s<-fromJust mshs & ss<-sh]
+//		>>* [OnValue (withValue $ \s->Just (set (Just s) cs))]
+//		@! fromJust mshs
 
-makeShare :: String Int BCValue -> Task MTaskShare
-makeShare withTask identifier value = treturn 
-		{MTaskShare
-		|withTask=withTask
+//viewShare :: MTaskShare -> Task BCValue
+//viewShare m = viewSharedInformation "" [] (getSDSShare m)
+//	<<@ Title ("SDS: " +++ toString m.identifier)
+
+makeShare :: String Int BCValue -> MTaskShare
+makeShare withTask identifier value = {MTaskShare
+		|withTask=[withTask]
 		,identifier=identifier
 		,value=value
-		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
-		} >>= \sh->set value (getSDSShare sh) >>| treturn sh
+		}
+
+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
+
+cleanSharesTask :: Int MTaskDevice -> Task [MTaskShare]
+cleanSharesTask taskid d = updateShares d id //TODO
+//# shares = d.deviceShares
+//| not (trace_tn $ printToString taskid) = undef
+//| not (trace_tn $ printToString d.deviceTasks) = undef
+//| not (trace_tn $ printToString $ getNames taskid d) = undef
+//= upd (map $ up $ getNames taskid d) sdsStore
+//	where
+//		getNames :: Int MTaskDevice -> [String]
+//		getNames i d = [t.MTaskTask.name\\t<-d.deviceTasks|t.ident==i]
+//		
+//		up :: [String] MTaskShare -> MTaskShare
+//		up ns s = {MTaskShare | s & withTask=[t\\t<-s.withTask|not (isMember t ns)]}
+
+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