-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #296 from jwodder/startup-script
Add `--startup-script` option
- Loading branch information
Showing
10 changed files
with
453 additions
and
138 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| use crate::util::InterfaceError; | ||
| use async_stream::stream; | ||
| use futures::stream::Stream; | ||
| use pin_project_lite::pin_project; | ||
| use rustyline_async::{Readline, ReadlineError, ReadlineEvent}; | ||
| use std::future::Future; | ||
| use std::pin::Pin; | ||
| use std::task::{ready, Context, Poll}; | ||
| use std::time::Duration; | ||
| use tokio::fs::File as TokioFile; | ||
| use tokio::io::{AsyncBufReadExt, BufReader, Lines}; | ||
| use tokio::time::{sleep, Sleep}; | ||
|
|
||
| #[derive(Clone, Debug, Eq, PartialEq)] | ||
| pub(crate) enum Input { | ||
| Line(String), | ||
| CtrlC, | ||
| } | ||
|
|
||
| pin_project! { | ||
| #[derive(Debug)] | ||
| pub(crate) struct StartupScript { | ||
| #[pin] | ||
| lines: Lines<BufReader<TokioFile>>, | ||
| #[pin] | ||
| nap: Option<Sleep>, | ||
| delay: Duration, | ||
| } | ||
| } | ||
|
|
||
| impl StartupScript { | ||
| pub(crate) fn new(reader: BufReader<TokioFile>, delay: Duration) -> StartupScript { | ||
| StartupScript { | ||
| lines: reader.lines(), | ||
| nap: None, | ||
| delay, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Stream for StartupScript { | ||
| type Item = Result<Input, InterfaceError>; | ||
|
|
||
| fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { | ||
| let mut this = self.project(); | ||
| if let Some(nap) = this.nap.as_mut().as_pin_mut() { | ||
| ready!(nap.poll(cx)); | ||
| this.nap.set(None); | ||
| } | ||
| let r = match ready!(this.lines.as_mut().poll_next_line(cx)) { | ||
| Ok(Some(line)) => Some(Ok(Input::Line(line))), | ||
| Ok(None) => None, | ||
| Err(e) => Some(Err(InterfaceError::ReadScript(e))), | ||
| }; | ||
| // TODO: Should the stream be forcibly fused when we're about to return | ||
| // None? | ||
| this.nap.set(Some(sleep(*this.delay))); | ||
| r.into() | ||
| } | ||
| } | ||
|
|
||
| #[allow(clippy::needless_pass_by_ref_mut)] // False positive | ||
| pub(crate) async fn readline_stream( | ||
| rl: &mut Readline, | ||
| ) -> impl Stream<Item = Result<Input, InterfaceError>> + Send + '_ { | ||
| stream! { | ||
| loop { | ||
| match rl.readline().await { | ||
| Ok(ReadlineEvent::Line(line)) => { | ||
| rl.add_history_entry(line.clone()); | ||
| yield Ok(Input::Line(line)); | ||
| } | ||
| Ok(ReadlineEvent::Eof) | Err(ReadlineError::Closed) => break, | ||
| Ok(ReadlineEvent::Interrupted) => yield Ok(Input::CtrlC), | ||
| Err(ReadlineError::IO(e)) => yield Err(InterfaceError::ReadLine(e)), | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.