modularize more
[mTask.git] / miTask.icl
index f8fa8ba..47778b2 100644 (file)
 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 Utils.SDS
+
+from Text import class Text(startsWith,concat,split,join), instance Text String
+
+import qualified Data.Map as DM
+
+from Data.Func import $
+import Data.Tuple
+import Data.List
+import System.Directory
+
+import iTasks._Framework.Store
+
+import TTY, iTasksTTY
 
-derive class iTask MTaskMessage
+derive class iTask UserLED
 
 Start :: *World -> *World
-Start world = startEngine (withShared ([], False, [], False) mTaskTask) world
-//Start world = startEngine mTaskTask world
-
-mTaskTask :: (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
-mTaskTask ch =
-       syncNetworkChannel "localhost" 8124 "\n" decode encode ch ||-
-       (
-               sendMsg (hd msgs) ch >>= \_->
-               sendMsg (hd (tl msgs)) ch >>= \_->
-               viewSharedInformation "channels" [ViewWith lens] ch @! ()
-       )
-       where
-               lens :: ([MTaskMessage],Bool,[MTaskMessage],Bool) -> ([String], [String])
-               lens (r,_,s,_) = (map toString r, map toString s)
+Start world = startEngine (mTaskManager
+       >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+
+mTaskMap :: Map String (Main (ByteCode () Stmt))
+mTaskMap = 'DM'.fromList [("count", bc), ("ledon", bc2 LED1), ("ledoff", bc3 LED3)]
 
-               msgs = toMessages 500 (toRealByteCode (unMain bc))
+bc :: Main (ByteCode () Stmt)
+bc = sds \x=1 In sds \pinnetje=1 In {main =
+               IF (digitalRead D3) (
+                       x =. x +. lit 1 :.
+                       pub x
+               ) (
+                       noOp
+               ) :.
+               IF (pinnetje ==. lit 1) (
+                       ledOn LED1
+               ) (
+                       IF (pinnetje ==. lit 2) (
+                               ledOn LED2
+                       ) (
+                               ledOn LED3
+                       )
+               )}
 
-               bc :: Main (ByteCode Int Expr)
-               bc = sds \x=0 In {main = x =. x +. lit 1}
+bc2 :: UserLED -> Main (ByteCode () Stmt)
+bc2 d = {main = ledOn d}
 
-makemTask :: Int (Main (ByteCode a Expr)) -> String
-makemTask to bc
-# (bc, st) = toRealByteCode (unMain bc)
-= "t" +++ toString (toChar (to / 265))
-       +++ toString (toChar (to rem 265)) +++ toString bc +++ "\n"
+bc3 :: UserLED -> Main (ByteCode () Stmt)
+bc3 d = {main = ledOff d}
 
-sendMsg :: MTaskMessage (Shared ([MTaskMessage],Bool,[MTaskMessage],Bool)) -> Task ()
-sendMsg m ch
-| not (trace_tn ("\'" +++ toString m +++ "\'")) = undef
-= upd (\(r,rs,s,ss)->(r,rs,s ++ [m],ss)) ch @! ()
+:: MTaskDeviceStatus = {connected :: Bool, name :: String, tasks :: [String]}
+derive class iTask MTaskDeviceStatus, BCState
 
-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} @! ()
+mTaskManager :: Task ()
+mTaskManager = anyTask 
+               [ viewmTasks @! ()
+               , whileUnchanged sdsStore viewShares
+               , whileUnchanged deviceStore viewDevices
+               ] <<@ ApplyLayout layout
        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))
+               layout = sequenceLayouts
+                       [ arrangeWithSideBar 0 LeftSide 260 True
+                       , arrangeSplit Vertical True
+                       ]
+
+               viewmTasks = listmTasks
+                       >&^ \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 = sendmTask mTaskTask ds @! ())
+                       where
+                               listmTasks :: Task String
+                               listmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
+
+                               sendmTask mTaskId ds = 
+                                               (enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
+                                               -&&- enterInformation "Timeout, 0 for one-shot" [])
+                                       >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskId)]
 
-consumeNetworkStream :: ([m] -> Task ()) (Shared ([m],Bool,[m],Bool)) -> Task () | iTask m
-consumeNetworkStream processTask channel
-       = ((watch channel >>* [OnValue (ifValue ifProcess process)]) <! id) @! ()
+                               sendToDevice :: String (MTaskDevice, Int) -> Task ()
+                               sendToDevice mTask (device, timeout) =
+                                               get bcStateStore @ createBytecode
+                                       >>= \(msgs, st1)->set st1 bcStateStore @ toSDSRecords
+                                       >>= \sdss->upd ((++)sdss) sdsStore//MTaskShareaddToSDSShare
+                                       >>| makeShares sdss
+                                       >>| upd (\(r,s,ss)->(r,s++msgs,ss)) (channels device)
+                                       @! ()
+                                       where
+                                               createBytecode st = toMessages timeout $ toRealByteCode (unMain $ fromJust ('DM'.get mTask mTaskMap)) st
+                                               sharename i = device.deviceChannels +++ "-" +++ toString i
+                                               toSDSRecords st = [{MTaskShare |
+                                                       initValue=toInt d1*265 + toInt d2,
+                                                       withTask=mTask,
+                                                       identifier=i,
+                                                       realShare="mTaskSDS-" +++ toString i}
+                                                               \\(i,[d1,d2])<-st.sdss]
+                                               makeShares = foldr (\sh t->set sh.initValue (getSDSStore sh) >>| t) (treturn ())
+
+               getSDSStore :: MTaskShare -> Shared Int
+               getSDSStore sh = memoryShare sh.realShare 0
+
+               getSDSRecord :: Int -> Task MTaskShare
+               getSDSRecord i = get sdsStore @ \l->hd [s\\s<-l | s.identifier == i]
+
+               viewShares :: [MTaskShare] -> Task ()
+               viewShares st = anyTask $ map viewer st
+                       where
+                               viewer :: MTaskShare -> Task ()
+                               viewer m = viewSharedInformation "" [] (getSDSStore m)
+                                       <<@ Title ("SDS: " +++ toString m.identifier) @! ()
+//                             enterChoiceWithShared "Shares" [ChooseFromList id] sdsStore
+//                     >>* [OnValue $ withValue $ Just o updateShare]
+//                     >>* [OnAction (Action "Back") (const $ Just $ treturn ())]
+//                     where
+//                             sdsvw (k, v) = concat ["SDS ", toString k, ": ", toString v]
+//                             updateShare s = viewInformation "" [] ()
+//                             updateShare (k, v) = (viewInformation "Key" [] k
+//                                     ||- updateInformation "Value" [] v)
+                                       
+
+//             addDevice :: (Shared [MTaskDevice]) -> Task SerTCP
+//             addDevice devices = enterInformation "Device type" []
+//                     >&^ \sh->whileUnchanged sh $ \mty->case mty of
+//                             Nothing = viewInformation "No type selected yet" [] "" @! ()
+//                             Just ty = case ty of
+//                                     TCPDevice = (enterInformation "Name" [] -&&- enterInformation "Hostname" [] -&&- enterInformation "Port" [])
+//                                             >>= \(name, (host, port))->cont name (syncNetworkChannel host port)
+//                                     SerialDevice = (enterInformation "Name" [] -&&- enterTTYSettings)
+//                                             >>= \(name, set)->cont name (syncSerialChannel set encode decode)
+//                     where
+//                             cont :: String ((Shared Channels) -> Task ()) -> Task ()
+//                             cont name synfun = get randomInt 
+//                                     @ (\randint->{deviceChannels=name +++ toString randint, deviceName=name, deviceTasks=[], deviceTask=Nothing})
+//                                     >>= \dev->appendTopLevelTask 'DM'.newMap True (let ch = channels dev in process ch -||- synfun ch)
+//                                     >>= \tid->upd (\l->[{dev & deviceTask=Just tid}:l]) devices
+//                                     @! ()
+
+               process :: (Shared Channels) -> Task ()
+               process ch = forever (watch ch >>* [OnValue (
+                               ifValue (not o isEmpty o fst3)
+                               (\t->upd (appFst3 (const [])) ch >>| process (fst3 t)))])
+                       where
+                               process :: [MTaskMSGRecv] -> Task ()
+                               process [] = treturn ()
+                               process [m:ms] = (case m of
+                                       MTTaskAck i = traceValue (toString m) @! ()
+                                       MTTaskDelAck i = traceValue (toString m) @! ()
+                                       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 @! ()
+                                       MTMessage val = traceValue (toString m) @! ()
+                                       MTEmpty = treturn ()
+                                       ) >>| process ms
+
+               deviceviewer :: [MTaskDevice] -> [MTaskDeviceStatus]
+               deviceviewer ds = [{MTaskDeviceStatus | name = d.deviceName,
+                       connected = if (isNothing d.deviceTask) False True,
+                       tasks = [s +++ toString i\\(s, i)<-d.deviceTasks]}\\d<-ds]
+
+               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 (||-)
+
+sendMsg :: [MTaskMSGSend] (Shared ([MTaskMSGRecv],[MTaskMSGSend],Bool)) -> Task ()
+sendMsg m ch = upd (\(r,s,ss)->(r,s ++ m,True)) ch @! ()
+
+syncNetworkChannel :: String Int (Shared ([MTaskMSGRecv], [MTaskMSGSend], Bool)) -> Task ()
+syncNetworkChannel server port channel = catchAll
+               (tcpconnect server port channel {ConnectionHandlers|onConnect=onConnect,whileConnected=whileConnected,onDisconnect=onDisconnect} @! ())
+               (\v->traceValue v @! ())
        where
-               ifProcess (received,receiveStopped,_,_)
-                       = receiveStopped || (not (isEmpty received))
+               onConnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool)
+               onConnect _ (msgs,send,sendStopped)
+                       = (Ok "", Just (msgs,[],sendStopped), map encode send, False)
 
-               process (received,receiveStopped,_,_)
-                       =   upd empty channel
-                       >>| if (isEmpty received) (return ()) (processTask received)
-                       @!  receiveStopped
+               whileConnected :: (Maybe String) String ([MTaskMSGRecv], [MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool), [String], Bool)
+               
+               //whileConnected Nothing acc (msgs,send,sendStopped)
+               //= (Ok acc, Just (msgs,[],sendStopped), map encode send, False)
+               whileConnected mnewData acc (msgs,send,sendStopped)
+               = (Ok acc, Just (msgs ++ map decode (maybeToList mnewData),[],sendStopped), map encode send, False)
+               //| sendStopped = (Ok acc, Just (msgs ++ [decode newData],[],False), map encode send, False)
+//             = (Ok acc, Just (msgs ++ [decode newData],[],False), [], False)
                
-               empty :: ([m],Bool,[m],Bool) -> ([m],Bool,[m],Bool)
-               empty (_,rs,s,ss) = ([],rs,s,ss)
+               onDisconnect :: String ([MTaskMSGRecv],[MTaskMSGSend],Bool) -> (MaybeErrorString String, Maybe ([MTaskMSGRecv],[MTaskMSGSend],Bool))
+               onDisconnect l (msgs,send,sendStopped) = (Ok l, Nothing)