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

Fix resh importer, and change error handling method (#82)

Browse source
This commit is contained in:
Jamie Quigley 2021-05-09 15:20:39 +01:00 committed by GitHub
parent c69f6ee3f9
commit 725ea9b16b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
atuin-client/src/import/resh.rs
View file

@ -2,54 +2,89 @@ use serde::Deserialize;
#[derive(Deserialize, Debug)] #[derive(Deserialize, Debug)]
pub struct ReshEntry { pub struct ReshEntry {
#[serde(rename = "cmdLine")]
pub cmd_line: String, pub cmd_line: String,
#[serde(rename = "exitCode")]
pub exit_code: i64, pub exit_code: i64,
pub shell: String, pub shell: String,
pub uname: String, pub uname: String,
#[serde(rename = "sessionId")]
pub session_id: String, pub session_id: String,
pub home: String, pub home: String,
pub lang: String, pub lang: String,
#[serde(rename = "lcAll")]
pub lc_all: String, pub lc_all: String,
pub login: String, pub login: String,
pub pwd: String, pub pwd: String,
#[serde(rename = "pwdAfter")]
pub pwd_after: String, pub pwd_after: String,
#[serde(rename = "shellEnv")]
pub shell_env: String, pub shell_env: String,
pub term: String, pub term: String,
#[serde(rename = "realPwd")]
pub real_pwd: String, pub real_pwd: String,
#[serde(rename = "realPwdAfter")]
pub real_pwd_after: String, pub real_pwd_after: String,
pub pid: i64, pub pid: i64,
#[serde(rename = "sessionPid")]
pub session_pid: i64, pub session_pid: i64,
pub host: String, pub host: String,
pub hosttype: String, pub hosttype: String,
pub ostype: String, pub ostype: String,
pub machtype: String, pub machtype: String,
pub shlvl: i64, pub shlvl: i64,
#[serde(rename = "timezoneBefore")]
pub timezone_before: String, pub timezone_before: String,
#[serde(rename = "timezoneAfter")]
pub timezone_after: String, pub timezone_after: String,
#[serde(rename = "realtimeBefore")]
pub realtime_before: f64, pub realtime_before: f64,
#[serde(rename = "realtimeAfter")]
pub realtime_after: f64, pub realtime_after: f64,
#[serde(rename = "realtimeBeforeLocal")]
pub realtime_before_local: f64, pub realtime_before_local: f64,
#[serde(rename = "realtimeAfterLocal")]
pub realtime_after_local: f64, pub realtime_after_local: f64,
#[serde(rename = "realtimeDuration")]
pub realtime_duration: f64, pub realtime_duration: f64,
#[serde(rename = "realtimeSinceSessionStart")]
pub realtime_since_session_start: f64, pub realtime_since_session_start: f64,
#[serde(rename = "realtimeSinceBoot")]
pub realtime_since_boot: f64, pub realtime_since_boot: f64,
#[serde(rename = "gitDir")]
pub git_dir: String, pub git_dir: String,
#[serde(rename = "gitRealDir")]
pub git_real_dir: String, pub git_real_dir: String,
#[serde(rename = "gitOriginRemote")]
pub git_origin_remote: String, pub git_origin_remote: String,
#[serde(rename = "gitDirAfter")]
pub git_dir_after: String, pub git_dir_after: String,
#[serde(rename = "gitRealDirAfter")]
pub git_real_dir_after: String, pub git_real_dir_after: String,
#[serde(rename = "gitOriginRemoteAfter")]
pub git_origin_remote_after: String, pub git_origin_remote_after: String,
#[serde(rename = "machineId")]
pub machine_id: String, pub machine_id: String,
#[serde(rename = "osReleaseId")]
pub os_release_id: String, pub os_release_id: String,
#[serde(rename = "osReleaseVersionId")]
pub os_release_version_id: String, pub os_release_version_id: String,
#[serde(rename = "osReleaseIdLike")]
pub os_release_id_like: String, pub os_release_id_like: String,
#[serde(rename = "osReleaseName")]
pub os_release_name: String, pub os_release_name: String,
#[serde(rename = "osReleasePrettyName")]
pub os_release_pretty_name: String, pub os_release_pretty_name: String,
#[serde(rename = "reshUuid")]
pub resh_uuid: String, pub resh_uuid: String,
#[serde(rename = "reshVersion")]
pub resh_version: String, pub resh_version: String,
#[serde(rename = "reshRevision")]
pub resh_revision: String, pub resh_revision: String,
#[serde(rename = "partsMerged")]
pub parts_merged: bool, pub parts_merged: bool,
pub recalled: bool, pub recalled: bool,
#[serde(rename = "recallLastCmdLine")]
pub recall_last_cmd_line: String, pub recall_last_cmd_line: String,
pub cols: String, pub cols: String,
pub lines: String, pub lines: String,

12
src/command/import.rs
View file

@ -78,7 +78,17 @@ async fn import_resh(db: &mut (impl Database + Send + Sync)) -> Result<()> {
.split('\n') .split('\n')
.map(str::trim) .map(str::trim)
.map(|x| serde_json::from_str::<ReshEntry>(x)) .map(|x| serde_json::from_str::<ReshEntry>(x))
.filter_map(Result::ok) .filter_map(|x| match x {
Ok(x) => Some(x),
Err(e) => {
if e.is_eof() {
None
} else {
warn!("Invalid entry found in resh_history file: {}", e);
None
}
}
})
.map(|x| { .map(|x| {
#[allow(clippy::cast_possible_truncation)] #[allow(clippy::cast_possible_truncation)]
#[allow(clippy::cast_sign_loss)] #[allow(clippy::cast_sign_loss)]