MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-12-02 14:16:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

clippy

Browse Source
This commit is contained in:
Scott Lamb
2024-08-19 07:57:06 -07:00
parent dad664c244
commit 140f625a80
10 changed files with 36 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/db/check.rs
View File

@@ -309,7 +309,7 @@ fn compare_stream(
ctx: &mut Context,
) -> Result<bool, Error> {
let start = CompositeId::new(stream_id, 0);
let end = CompositeId::new(stream_id, i32::max_value());
let end = CompositeId::new(stream_id, i32::MAX);
let mut printed_error = false;
let cum_recordings = stream
.cum_recordings

2
server/db/recording.rs
View File

@@ -281,7 +281,7 @@ impl Segment {
// include it for consistency with the fast path. It'd be bizarre to have it included or
// not based on desired_media_range_90k.start.
let end_90k = if desired_media_range_90k.end == recording.media_duration_90k {
i32::max_value()
i32::MAX
} else {
desired_media_range_90k.end
};

51
server/db/signal.rs
View File

@@ -169,7 +169,7 @@ impl<'a> PointDataIterator<'a> {
msg("signal overflow: {} + {}", self.cur_signal, signal_delta)
)
})?;
if state > u16::max_value() as u32 {
if state > u32::from(u16::MAX) {
bail!(OutOfRange, msg("state overflow: {state}"));
}
self.cur_pos = p;
@@ -858,10 +858,9 @@ mod tests {
let mut conn = Connection::open_in_memory().unwrap();
db::init(&mut conn).unwrap();
let s = State::init(&conn, &GlobalConfig::default()).unwrap();
s.list_changes_by_time(
recording::Time::min_value()..recording::Time::max_value(),
&mut |_r| panic!("no changes expected"),
);
s.list_changes_by_time(recording::Time::MIN..recording::Time::MAX, &mut |_r| {
panic!("no changes expected")
});
}
#[test]
@@ -912,10 +911,9 @@ mod tests {
..Default::default()
};
let mut s = State::init(&conn, &config).unwrap();
s.list_changes_by_time(
recording::Time::min_value()..recording::Time::max_value(),
&mut |_r| panic!("no changes expected"),
);
s.list_changes_by_time(recording::Time::MIN..recording::Time::MAX, &mut |_r| {
panic!("no changes expected")
});
const START: recording::Time = recording::Time(140067462600000); // 2019-04-26T11:59:00
const NOW: recording::Time = recording::Time(140067468000000); // 2019-04-26T12:00:00
s.update_signals(START..NOW, &[1, 2], &[2, 1]).unwrap();
@@ -944,14 +942,12 @@ mod tests {
},
];
s.list_changes_by_time(
recording::Time::min_value()..recording::Time::max_value(),
&mut |r| rows.push(*r),
);
s.list_changes_by_time(
recording::Time::max_value()..recording::Time::min_value(),
&mut |_r| panic!("no changes expected"),
);
s.list_changes_by_time(recording::Time::MIN..recording::Time::MAX, &mut |r| {
rows.push(*r)
});
s.list_changes_by_time(recording::Time::MAX..recording::Time::MIN, &mut |_r| {
panic!("no changes expected")
});
assert_eq!(&rows[..], EXPECTED);
let mut expected_days = days::Map::default();
expected_days.0.insert(
@@ -979,10 +975,9 @@ mod tests {
drop(s);
let mut s = State::init(&conn, &config).unwrap();
rows.clear();
s.list_changes_by_time(
recording::Time::min_value()..recording::Time::max_value(),
&mut |r| rows.push(*r),
);
s.list_changes_by_time(recording::Time::MIN..recording::Time::MAX, &mut |r| {
rows.push(*r)
});
assert_eq!(&rows[..], EXPECTED);
// Go through it again. This time, hit the max number of signals, forcing START to be
@@ -1012,10 +1007,9 @@ mod tests {
state: 0,
},
];
s.list_changes_by_time(
recording::Time::min_value()..recording::Time::max_value(),
&mut |r| rows.push(*r),
);
s.list_changes_by_time(recording::Time::MIN..recording::Time::MAX, &mut |r| {
rows.push(*r)
});
assert_eq!(&rows[..], EXPECTED2);
{
@@ -1026,10 +1020,9 @@ mod tests {
drop(s);
let s = State::init(&conn, &config).unwrap();
rows.clear();
s.list_changes_by_time(
recording::Time::min_value()..recording::Time::max_value(),
&mut |r| rows.push(*r),
);
s.list_changes_by_time(recording::Time::MIN..recording::Time::MAX, &mut |r| {
rows.push(*r)
});
assert_eq!(&rows[..], EXPECTED2);
}
}

6
server/db/writer.rs
View File

@@ -730,9 +730,7 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Writer<'a, C, D> {
self.stream_id,
db::RecordingToInsert {
run_offset: prev.map(|p| p.run_offset + 1).unwrap_or(0),
start: prev
.map(|p| p.end)
.unwrap_or(recording::Time(i64::max_value())),
start: prev.map(|p| p.end).unwrap_or(recording::Time::MAX),
video_sample_entry_id,
flags: db::RecordingFlags::Growing as i32,
..Default::default()
@@ -749,7 +747,7 @@ impl<'a, C: Clocks + Clone, D: DirWriter> Writer<'a, C, D> {
e: recording::SampleIndexEncoder::default(),
id,
hasher: blake3::Hasher::new(),
local_start: recording::Time(i64::max_value()),
local_start: recording::Time::MAX,
unindexed_sample: None,
video_sample_entry_id,
});