hunk ./JuicyBar/Input/CPU.hs 2 -module JuicyBar.Input.CPU where +module JuicyBar.Input.CPU (getCpu, cpuColor) where hunk ./JuicyBar/Input/CPU.hs 16 -getCpuLoad :: IO Float -getCpuLoad = do +produceCpu :: IO Float +produceCpu = do hunk ./JuicyBar/Input/CPU.hs 23 -makeCPU :: Circuit era () (CSignal era Float) -makeCPU = Signal.produce $ CSignal.producer getCpuLoad +getCpu :: Circuit era () (CSignal era Float) +getCpu = Signal.produce $ CSignal.producer produceCpu hunk ./JuicyBar/Input/CPU.hs 26 ---cpu :: Circuit era () ((X :& Text ::: CSignal `Of` String :& Color ::: CSignal `Of` Gtk.Color) (SignalStyle era)) ---cpu :: Circuit era () ((X :& Text ::: String :& Color ::: Gtk.Color) (CSignal era)) -cpu :: (CSignal era String ~ Value style stringSort - ,CSignal era Gtk.Color ~ Value style colorSort) - => Circuit era () ((X :& Text ::: stringSort :& Color ::: colorSort) style) +cpuColor :: (Fractional a, Ord a) => a -> Gtk.Color hunk ./JuicyBar/Input/CPU.hs 28 -cpu = proc () -> do - cpu <- makeCPU -< () - let color c = if c < 0.5 then Gtk.Color 0 0 0 else Gtk.Color 50000 0 0 - returnA -< X :& Text := show <$> cpu :& Color := color <$> cpu hunk ./JuicyBar/Input/Command.hs 2 -module JuicyBar.Input.Command (makeCommandRunner) where +module JuicyBar.Input.Command (getCommandOutput) where hunk ./JuicyBar/Input/Command.hs 10 -runCmd :: String -> IO String -runCmd cmd = do +produceCommandOutput :: String -> IO String +produceCommandOutput cmd = do hunk ./JuicyBar/Input/Command.hs 17 -makeCommandRunner :: Circuit era String (CSignal era String) -makeCommandRunner = proc cmd -> produce $ CSignal.producer $ runCmd cmd -<< () +getCommandOutput :: Circuit era String (CSignal era String) +getCommandOutput = proc cmd -> produce $ CSignal.producer $ produceCommandOutput cmd -<< () hunk ./JuicyBar/Input/Date.hs 2 -module JuicyBar.Input.Date (makeDate) where +module JuicyBar.Input.Date (getDate) where hunk ./JuicyBar/Input/Date.hs 12 -getDate :: String -> IO String -getDate format = do +produceDate :: String -> IO String +produceDate format = do hunk ./JuicyBar/Input/Date.hs 16 -makeDate :: Circuit era String (CSignal era String) -makeDate = proc format -> do - signal <- produce $ CSignal.producer $ getDate format -<< () +getDate :: Circuit era String (CSignal era String) +getDate = proc format -> do + signal <- produce $ CSignal.producer $ produceDate format -<< () hunk ./JuicyBar/Input/Pipe.hs 2 -module JuicyBar.Input.Pipe (makePipeReader) where +module JuicyBar.Input.Pipe (readPipe) where hunk ./JuicyBar/Input/Pipe.hs 19 -makePipeReader :: Circuit era FilePath (DSignal era String) -makePipeReader = proc path -> do +readPipe :: Circuit era FilePath (DSignal era String) +readPipe = proc path -> do hunk ./JuicyBar/Input/Stdin.hs 1 -module JuicyBar.Input.Stdin (makeStdinReader) where +module JuicyBar.Input.Stdin (readStdin) where hunk ./JuicyBar/Input/Stdin.hs 20 -makeStdinReader :: Circuit era () (SSignal era String) -makeStdinReader = arr (construct "") <<< produce (DSignal.producer registerStdinReader) +readStdin :: Circuit era () (SSignal era String) +readStdin = arr (construct "") <<< produce (DSignal.producer registerStdinReader) hunk ./JuicyBar.hs 30 - cpu <- fromCircuit makeCPU -< () + cpu <- fromCircuit getCpu -< () hunk ./JuicyBar.hs 33 - time <- fromCircuit $ sampleAt 1000 <<< makeDate -< "%H:%M:%S" - date <- fromCircuit $ sampleAt 10000 <<< makeDate -< "%a %b %d %Y" + time <- fromCircuit $ sampleAt 1000 <<< getDate -< "%H:%M:%S" + date <- fromCircuit $ sampleAt 10000 <<< getDate -< "%a %b %d %Y" hunk ./JuicyBar.hs 38 - cmdRun <- fromCircuit $ sampleAt 600000 <<< makeCommandRunner -< "df -h | tail -n 1 | awk '{print $4 }'" - X <- just label -< X :& Text := cmdRun - stdin <- fromCircuit makeStdinReader -< () + freeDiskSpace <- fromCircuit $ sampleAt 600000 <<< getCommandOutput -< "df -h | tail -n 1 | awk '{print $4 }'" + X <- just label -< X :& Text := freeDiskSpace + + stdin <- fromCircuit readStdin -< ()