X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=e8ed9a2077b3e50fe27ddb78e0dacf8575f77e87;hb=6d956995e169ae8fd44d62e26e35d499a9660225;hp=4cca1340f9b6ce97a7b33774122ec9e9eca38832;hpb=4bb252b0423c73d134a541db44b8b08eab507a39;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 4cca134..e8ed9a2 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -6,14 +6,30 @@ import Utils.Devices
 import iTasks
 import mTask
 import Data.List
+import Data.Tuple
 from Data.Func import $
 from StdFunc import flip
 
 derive class iTask MTaskShare
 
-manageShares :: [MTaskShare] -> Task MTaskShare
-manageShares x = enterChoice "" [ChooseFromGrid id] x
-	>>| manageShares x
+manageShares :: Task [MTaskDevice]
+manageShares = viewInformation "" [] []//whileUnchanged deviceStoreNP
+//	$ \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
+
+updateShares :: MTaskDevice ([MTaskShare] -> [MTaskShare]) -> Task [MTaskShare]
+updateShares dev tfun = upd (map upFun) (sdsFocus (Just (dev, -1)) 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) 
 //	@! ()
@@ -45,39 +61,89 @@ manageShares x = enterChoice "" [ChooseFromGrid id] x
 //	<<@ Title ("SDS: " +++ toString m.identifier)
 
 makeShare :: String String Int BCValue -> MTaskShare
-makeShare withTask withDevice identifier value = {MTaskShare
+makeShare withTask human identifier value = {MTaskShare
 		|withTask=[withTask]
-		,withDevice=[withDevice]
 		,identifier=identifier
 		,value=value
-//		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
+		,humanName=human
 		}
 
-updateShare :: Int BCValue -> Task [MTaskShare]
-updateShare ident val = upd (map $ up ident val) sdsStore
-	where
-		up :: Int BCValue MTaskShare -> MTaskShare
-		up i v s = if (s.identifier == i) {MTaskShare | s & value=val} s
-
 import GenPrint, StdMisc, StdDebug, TTY
+
+gPrint{|BCState|} x st = gPrint{|*|} "BCState..." st
+
 derive gPrint MTaskDevice, MTaskShare, Maybe, MTaskResource, MTaskTask, TaskId, TTYSettings, TCPSettings, DateTime
 derive gPrint Parity, BaudRate, ByteSize
 
 cleanSharesTask :: Int MTaskDevice -> Task [MTaskShare]
-cleanSharesTask taskid d
-| 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)]}
-
-cleanSharesDevice :: String -> Task [MTaskShare]
-cleanSharesDevice did = upd (map (up did)) sdsStore
-	where
-		up :: String MTaskShare -> MTaskShare
-		up i s = {MTaskShare | s & withDevice = [wt\\wt<-s.withDevice|wt <> i]}
+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)]}
+
+instance == MTaskShare where
+	(==) a b = a.identifier == b.identifier
+
+getRealShare :: MTaskDevice MTaskShare -> Shared BCValue
+getRealShare dev share = sdsFocus ()
+	$ mapReadWriteError (deviceLens dev share)
+	$ sdsFocus (Just (dev, share.identifier))
+	$ deviceStore
+
+//getRealShare :: MTaskDevice MTaskShare -> Shared BCValue
+//getRealShare dev share = sdsLens
+//	("realShare" +++ toString share.identifier)
+//	(const $ Just (dev, share.identifier))
+//	(SDSRead $ const $ \rs->case find ((==)dev) rs of
+//		Nothing = Error $ exception "Device doesn't exist anymore"
+//		Just {deviceShares} = case find ((==)share) deviceShares of
+//			Nothing = Error $ exception "Share doesn't exist anymore"
+//			Just share = Ok share.MTaskShare.value
+//	)
+//	(SDSWrite $ const $ \rs w->partition ((==)dev) devs of
+//		([], _) = Error $ exception "Device doesn't exist anymore"
+//		([_,_:_], _) = Error $ exception "Multiple matching devices"
+//		([d=:{deviceShares}], devs) = case partition ((==)share) deviceShares of
+//			([], _) = Error $ exception "Share doesn't exist anymore"
+//			([_,_:_], _) = Error $ exception "Multiple matching shares"
+//			([s], shares)
+//				# s = {MTaskShare | s & value=val}
+//				# d = {MTaskDevice | d & deviceShares=[s:shares]}
+//				= Ok $ Just [d:devs])
+//	(SDSNotify $ const $ \rs w
+
+deviceLens dev share = (mread, mwrite)
+where
+	mread :: [MTaskDevice] -> MaybeError TaskException BCValue
+	mread devs = case find ((==)dev) devs of
+		Nothing = Error $ exception "Device doesn't exist anymore"
+		Just {deviceShares} = case find ((==)share) deviceShares of
+			Nothing = Error $ exception "Share doesn't exist anymore"
+			Just share = Ok share.MTaskShare.value
+	
+	mwrite :: BCValue [MTaskDevice] -> MaybeError TaskException (Maybe [MTaskDevice])
+	mwrite val devs = case partition ((==)dev) devs of
+		([], _) = Error $ exception "Device doesn't exist anymore"
+		([_,_:_], _) = Error $ exception "Multiple matching devices"
+		([d=:{deviceShares}], devs) = case partition ((==)share) deviceShares of
+			([], _) = Error $ exception "Share doesn't exist anymore"
+			([_,_:_], _) = Error $ exception "Multiple matching shares"
+			([s], shares)
+				# s = {MTaskShare | s & value=val}
+				# d = {MTaskDevice | d & deviceShares=[s:shares]}
+				= Ok $ Just [d:devs]
+
+updateShareFromPublish :: MTaskDevice Int BCValue -> Task BCValue
+updateShareFromPublish dev ident val = set val 
+	$ mapReadWriteError (deviceLens dev dummy)
+	$ deviceStoreNP
+where
+	dummy = {MTaskShare|humanName="",value=BCValue 0,identifier=ident,withTask=[]}