myriation/atuin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Noyez fix dir hostname utf8 (#430)

Browse source 
* Allow zsh_histdb import diretories and hostnames as utf-8

* Allow zsh_histdb import diretories and hostnames as utf-8

Co-authored-by: Bradley Noyes <b@noyes.dev>
This commit is contained in:
noyez 2022-06-05 16:35:46 -04:00 committed by GitHub
parent 3f5350dee6
commit 3c2b055039
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
atuin-client/src/import/zsh_histdb.rs
View file

@ -53,8 +53,8 @@ pub struct HistDbEntryCount {
pub struct HistDbEntry { pub struct HistDbEntry {
pub id: i64, pub id: i64,
pub start_time: NaiveDateTime, pub start_time: NaiveDateTime,
pub host: String, pub host: Vec<u8>,
pub dir: String, pub dir: Vec<u8>,
pub argv: Vec<u8>, pub argv: Vec<u8>,
pub duration: i64, pub duration: i64,
} }
@ -67,11 +67,19 @@ impl From<HistDbEntry> for History {
.unwrap_or_else(|_e| String::from("")) .unwrap_or_else(|_e| String::from(""))
.trim_end() .trim_end()
.to_string(), .to_string(),
histdb_item.dir, String::from_utf8(histdb_item.dir)
.unwrap_or_else(|_e| String::from(""))
.trim_end()
.to_string(),
0, // assume 0, we have no way of knowing :( 0, // assume 0, we have no way of knowing :(
histdb_item.duration, histdb_item.duration,
None, None,
Some(histdb_item.host), Some(
String::from_utf8(histdb_item.host)
.unwrap_or_else(|_e| String::from(""))
.trim_end()
.to_string(),
),
) )
} }
} }