use share lenses

[mTask.git] / Utils / SDS.icl

diff --git a/Utils/SDS.icl b/Utils/SDS.icl
index b00a7ae..a7c3763 100644 (file)
--- a/Utils/SDS.icl
+++ b/Utils/SDS.icl
@@ -7,12 +7,27 @@ import Shares.mTaskShare
 import Tasks.Examples
 import qualified Data.Map as DM
 from Data.Func import $
+import Data.Tuple
 
 memoryShare :: String a -> Shared a | iTask a
-memoryShare s d = sdsFocus s $ memoryStore "" $ Just d
+memoryShare s d = sdsFocus s $ memoryStore s $ Just d
 
-deviceStore :: Shared [MTaskDevice]
-deviceStore = sharedStore "mTaskDevices" []
+deviceStoreNP :: Shared [MTaskDevice]
+deviceStoreNP = sdsFocus Nothing $ deviceStore
+
+deviceStore :: RWShared (Maybe Int) [MTaskDevice] [MTaskDevice]
+deviceStore = SDSSource {SDSSource 
+       | name = "deviceStore"
+       , read = \_->read realDeviceStore
+       , write= \p w->appFst ((<$) (lens p)) o write w realDeviceStore
+       } 
+
+lens Nothing _ = True
+lens _ Nothing = True
+lens (Just p) (Just p`) = p` == -1 || p == p`
+
+realDeviceStore :: Shared [MTaskDevice]
+realDeviceStore = sharedStore "mTaskDevices" []
 
 bcStateStore :: Shared BCState
 bcStateStore = memoryShare "mTaskBCState" zero