X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=2b9d4e0856294ae711d28ad23be0396cfe7f3b68;hb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;hp=84b25633289174f4a0fa15d88c6ef9d3d2ee4b32;hpb=c667554eb5dc359481a5f84b60649169f31e0f3d;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index 84b2563..2b9d4e0 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -1,49 +1,75 @@
 module miTask
 
 import StdDebug, StdMisc
-
-from Text import class Text(concat,join,split), instance Text String
+from StdFunc import flip
 
 import iTasks
 import mTask
+import Devices.mTaskDevice
+import Shares.mTaskShare
+import Tasks.Examples
+import Utils.SDS
 
-Start :: *World -> *World
-Start world = startEngine mTaskTask world
+from Text import class Text(startsWith,concat,split,join), instance Text String
 
-mTaskTask :: Task ()
-mTaskTask = withShared ([],False,[],False) (\ch->
-		syncNetworkChannel "localhost" 8123 "\n" id id ch ||- 
-		updateSharedInformation "channels" [] ch @! ())
+import qualified Data.Map as DM
 
-syncNetworkChannel :: String Int String (String -> m) (m -> String) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m
-syncNetworkChannel server port msgSeparator decodeFun encodeFun channel
-	= tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! ()
-	where
-		onConnect _ (received,receiveStopped,send,sendStopped)
-			= (Ok "",if (not (isEmpty send)) (Just (received,False,[],sendStopped)) Nothing, map encodeFun send,False)
-		whileConnected Nothing acc (received,receiveStopped,send,sendStopped)
-			= (Ok acc, Nothing, [], False)
-		whileConnected (Just newData) acc (received,receiveStopped,send,sendStopped)
-		# [acc:msgs] = reverse (split msgSeparator (concat [acc,newData]))
-		# write = if (not (isEmpty msgs && isEmpty send))
-			(Just (received ++ map decodeFun (reverse msgs),receiveStopped,[],sendStopped))
-			Nothing
-		= (Ok acc,write,map encodeFun send,False)
-		
-		onDisconnect l (received,receiveStopped,send,sendStopped)
-			= (Ok l,Just (received,True,send,sendStopped))
-
-consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m
-consumeNetworkStream processTask channel
-	= ((watch channel >>* [OnValue (ifValue ifProcess process)]) <! id) @! ()
+from Data.Func import $
+import Data.Tuple
+import Data.List
+import System.Directory
+
+import iTasks._Framework.Store
+import iTasks._Framework.Serialization
+
+import TTY, iTasksTTY
+
+Start :: *World -> *World
+Start world = startEngine (mTaskManager
+	>>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+
+mTaskManager :: Task ()
+mTaskManager = startupDevices >>| anyTask 
+		[ viewmTasks @! ()
+		, whileUnchanged sdsStore manageShares
+		, whileUnchanged deviceStore $ manageDevices process
+		] <<@ ApplyLayout (sequenceLayouts 
+			[ arrangeWithSideBar 0 LeftSide 260 True
+			, arrangeSplit Vertical True
+			])
 	where
-		ifProcess (received,receiveStopped,_,_)
-			= receiveStopped || (not (isEmpty received))
-
-		process (received,receiveStopped,_,_)
-			=   upd empty channel
-			>>| if (isEmpty received) (return ()) (processTask received)
-			@!  receiveStopped
-		
-		empty :: ([m],Bool,[m],Bool) -> ([m],Bool,[m],Bool)
-		empty (_,rs,s,ss) = ([],rs,s,ss)
+		viewmTasks :: Task String
+		viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
+			>&^ \sh->whileUnchanged sh $ \mi->forever (case mi of
+				Nothing = viewInformation "No task selected" [] ()
+				Just mTaskTask = get deviceStore
+					>>= \devices->case devices of
+						[] = viewInformation "No devices yet" [] ()
+						ds = fromJust ('DM'.get mTaskTask allmTasks)
+							>>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
+								-&&- enterInformation "Timeout" []
+							) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)]
+							@! ()
+				)
+
+		process :: MTaskDevice (Shared Channels) -> Task ()
+		process device ch = forever (watch ch >>* [OnValue (
+				ifValue (not o isEmpty o fst3)
+				(\t->upd (appFst3 (const [])) ch >>| proc (fst3 t)))])
+			where
+				proc :: [MTaskMSGRecv] -> Task ()
+				proc [] = treturn ()
+				proc [MTEmpty:ms] = proc ms
+				proc [m:ms] = traceValue (toString m) >>| (case m of
+//					MTSDSAck i = traceValue (toString m) @! ()
+//					MTSDSDelAck i = traceValue (toString m) @! ()
+					MTPub i val = updateShare i val
+					MTTaskAck i = deviceTaskAcked device i
+					MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
+					_ = treturn ()
+					) >>| proc ms
+
+		mapPar :: (a -> Task a) [a] -> Task ()
+		mapPar f l = foldr1 (\x y->f x ||- y) l <<@ ArrangeWithTabs @! ()
+		allAtOnce t = foldr1 (||-) t @! ()
+		//allAtOnce = (flip (@!) ()) o foldr1 (||-)