1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
|
use std::{fs::File, io::Read, path::PathBuf, str};
use async_trait::async_trait;
use chrono::{DateTime, Duration, NaiveDateTime, Utc};
use directories::UserDirs;
use eyre::{eyre, Result};
use itertools::Itertools;
use super::{get_histpath, unix_byte_lines, Importer, Loader};
use crate::history::History;
#[derive(Debug)]
pub struct Bash {
bytes: Vec<u8>,
}
fn default_histpath() -> Result<PathBuf> {
let user_dirs = UserDirs::new().ok_or_else(|| eyre!("could not find user directories"))?;
let home_dir = user_dirs.home_dir();
Ok(home_dir.join(".bash_history"))
}
#[async_trait]
impl Importer for Bash {
const NAME: &'static str = "bash";
async fn new() -> Result<Self> {
let mut bytes = Vec::new();
let path = get_histpath(default_histpath)?;
let mut f = File::open(path)?;
f.read_to_end(&mut bytes)?;
Ok(Self { bytes })
}
async fn entries(&mut self) -> Result<usize> {
let count = unix_byte_lines(&self.bytes)
.map(LineType::from)
.filter(|line| matches!(line, LineType::Command(_)))
.count();
Ok(count)
}
async fn load(self, h: &mut impl Loader) -> Result<()> {
let lines = unix_byte_lines(&self.bytes)
.map(LineType::from)
.filter(|line| !matches!(line, LineType::NotUtf8)) // invalid utf8 are ignored
.collect_vec();
let (commands_before_first_timestamp, first_timestamp) = lines
.iter()
.enumerate()
.find_map(|(i, line)| match line {
LineType::Timestamp(t) => Some((i, *t)),
_ => None,
})
// if no known timestamps, use now as base
.unwrap_or((lines.len(), Utc::now()));
// if no timestamp is recorded, then use this increment to set an arbitrary timestamp
// to preserve ordering
let timestamp_increment = Duration::seconds(1);
// make sure there is a minimum amount of time before the first known timestamp
// to fit all commands, given the default increment
let mut next_timestamp =
first_timestamp - timestamp_increment * commands_before_first_timestamp as i32;
for line in lines.into_iter() {
match line {
LineType::NotUtf8 => unreachable!(), // already filtered
LineType::Timestamp(t) => next_timestamp = t,
LineType::Command(c) => {
let entry = History::new(
next_timestamp,
c.into(),
"unknown".into(),
-1,
-1,
None,
None,
);
h.push(entry).await?;
next_timestamp += timestamp_increment;
}
}
}
Ok(())
}
}
#[derive(Debug, Clone)]
enum LineType<'a> {
NotUtf8,
/// A timestamp line start with a '#', followed immediately by an integer
/// that represents seconds since UNIX epoch.
Timestamp(DateTime<Utc>),
/// Anything that doesn't look like a timestamp.
Command(&'a str),
}
impl<'a> From<&'a [u8]> for LineType<'a> {
fn from(bytes: &'a [u8]) -> Self {
let Ok(line) = str::from_utf8(bytes) else {
return LineType::NotUtf8;
};
let parsed = match try_parse_line_as_timestamp(line) {
Some(time) => LineType::Timestamp(time),
None => LineType::Command(line),
};
parsed
}
}
fn try_parse_line_as_timestamp(line: &str) -> Option<DateTime<Utc>> {
let seconds = line.strip_prefix('#')?.parse().ok()?;
let time = NaiveDateTime::from_timestamp(seconds, 0);
Some(DateTime::from_utc(time, Utc))
}
#[cfg(test)]
mod test {
use std::cmp::Ordering;
use itertools::{assert_equal, Itertools};
use crate::import::{tests::TestLoader, Importer};
use super::Bash;
#[tokio::test]
async fn parse_no_timestamps() {
let bytes = r"cargo install atuin
cargo update
cargo :b̷i̶t̴r̵o̴t̴ ̵i̷s̴ ̷r̶e̵a̸l̷
"
.as_bytes()
.to_owned();
let mut bash = Bash { bytes };
assert_eq!(bash.entries().await.unwrap(), 3);
let mut loader = TestLoader::default();
bash.load(&mut loader).await.unwrap();
assert_equal(
loader.buf.iter().map(|h| h.command.as_str()),
[
"cargo install atuin",
"cargo update",
"cargo :b̷i̶t̴r̵o̴t̴ ̵i̷s̴ ̷r̶e̵a̸l̷",
],
);
assert!(is_strictly_sorted(
loader.buf.iter().map(|h| h.timestamp.timestamp())
))
}
#[tokio::test]
async fn parse_with_timestamps() {
let bytes = b"#1672918999
git reset
#1672919006
git clean -dxf
#1672919020
cd ../
"
.to_vec();
let mut bash = Bash { bytes };
assert_eq!(bash.entries().await.unwrap(), 3);
let mut loader = TestLoader::default();
bash.load(&mut loader).await.unwrap();
assert_equal(
loader.buf.iter().map(|h| h.command.as_str()),
["git reset", "git clean -dxf", "cd ../"],
);
assert_equal(
loader.buf.iter().map(|h| h.timestamp.timestamp()),
[1672918999, 1672919006, 1672919020],
)
}
#[tokio::test]
async fn parse_with_partial_timestamps() {
let bytes = b"git reset
#1672919006
git clean -dxf
cd ../
"
.to_vec();
let mut bash = Bash { bytes };
assert_eq!(bash.entries().await.unwrap(), 3);
let mut loader = TestLoader::default();
bash.load(&mut loader).await.unwrap();
assert_equal(
loader.buf.iter().map(|h| h.command.as_str()),
["git reset", "git clean -dxf", "cd ../"],
);
assert!(is_strictly_sorted(
loader.buf.iter().map(|h| h.timestamp.timestamp())
))
}
fn is_strictly_sorted<T>(iter: impl IntoIterator<Item = T>) -> bool
where
T: Clone + PartialOrd,
{
iter.into_iter()
.tuple_windows()
.all(|(a, b)| matches!(a.partial_cmp(&b), Some(Ordering::Less)))
}
}
|
