2017-01-29 14:11:20 +00:00
|
|
|
use futures::future;
|
2017-01-20 12:56:42 +00:00
|
|
|
use futures::sink::BoxSink;
|
2017-01-29 14:11:20 +00:00
|
|
|
use futures::stream::BoxStream;
|
|
|
|
use futures::sync::{oneshot, mpsc};
|
|
|
|
use futures::{Future, Stream, Sink, Async, Poll, BoxFuture};
|
|
|
|
use protobuf::{self, Message};
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
use mercury::MercuryError;
|
2017-01-29 14:11:20 +00:00
|
|
|
use player::Player;
|
2016-03-17 03:31:57 +00:00
|
|
|
use session::Session;
|
2017-01-20 12:56:42 +00:00
|
|
|
use util::{now_ms, SpotifyId, SeqGenerator};
|
2016-03-17 03:31:57 +00:00
|
|
|
use version;
|
|
|
|
|
2016-01-27 10:40:00 +00:00
|
|
|
use protocol;
|
2017-01-29 14:11:20 +00:00
|
|
|
use protocol::spirc::{PlayStatus, State, MessageType, Frame, DeviceState};
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
pub struct SpircTask {
|
2016-01-20 14:11:49 +00:00
|
|
|
player: Player,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
sequence: SeqGenerator<u32>,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
|
|
|
ident: String,
|
2017-01-20 14:44:13 +00:00
|
|
|
device: DeviceState,
|
2017-01-29 14:11:20 +00:00
|
|
|
state: State,
|
2016-02-13 01:09:15 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
subscription: BoxStream<Frame, MercuryError>,
|
|
|
|
sender: BoxSink<Frame, MercuryError>,
|
|
|
|
commands: mpsc::UnboundedReceiver<SpircCommand>,
|
2017-01-29 14:11:20 +00:00
|
|
|
end_of_track: BoxFuture<(), oneshot::Canceled>,
|
2017-01-20 12:56:42 +00:00
|
|
|
|
|
|
|
shutdown: bool,
|
|
|
|
}
|
|
|
|
|
|
|
|
pub enum SpircCommand {
|
|
|
|
Shutdown
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct Spirc {
|
|
|
|
commands: mpsc::UnboundedSender<SpircCommand>,
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn initial_state() -> State {
|
|
|
|
protobuf_init!(protocol::spirc::State::new(), {
|
|
|
|
repeat: false,
|
|
|
|
shuffle: false,
|
|
|
|
|
|
|
|
status: PlayStatus::kPlayStatusStop,
|
|
|
|
position_ms: 0,
|
|
|
|
position_measured_at: 0,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2017-01-20 14:44:13 +00:00
|
|
|
fn initial_device_state(name: String, volume: u16) -> DeviceState {
|
|
|
|
protobuf_init!(DeviceState::new(), {
|
|
|
|
sw_version: version::version_string(),
|
|
|
|
is_active: false,
|
|
|
|
can_play: true,
|
|
|
|
volume: volume as u32,
|
|
|
|
name: name,
|
|
|
|
capabilities => [
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kCanBePlayer,
|
2017-01-29 14:11:20 +00:00
|
|
|
intValue => [1]
|
2017-01-20 14:44:13 +00:00
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kDeviceType,
|
|
|
|
intValue => [5]
|
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kGaiaEqConnectId,
|
|
|
|
intValue => [1]
|
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kSupportsLogout,
|
|
|
|
intValue => [0]
|
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kIsObservable,
|
|
|
|
intValue => [1]
|
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kVolumeSteps,
|
2017-02-09 01:33:52 +00:00
|
|
|
intValue => [64]
|
2017-01-20 14:44:13 +00:00
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kSupportedContexts,
|
|
|
|
stringValue => [
|
|
|
|
"album",
|
|
|
|
"playlist",
|
|
|
|
"search",
|
|
|
|
"inbox",
|
|
|
|
"toplist",
|
|
|
|
"starred",
|
|
|
|
"publishedstarred",
|
|
|
|
"track",
|
|
|
|
]
|
|
|
|
},
|
|
|
|
@{
|
|
|
|
typ: protocol::spirc::CapabilityType::kSupportedTypes,
|
|
|
|
stringValue => [
|
|
|
|
"audio/local",
|
|
|
|
"audio/track",
|
|
|
|
"local",
|
|
|
|
"track",
|
|
|
|
]
|
|
|
|
}
|
|
|
|
],
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
impl Spirc {
|
|
|
|
pub fn new(session: Session, player: Player) -> (Spirc, SpircTask) {
|
2016-03-17 03:06:56 +00:00
|
|
|
let ident = session.device_id().to_owned();
|
2017-01-18 18:41:22 +00:00
|
|
|
let name = session.config().name.clone();
|
2016-01-01 23:16:12 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
let uri = format!("hm://remote/user/{}", session.username());
|
|
|
|
|
|
|
|
let subscription = session.mercury().subscribe(&uri as &str);
|
|
|
|
let subscription = subscription.map(|stream| stream.map_err(|_| MercuryError)).flatten_stream();
|
|
|
|
let subscription = subscription.map(|response| -> Frame {
|
|
|
|
let data = response.payload.first().unwrap();
|
|
|
|
protobuf::parse_from_bytes(data).unwrap()
|
|
|
|
}).boxed();
|
|
|
|
|
|
|
|
let sender = Box::new(session.mercury().sender(uri).with(|frame: Frame| {
|
|
|
|
Ok(frame.write_to_bytes().unwrap())
|
|
|
|
}));
|
|
|
|
|
|
|
|
let (cmd_tx, cmd_rx) = mpsc::unbounded();
|
|
|
|
|
2017-01-20 14:44:13 +00:00
|
|
|
let volume = 0xFFFF;
|
|
|
|
let device = initial_device_state(name, volume);
|
|
|
|
player.volume(volume);
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
let mut task = SpircTask {
|
2016-01-20 14:11:49 +00:00
|
|
|
player: player,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
sequence: SeqGenerator::new(1),
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2016-01-01 23:16:12 +00:00
|
|
|
ident: ident,
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
device: device,
|
|
|
|
state: initial_state(),
|
2016-02-13 01:09:15 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
subscription: subscription,
|
|
|
|
sender: sender,
|
|
|
|
commands: cmd_rx,
|
2017-01-29 14:11:20 +00:00
|
|
|
end_of_track: future::empty().boxed(),
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
shutdown: false,
|
2016-01-20 15:47:05 +00:00
|
|
|
};
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
let spirc = Spirc {
|
|
|
|
commands: cmd_tx,
|
|
|
|
};
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
task.hello();
|
2016-02-16 21:26:51 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
(spirc, task)
|
2016-02-16 21:26:51 +00:00
|
|
|
}
|
2016-02-16 21:52:55 +00:00
|
|
|
|
2017-01-29 16:25:09 +00:00
|
|
|
pub fn shutdown(&self) {
|
2017-01-31 08:21:30 +00:00
|
|
|
let _ = mpsc::UnboundedSender::send(&self.commands, SpircCommand::Shutdown);
|
2016-02-16 21:52:55 +00:00
|
|
|
}
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
2016-02-16 21:52:55 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
impl Future for SpircTask {
|
|
|
|
type Item = ();
|
|
|
|
type Error = ();
|
|
|
|
|
|
|
|
fn poll(&mut self) -> Poll<(), ()> {
|
|
|
|
loop {
|
|
|
|
let mut progress = false;
|
|
|
|
|
|
|
|
if !self.shutdown {
|
|
|
|
match self.subscription.poll().unwrap() {
|
|
|
|
Async::Ready(Some(frame)) => {
|
|
|
|
progress = true;
|
|
|
|
self.handle_frame(frame);
|
|
|
|
}
|
|
|
|
Async::Ready(None) => panic!("subscription terminated"),
|
|
|
|
Async::NotReady => (),
|
|
|
|
}
|
2016-02-16 21:52:55 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
match self.commands.poll().unwrap() {
|
|
|
|
Async::Ready(Some(command)) => {
|
|
|
|
progress = true;
|
|
|
|
self.handle_command(command);
|
|
|
|
}
|
|
|
|
Async::Ready(None) => (),
|
|
|
|
Async::NotReady => (),
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
match self.end_of_track.poll() {
|
|
|
|
Ok(Async::Ready(())) => {
|
|
|
|
progress = true;
|
|
|
|
self.handle_end_of_track();
|
|
|
|
}
|
|
|
|
Ok(Async::NotReady) => (),
|
|
|
|
Err(oneshot::Canceled) => {
|
|
|
|
self.end_of_track = future::empty().boxed()
|
|
|
|
}
|
|
|
|
}
|
2017-01-20 12:56:42 +00:00
|
|
|
}
|
2016-02-17 14:24:40 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
let poll_sender = self.sender.poll_complete().unwrap();
|
2016-02-17 19:35:31 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
// Only shutdown once we've flushed out all our messages
|
|
|
|
if self.shutdown && poll_sender.is_ready() {
|
|
|
|
return Ok(Async::Ready(()));
|
|
|
|
}
|
2016-02-17 19:35:52 +00:00
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
if !progress {
|
|
|
|
return Ok(Async::NotReady);
|
|
|
|
}
|
|
|
|
}
|
2016-02-17 19:35:52 +00:00
|
|
|
}
|
2016-01-20 15:47:05 +00:00
|
|
|
}
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
impl SpircTask {
|
|
|
|
fn handle_command(&mut self, cmd: SpircCommand) {
|
|
|
|
match cmd {
|
|
|
|
SpircCommand::Shutdown => {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeGoodbye).send();
|
|
|
|
self.shutdown = true;
|
|
|
|
self.commands.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_frame(&mut self, frame: Frame) {
|
|
|
|
debug!("{:?} {:?} {} {} {}",
|
|
|
|
frame.get_typ(),
|
|
|
|
frame.get_device_state().get_name(),
|
|
|
|
frame.get_ident(),
|
|
|
|
frame.get_seq_nr(),
|
|
|
|
frame.get_state_update_id());
|
|
|
|
|
2016-01-20 15:47:05 +00:00
|
|
|
if frame.get_ident() == self.ident ||
|
|
|
|
(frame.get_recipient().len() > 0 && !frame.get_recipient().contains(&self.ident)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-07-08 19:50:44 +00:00
|
|
|
match frame.get_typ() {
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeHello => {
|
2017-01-29 14:11:20 +00:00
|
|
|
self.notify(Some(frame.get_ident()));
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeLoad => {
|
2017-01-20 14:44:13 +00:00
|
|
|
if !self.device.get_is_active() {
|
|
|
|
self.device.set_is_active(true);
|
|
|
|
self.device.set_became_active_at(now_ms());
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
self.update_tracks(&frame);
|
|
|
|
|
|
|
|
if self.state.get_track().len() > 0 {
|
|
|
|
self.state.set_position_ms(frame.get_state().get_position_ms());
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
|
2016-08-23 21:43:55 +00:00
|
|
|
let play = frame.get_state().get_status() == PlayStatus::kPlayStatusPlay;
|
2017-01-29 14:11:20 +00:00
|
|
|
self.load_track(play);
|
2016-08-23 21:43:55 +00:00
|
|
|
} else {
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
2016-08-23 21:43:55 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
self.notify(None);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypePlay => {
|
2017-01-29 14:11:20 +00:00
|
|
|
if self.state.get_status() == PlayStatus::kPlayStatusPause {
|
|
|
|
self.player.play();
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPlay);
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
}
|
|
|
|
|
|
|
|
self.notify(None);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypePause => {
|
2017-01-29 14:11:20 +00:00
|
|
|
if self.state.get_status() == PlayStatus::kPlayStatusPlay {
|
|
|
|
self.player.pause();
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPause);
|
|
|
|
|
|
|
|
let now = now_ms() as u64;
|
|
|
|
let position = self.state.get_position_ms();
|
|
|
|
|
|
|
|
let diff = now - self.state.get_position_measured_at();
|
|
|
|
|
|
|
|
self.state.set_position_ms(position + diff as u32);
|
|
|
|
self.state.set_position_measured_at(now);
|
|
|
|
}
|
|
|
|
|
|
|
|
self.notify(None);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeNext => {
|
2017-01-29 14:11:20 +00:00
|
|
|
let current_index = self.state.get_playing_track_index();
|
|
|
|
let new_index = (current_index + 1) % (self.state.get_track().len() as u32);
|
|
|
|
|
|
|
|
self.state.set_playing_track_index(new_index);
|
|
|
|
self.state.set_position_ms(0);
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
|
|
|
|
self.load_track(true);
|
|
|
|
self.notify(None);
|
2016-01-14 03:27:34 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypePrev => {
|
2017-01-29 14:11:20 +00:00
|
|
|
// Previous behaves differently based on the position
|
|
|
|
// Under 3s it goes to the previous song
|
|
|
|
// Over 3s it seeks to zero
|
|
|
|
if self.position() < 3000 {
|
|
|
|
let current_index = self.state.get_playing_track_index();
|
2017-01-29 16:25:09 +00:00
|
|
|
|
|
|
|
let new_index = if current_index == 0 {
|
|
|
|
self.state.get_track().len() as u32 - 1
|
|
|
|
} else {
|
|
|
|
current_index - 1
|
|
|
|
};
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
self.state.set_playing_track_index(new_index);
|
|
|
|
self.state.set_position_ms(0);
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
|
|
|
|
self.load_track(true);
|
|
|
|
} else {
|
|
|
|
self.state.set_position_ms(0);
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
self.player.seek(0);
|
|
|
|
}
|
|
|
|
self.notify(None);
|
2016-01-14 03:27:34 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeSeek => {
|
2017-01-29 14:11:20 +00:00
|
|
|
let position = frame.get_position();
|
|
|
|
|
|
|
|
self.state.set_position_ms(position);
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
self.player.seek(position);
|
|
|
|
self.notify(None);
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeReplace => {
|
2017-01-29 14:11:20 +00:00
|
|
|
self.update_tracks(&frame);
|
|
|
|
self.notify(None);
|
2016-01-16 01:15:24 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
MessageType::kMessageTypeVolume => {
|
|
|
|
let volume = frame.get_volume();
|
|
|
|
self.device.set_volume(volume);
|
|
|
|
self.player.volume(volume as u16);
|
|
|
|
self.notify(None);
|
|
|
|
}
|
|
|
|
|
2016-02-18 23:02:41 +00:00
|
|
|
MessageType::kMessageTypeNotify => {
|
2017-01-29 14:11:20 +00:00
|
|
|
if self.device.get_is_active() &&
|
|
|
|
frame.get_device_state().get_is_active()
|
|
|
|
{
|
2017-01-20 14:44:13 +00:00
|
|
|
self.device.set_is_active(false);
|
2017-01-29 14:11:20 +00:00
|
|
|
self.state.set_status(PlayStatus::kPlayStatusStop);
|
2016-01-20 14:11:49 +00:00
|
|
|
self.player.stop();
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2016-01-02 15:19:39 +00:00
|
|
|
_ => (),
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn handle_end_of_track(&mut self) {
|
|
|
|
let current_index = self.state.get_playing_track_index();
|
|
|
|
let new_index = (current_index + 1) % (self.state.get_track().len() as u32);
|
|
|
|
|
|
|
|
self.state.set_playing_track_index(new_index);
|
|
|
|
self.state.set_position_ms(0);
|
|
|
|
self.state.set_position_measured_at(now_ms() as u64);
|
|
|
|
|
|
|
|
self.load_track(true);
|
|
|
|
self.notify(None);
|
2016-01-20 13:51:35 +00:00
|
|
|
}
|
2016-01-20 15:47:05 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn position(&mut self) -> u32 {
|
|
|
|
let diff = now_ms() as u64 - self.state.get_position_measured_at();
|
|
|
|
self.state.get_position_ms() + diff as u32
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 16:25:09 +00:00
|
|
|
fn update_tracks(&mut self, frame: &protocol::spirc::Frame) {
|
2017-01-29 14:11:20 +00:00
|
|
|
let index = frame.get_state().get_playing_track_index();
|
|
|
|
let tracks = frame.get_state().get_track();
|
|
|
|
|
|
|
|
self.state.set_playing_track_index(index);
|
2017-01-29 16:25:09 +00:00
|
|
|
self.state.set_track(tracks.into_iter().cloned().collect());
|
2016-01-20 15:47:05 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn load_track(&mut self, play: bool) {
|
|
|
|
let index = self.state.get_playing_track_index();
|
|
|
|
let track = {
|
|
|
|
let gid = self.state.get_track()[index as usize].get_gid();
|
|
|
|
SpotifyId::from_raw(gid)
|
|
|
|
};
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
let position = self.state.get_position_ms();
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
let end_of_track = self.player.load(track, play, position);
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 16:25:09 +00:00
|
|
|
if play {
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPlay);
|
|
|
|
} else {
|
|
|
|
self.state.set_status(PlayStatus::kPlayStatusPause);
|
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
self.end_of_track = end_of_track.boxed();
|
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn hello(&mut self) {
|
|
|
|
CommandSender::new(self, MessageType::kMessageTypeHello).send();
|
|
|
|
}
|
2015-07-08 19:50:44 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn notify(&mut self, recipient: Option<&str>) {
|
|
|
|
let mut cs = CommandSender::new(self, MessageType::kMessageTypeNotify);
|
|
|
|
if let Some(s) = recipient {
|
|
|
|
cs = cs.recipient(&s);
|
|
|
|
}
|
|
|
|
cs.send();
|
|
|
|
}
|
|
|
|
|
|
|
|
fn spirc_state(&self) -> protocol::spirc::State {
|
|
|
|
self.state.clone()
|
2015-07-08 19:50:44 +00:00
|
|
|
}
|
|
|
|
}
|
2016-02-16 21:25:55 +00:00
|
|
|
|
2016-02-17 14:24:40 +00:00
|
|
|
struct CommandSender<'a> {
|
2017-01-20 12:56:42 +00:00
|
|
|
spirc: &'a mut SpircTask,
|
2016-02-18 23:02:41 +00:00
|
|
|
cmd: MessageType,
|
2017-01-29 14:11:20 +00:00
|
|
|
recipient: Option<String>,
|
2016-02-17 14:24:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> CommandSender<'a> {
|
2017-01-20 12:56:42 +00:00
|
|
|
fn new(spirc: &'a mut SpircTask, cmd: MessageType) -> CommandSender {
|
2016-02-17 14:24:40 +00:00
|
|
|
CommandSender {
|
2017-01-20 12:56:42 +00:00
|
|
|
spirc: spirc,
|
2016-02-17 14:24:40 +00:00
|
|
|
cmd: cmd,
|
|
|
|
recipient: None,
|
2016-02-16 21:25:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn recipient(mut self, r: &str) -> CommandSender<'a> {
|
|
|
|
self.recipient = Some(r.to_owned());
|
2016-02-17 14:24:40 +00:00
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
fn send(self) {
|
2017-01-20 12:56:42 +00:00
|
|
|
let mut frame = protobuf_init!(Frame::new(), {
|
2016-02-17 14:24:40 +00:00
|
|
|
version: 1,
|
2017-01-20 12:56:42 +00:00
|
|
|
ident: self.spirc.ident.clone(),
|
2016-02-22 05:48:58 +00:00
|
|
|
protocol_version: "2.0.0",
|
2017-01-20 12:56:42 +00:00
|
|
|
seq_nr: self.spirc.sequence.get(),
|
2016-02-17 14:24:40 +00:00
|
|
|
typ: self.cmd,
|
2017-01-20 14:44:13 +00:00
|
|
|
device_state: self.spirc.device.clone(),
|
2017-01-29 14:11:20 +00:00
|
|
|
state_update_id: now_ms(),
|
2016-02-17 14:24:40 +00:00
|
|
|
});
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
if let Some(recipient) = self.recipient {
|
|
|
|
frame.mut_recipient().push(recipient.to_owned());
|
|
|
|
}
|
|
|
|
|
2017-01-20 14:44:13 +00:00
|
|
|
if self.spirc.device.get_is_active() {
|
2017-01-29 14:11:20 +00:00
|
|
|
frame.set_state(self.spirc.spirc_state());
|
2016-02-17 14:24:40 +00:00
|
|
|
}
|
|
|
|
|
2017-01-20 12:56:42 +00:00
|
|
|
let ready = self.spirc.sender.start_send(frame).unwrap().is_ready();
|
|
|
|
assert!(ready);
|
2016-02-17 14:24:40 +00:00
|
|
|
}
|
2016-02-16 21:25:55 +00:00
|
|
|
}
|