Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qbar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jktr
qbar
Commits
9f3ef5ad
Commit
9f3ef5ad
authored
5 years ago
by
Jens Nolte
Browse files
Options
Downloads
Patches
Plain Diff
Remove old implementation of startPersistentBlockScript
parent
f5c04253
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/QBar/Core.hs
+2
-41
2 additions, 41 deletions
src/QBar/Core.hs
with
2 additions
and
41 deletions
src/QBar/Core.hs
+
2
−
41
View file @
9f3ef5ad
...
...
@@ -5,7 +5,7 @@ module QBar.Core where
import
QBar.BlockText
import
Control.Exception
(
catch
,
finally
,
IOException
)
import
Control.Exception
(
IOException
)
import
Control.Monad
(
forever
)
import
Control.Monad.Reader
(
ReaderT
,
runReaderT
,
ask
)
import
Control.Concurrent
(
threadDelay
)
...
...
@@ -27,7 +27,7 @@ import qualified Pipes.Prelude as PP
import
System.Exit
import
System.IO
import
System.Process.Typed
(
Process
,
shell
,
setStdin
,
setStdout
,
getStdout
,
closed
,
createPipe
,
withProcessWait
,
readProcessStdout
,
startProcess
,
stopProcess
)
getStdout
,
closed
,
createPipe
,
readProcessStdout
,
startProcess
,
stopProcess
)
import
Control.Lens
...
...
@@ -238,45 +238,6 @@ blockScript path = forever $ yield . Just =<< (lift blockScriptAction)
createScriptBlock
::
T
.
Text
->
BlockOutput
createScriptBlock
text
=
blockName
?~
T
.
pack
path
$
createBlock
.
pangoText
$
text
startPersistentBlockScript'
::
FilePath
->
CachedBlock
-- This is only using 'CachedBlock' because the code was already written and tested
-- This could probably be massively simplified by using the new 'pushBlock'
startPersistentBlockScript'
path
=
do
bar
<-
lift
askBar
do
(
output
,
input
,
seal
)
<-
liftIO
$
spawn'
$
latest
$
Nothing
initialDataEvent
<-
liftIO
Event
.
new
task
<-
liftIO
$
async
$
do
let
processConfig
=
setStdin
closed
$
setStdout
createPipe
$
shell
path
finally
(
catch
(
withProcessWait
processConfig
$
\
process
->
do
let
handle
=
getStdout
process
runEffect
$
fromHandle
bar
handle
>->
signalFirstBlock
initialDataEvent
>->
toOutput
output
)
(
\
e
->
-- output error
runEffect
$
yield
(
Just
.
createErrorBlock
$
"["
<>
T
.
pack
(
show
(
e
::
IOException
))
<>
"]"
)
>->
signalFirstBlock
initialDataEvent
>->
toOutput
output
)
)
(
atomically
seal
)
liftIO
$
link
task
liftIO
$
Event
.
wait
initialDataEvent
cacheFromInput
input
where
signalFirstBlock
::
Event
.
Event
->
Pipe
(
Maybe
BlockOutput
)
(
Maybe
BlockOutput
)
IO
()
signalFirstBlock
event
=
do
-- Await first block
await
>>=
yield
lift
$
Event
.
set
event
-- Replace with cat
cat
fromHandle
::
Bar
->
Handle
->
Producer
(
Maybe
BlockOutput
)
IO
()
fromHandle
bar
handle
=
forever
$
do
line
<-
lift
$
TIO
.
hGetLine
handle
yield
$
Just
.
createBlock
.
pangoText
$
line
lift
$
updateBar'
bar
startPersistentBlockScript
::
FilePath
->
PushBlock
-- The outer catchP only catches errors that occur during process creation
startPersistentBlockScript
path
=
catchP
startScriptProcess
handleError
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment