Ok bug fixes to my continuation model and rustfmt again

This commit is contained in:
QuantumEntangledAndy committed 2020-07-31 13:54:46 +07:00
1 parent 011a639356
commit 1f98cf517b
3 files changed
+11 -15

No files matched your search

+1 -5
View File
@@ -21,11 +21,7 @@ fn git_ver() -> Option<String> {
let mut git_cmd = Command::new("git");
git_cmd.args(&["describe", "--tags"]);
if let Some(true) = git_cmd
.status()
.ok()
.map(|exit| exit.success())
{
if let Some(true) = git_cmd.status().ok().map(|exit| exit.success()) {
println!("cargo:rerun-if-changed=.git/HEAD");
git_cmd
.output()
+3 -3
View File
@@ -174,7 +174,7 @@ fn bc_modern_msg<'a, 'b, 'c>(
// message).
context.in_bin_mode.insert(header.msg_id);
let binary_data = BinaryData {
let mut binary_data = BinaryData {
data: payload,
continuation_of: None,
};
@@ -191,13 +191,13 @@ fn bc_modern_msg<'a, 'b, 'c>(
&& context.remaining_binary_bytes >= body_size
{
if body_size == CHUNK_SIZE {
binaryData.continuation_of = Some(context.last_binary_kind);
binary_data.continuation_of = context.last_binary_kind;
context.remaining_binary_bytes -= body_size;
} else {
// Reset but suggest that this might be an unknown magic code
trace!(
"Possibly new magic code: {:x?}",
binary_data.body()[..std::cmp::min(body_size, 32)]
&binary_data.body()[..std::cmp::min(body_size, 32)]
);
context.remaining_binary_bytes = 0;
context.last_binary_kind = None;
+7 -7
View File
@@ -26,7 +26,7 @@ pub enum BcBody {
ModernMsg(ModernMsg),
}
#[derive(Debug, PartialEq, Eq, Hash)]
#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone)]
pub enum BinaryDataKind {
VideoDataIframe,
VideoDataPframe,
@@ -42,7 +42,7 @@ pub enum BinaryDataKind {
#[derive(Debug, PartialEq, Eq)]
pub struct BinaryData {
pub data: Vec<u8>,
continuation_of: Option<BinaryDataKind>,
pub continuation_of: Option<BinaryDataKind>,
}
impl BinaryData {
@@ -110,19 +110,19 @@ impl BinaryData {
const MAGIC_IFRAME: &[u8] = &[0x30, 0x30, 0x64, 0x63];
const MAGIC_PFRAME: &[u8] = &[0x30, 0x31, 0x64, 0x63];
if let Some(continuation_of) = self.continuation_of {
match continuation_of {
if let Some(continuation_of) = &self.continuation_of {
return match continuation_of {
BinaryDataKind::VideoDataIframe
| BinaryDataKind::VideoDataPframe
| BinaryDataKind::VideoCont => BinaryData::VideoCont,
| BinaryDataKind::VideoCont => BinaryDataKind::VideoCont,
BinaryDataKind::AudioDataAac
| BinaryDataKind::AudioDataAdpcm
| BinaryDataKind::AudioCont => BinaryData::AudioCont,
| BinaryDataKind::AudioCont => BinaryDataKind::AudioCont,
BinaryDataKind::InfoData | BinaryDataKind::InfoDataCont => {
BinaryDataKind::InfoDataCont
}
BinaryDataKind::Unknown => BinaryDataKind::Unknown,
}
};
}
let magic = &self.data[..4];