generated from PlexSheep/baserepo
hedu cli now works with 0 byte input streams
cargo devel CI / cargo CI (push) Successful in 2m0s
Details
cargo devel CI / cargo CI (push) Successful in 2m0s
Details
This commit is contained in:
parent
7e9d337005
commit
ca50a038da
|
@ -28,6 +28,7 @@ pub struct HeduConfig {
|
||||||
buf: [[u8; BYTES_PER_LINE]; 2],
|
buf: [[u8; BYTES_PER_LINE]; 2],
|
||||||
alt_buf: usize,
|
alt_buf: usize,
|
||||||
pub display_buf: String,
|
pub display_buf: String,
|
||||||
|
first_iter: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl HeduConfig {
|
impl HeduConfig {
|
||||||
|
@ -38,12 +39,13 @@ impl HeduConfig {
|
||||||
show_identical,
|
show_identical,
|
||||||
limit,
|
limit,
|
||||||
stop: false,
|
stop: false,
|
||||||
len: BYTES_PER_LINE,
|
len: 0,
|
||||||
data_idx: usize::MIN,
|
data_idx: 0,
|
||||||
rd_counter: usize::MIN,
|
rd_counter: 0,
|
||||||
buf: [[0; BYTES_PER_LINE]; 2],
|
buf: [[0; BYTES_PER_LINE]; 2],
|
||||||
alt_buf: 0,
|
alt_buf: 0,
|
||||||
display_buf: String::new(),
|
display_buf: String::new(),
|
||||||
|
first_iter: true,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[inline]
|
#[inline]
|
||||||
|
@ -102,9 +104,10 @@ pub fn dump(data: &mut dyn DataSource, config: &mut HeduConfig) -> Result<()> {
|
||||||
config.sep();
|
config.sep();
|
||||||
|
|
||||||
// data dump loop
|
// data dump loop
|
||||||
while config.len > 0 {
|
while config.len > 0 || config.first_iter {
|
||||||
config.display_buf += &format!("{:08X} {LINE_SEP_VERT} ", config.data_idx);
|
config.display_buf += &format!("{:08X} {LINE_SEP_VERT} ", config.data_idx);
|
||||||
rd_data(data, config)?;
|
rd_data(data, config)?;
|
||||||
|
if config.len != 0 && config.first_iter {
|
||||||
for i in 0..config.len {
|
for i in 0..config.len {
|
||||||
if i as usize % BYTES_PER_LINE == BYTES_PER_LINE / 2 {
|
if i as usize % BYTES_PER_LINE == BYTES_PER_LINE / 2 {
|
||||||
config.display_buf += " ";
|
config.display_buf += " ";
|
||||||
|
@ -120,18 +123,26 @@ pub fn dump(data: &mut dyn DataSource, config: &mut HeduConfig) -> Result<()> {
|
||||||
}
|
}
|
||||||
config.display_buf += " ";
|
config.display_buf += " ";
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
config.display_buf += &format!("(no data){:40}", "");
|
||||||
|
}
|
||||||
if config.chars {
|
if config.chars {
|
||||||
config.display_buf += &format!("{LINE_SEP_VERT} |");
|
config.display_buf += &format!("{LINE_SEP_VERT} ");
|
||||||
|
if config.len != 0 && config.first_iter {
|
||||||
|
config.display_buf += CHAR_BORDER;
|
||||||
for i in 0..config.len {
|
for i in 0..config.len {
|
||||||
config.display_buf +=
|
config.display_buf +=
|
||||||
&format!("{}", mask_chars(config.buf[config.alt_buf][i] as char));
|
&format!("{}", mask_chars(config.buf[config.alt_buf][i] as char));
|
||||||
}
|
}
|
||||||
config.display_buf += CHAR_BORDER;
|
config.display_buf += CHAR_BORDER;
|
||||||
|
} else {
|
||||||
|
config.display_buf += &format!("(no data)");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
config.display();
|
config.display();
|
||||||
|
|
||||||
// loop breaker logic
|
// loop breaker logic
|
||||||
if config.stop {
|
if config.stop || config.len == 0 {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,6 +171,7 @@ pub fn dump(data: &mut dyn DataSource, config: &mut HeduConfig) -> Result<()> {
|
||||||
"dumping buf after line skip"
|
"dumping buf after line skip"
|
||||||
);
|
);
|
||||||
config.display();
|
config.display();
|
||||||
|
config.first_iter = false;
|
||||||
}
|
}
|
||||||
// switch to the second half of the buf, the original half is stored the old buffer
|
// switch to the second half of the buf, the original half is stored the old buffer
|
||||||
// We detect duplicate lines with this
|
// We detect duplicate lines with this
|
||||||
|
|
|
@ -102,7 +102,7 @@ fn main() {
|
||||||
for data_source in &cli.data_source {
|
for data_source in &cli.data_source {
|
||||||
let data_source: PathBuf = PathBuf::from(data_source);
|
let data_source: PathBuf = PathBuf::from(data_source);
|
||||||
if !data_source.is_file() {
|
if !data_source.is_file() {
|
||||||
debug!("Not a regular file'{:?}'", data_source);
|
warn!("Not a regular file {:?}, skipping", data_source);
|
||||||
// std::process::exit(1);
|
// std::process::exit(1);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue