diff options
| author | Zeyla Hellyer <[email protected]> | 2017-05-22 17:02:00 -0700 |
|---|---|---|
| committer | Zeyla Hellyer <[email protected]> | 2017-05-22 17:02:00 -0700 |
| commit | 9969be60cf320797c37b317da24d9a08fd5eafa5 (patch) | |
| tree | f27bf7a57af95bbc11990b1edcea9cca99276964 /src/voice/threading.rs | |
| parent | Reasonably derive Debug on items (diff) | |
| download | serenity-9969be60cf320797c37b317da24d9a08fd5eafa5.tar.xz serenity-9969be60cf320797c37b317da24d9a08fd5eafa5.zip | |
Restructure modules
Modules are now separated into a fashion where the library can be used
for most use cases, without needing to compile the rest.
The core of serenity, with no features enabled, contains only the
struct (model) definitions, constants, and prelude. Models do not have
most functions compiled in, as that is separated into the `model`
feature.
The `client` module has been split into 3 modules: `client`, `gateway`,
and `http`.
`http` contains functions to interact with the REST API. `gateway`
contains the Shard to interact with the gateway, requiring `http` for
retrieving the gateway URL. `client` requires both of the other features
and acts as an abstracted interface over both the gateway and REST APIs,
handling the event loop.
The `builder` module has been separated from `utils`, and can now be
optionally compiled in. It and the `http` feature are required by the
`model` feature due to a large number of methods requiring access to
them.
`utils` now contains a number of utilities, such as the Colour struct, the
`MessageBuilder`, and mention parsing functions.
Each of the original `ext` modules are still featured, with `cache` not
requiring any feature to be enabled, `framework` requiring the `client`,
`model`, and `utils`, and `voice` requiring `gateway`.
In total the features and their requirements are:
- `builder`: none
- `cache`: none
- `client`: `gateway`, `http`
- `framework`: `client`, `model`, `utils`
- `gateway`: `http`
- `http`: none
- `model`: `builder`, `http`
- `utils`: none
- `voice`: `gateway`
The default features are `builder`, `cache`, `client`, `framework`,
`gateway`, `model`, `http`, and `utils`.
To help with forwards compatibility, modules have been re-exported from
their original locations.
Diffstat (limited to 'src/voice/threading.rs')
| -rw-r--r-- | src/voice/threading.rs | 94 |
1 files changed, 94 insertions, 0 deletions
diff --git a/src/voice/threading.rs b/src/voice/threading.rs new file mode 100644 index 0000000..4777231 --- /dev/null +++ b/src/voice/threading.rs @@ -0,0 +1,94 @@ +use std::sync::mpsc::{Receiver as MpscReceiver, TryRecvError}; +use std::thread::Builder as ThreadBuilder; +use super::connection::Connection; +use super::Status; +use ::internal::Timer; +use ::model::GuildId; + +pub fn start(guild_id: GuildId, rx: MpscReceiver<Status>) { + let name = format!("Serenity Voice (G{})", guild_id); + + ThreadBuilder::new() + .name(name) + .spawn(move || runner(&rx)) + .expect(&format!("[Voice] Error starting guild: {:?}", guild_id)); +} + +fn runner(rx: &MpscReceiver<Status>) { + let mut sender = None; + let mut receiver = None; + let mut connection = None; + let mut timer = Timer::new(20); + + 'runner: loop { + loop { + match rx.try_recv() { + Ok(Status::Connect(info)) => { + connection = match Connection::new(info) { + Ok(connection) => { + Some(connection) + }, + Err(why) => { + warn!("[Voice] Error connecting: {:?}", why); + + None + }, + }; + }, + Ok(Status::Disconnect) => { + connection = None; + }, + Ok(Status::SetReceiver(r)) => { + receiver = r; + }, + Ok(Status::SetSender(s)) => { + sender = s; + }, + Err(TryRecvError::Empty) => { + // If we receieved nothing, then we can perform an update. + break; + }, + Err(TryRecvError::Disconnected) => { + break 'runner; + }, + } + } + + // Overall here, check if there's an error. + // + // If there is a connection, try to send an update. This should not + // error. If there is though for some spurious reason, then set `error` + // to `true`. + // + // Otherwise, wait out the timer and do _not_ error and wait to receive + // another event. + let error = match connection.as_mut() { + Some(connection) => { + let cycle = connection.cycle(&mut sender, + &mut receiver, + &mut timer); + + match cycle { + Ok(()) => false, + Err(why) => { + error!("(╯°□°)╯︵ ┻━┻ Error updating connection: {:?}", + why); + + true + }, + } + }, + None => { + timer.await(); + + false + }, + }; + + // If there was an error, then just reset the connection and try to get + // another. + if error { + connection = None; + } + } +} |