X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=71b891165dbbb029ade74296b4b4750f3e7562ee;hb=a2b8b2a0de173f92092bf6cbbed23551e674ca3c;hp=ab37901f54abd219f453353f0c113c478792af37;hpb=7edf1780ae3b91d9136db2d94b25e88d64896645;p=mTask.git

diff --git a/miTask.icl b/miTask.icl
index ab37901..71b8911 100644
--- a/miTask.icl
+++ b/miTask.icl
@@ -1,74 +1,77 @@
 module miTask
 
 import StdDebug, StdMisc
-
-from Text import class Text(concat,join,split), instance Text String
-from Control.Monad import mapM
+from StdFunc import flip
 
 import iTasks
 import mTask
+import Devices.mTaskDevice
+import Shares.mTaskShare
+import Tasks.Examples
+import Utils.SDS
 
-derive class iTask MTaskMessage
+from Text import class Text(startsWith,concat,split,join), instance Text String
 
-Start :: *World -> *World
-Start world = startEngine (
-	withShared ([], False, [], False) (\ch->
-		enterInformation "Port Number?" [] >>= \port->mTaskTask port ch
-	)) world
-//Start world = startEngine mTaskTask world
+import qualified Data.Map as DM
 
-mTaskTask :: Int (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
-mTaskTask port ch =
-	syncNetworkChannel "localhost" port "\n" decode encode ch ||-
-	(
-		sendMsg msgs ch >>= \_->
-		viewSharedInformation "channels" [ViewWith lens] ch @! ()
-	) >>* [OnAction ActionFinish (always shutDown)]
-	where
-		lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String])
-		lens (r,_,s,_) = (f r, f s)
-			where
-				f [] = []
-				f [MTEmpty:xs] = f xs
-				f [x:xs] = [toString x:f xs]
+from Data.Func import $
+import Data.Tuple
+import Data.List
+import System.Directory
 
-		msgs = toMessages 500 (toRealByteCode (unMain bc))
+import iTasks._Framework.Store
+import iTasks._Framework.Serialization
 
-		bc :: Main (ByteCode Int Stmt)
-		bc = sds \x=0 In {main = x =. x +. lit 1 :. pub x}
+import TTY, iTasksTTY
 
-sendMsg :: [MTaskMessage] (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
-sendMsg m ch = upd (\(r,rs,s,ss)->(r,rs,s ++ m,ss)) ch @! ()
+derive class iTask UserLED
 
-syncNetworkChannel :: String Int String (String -> m) (n -> String) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n
-syncNetworkChannel server port msgSeparator decodeFun encodeFun channel
-	= tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! ()
+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
-		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))
+		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 [m:ms] = (case m of
+//					MTSDSAck i = traceValue (toString m) @! ()
+//					MTSDSDelAck i = traceValue (toString m) @! ()
+					MTPub i val = getSDSRecord i >>= set (toInt val.[0]*256 + toInt val.[1]) o getSDSStore @! ()
+					MTTaskAck i = deviceTaskAcked device i
+					MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
+					MTEmpty = treturn ()
+					_ = traceValue (toString m) @! ()
+					) >>| proc ms
 
-//consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[n],Bool)) -> Task () | iTask m & iTask n
-//consumeNetworkStream processTask channel
-//	= ((watch channel >>* [OnValue (ifValue ifProcess process)]) <! id) @! ()
-//	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)
+		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 (||-)