From 725ea9b16b1e3596b394fa7e47e02a9331de10cf Mon Sep 17 00:00:00 2001
From: Jamie Quigley <jamie@quigley.xyz>
Date: Sun, 9 May 2021 15:20:39 +0100
Subject: Fix resh importer, and change error handling method (#82)

---
 atuin-client/src/import/resh.rs | 35 +++++++++++++++++++++++++++++++++++
 src/command/import.rs           | 12 +++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/atuin-client/src/import/resh.rs b/atuin-client/src/import/resh.rs
index 07f02036..55c9da7f 100644
--- a/atuin-client/src/import/resh.rs
+++ b/atuin-client/src/import/resh.rs
@@ -2,54 +2,89 @@ use serde::Deserialize;
 
 #[derive(Deserialize, Debug)]
 pub struct ReshEntry {
+    #[serde(rename = "cmdLine")]
     pub cmd_line: String,
+    #[serde(rename = "exitCode")]
     pub exit_code: i64,
     pub shell: String,
     pub uname: String,
+    #[serde(rename = "sessionId")]
     pub session_id: String,
     pub home: String,
     pub lang: String,
+    #[serde(rename = "lcAll")]
     pub lc_all: String,
     pub login: String,
     pub pwd: String,
+    #[serde(rename = "pwdAfter")]
     pub pwd_after: String,
+    #[serde(rename = "shellEnv")]
     pub shell_env: String,
     pub term: String,
+    #[serde(rename = "realPwd")]
     pub real_pwd: String,
+    #[serde(rename = "realPwdAfter")]
     pub real_pwd_after: String,
     pub pid: i64,
+    #[serde(rename = "sessionPid")]
     pub session_pid: i64,
     pub host: String,
     pub hosttype: String,
     pub ostype: String,
     pub machtype: String,
     pub shlvl: i64,
+    #[serde(rename = "timezoneBefore")]
     pub timezone_before: String,
+    #[serde(rename = "timezoneAfter")]
     pub timezone_after: String,
+    #[serde(rename = "realtimeBefore")]
     pub realtime_before: f64,
+    #[serde(rename = "realtimeAfter")]
     pub realtime_after: f64,
+    #[serde(rename = "realtimeBeforeLocal")]
     pub realtime_before_local: f64,
+    #[serde(rename = "realtimeAfterLocal")]
     pub realtime_after_local: f64,
+    #[serde(rename = "realtimeDuration")]
     pub realtime_duration: f64,
+    #[serde(rename = "realtimeSinceSessionStart")]
     pub realtime_since_session_start: f64,
+    #[serde(rename = "realtimeSinceBoot")]
     pub realtime_since_boot: f64,
+    #[serde(rename = "gitDir")]
     pub git_dir: String,
+    #[serde(rename = "gitRealDir")]
     pub git_real_dir: String,
+    #[serde(rename = "gitOriginRemote")]
     pub git_origin_remote: String,
+    #[serde(rename = "gitDirAfter")]
     pub git_dir_after: String,
+    #[serde(rename = "gitRealDirAfter")]
     pub git_real_dir_after: String,
+    #[serde(rename = "gitOriginRemoteAfter")]
     pub git_origin_remote_after: String,
+    #[serde(rename = "machineId")]
     pub machine_id: String,
+    #[serde(rename = "osReleaseId")]
     pub os_release_id: String,
+    #[serde(rename = "osReleaseVersionId")]
     pub os_release_version_id: String,
+    #[serde(rename = "osReleaseIdLike")]
     pub os_release_id_like: String,
+    #[serde(rename = "osReleaseName")]
     pub os_release_name: String,
+    #[serde(rename = "osReleasePrettyName")]
     pub os_release_pretty_name: String,
+    #[serde(rename = "reshUuid")]
     pub resh_uuid: String,
+    #[serde(rename = "reshVersion")]
     pub resh_version: String,
+    #[serde(rename = "reshRevision")]
     pub resh_revision: String,
+    #[serde(rename = "partsMerged")]
     pub parts_merged: bool,
     pub recalled: bool,
+    #[serde(rename = "recallLastCmdLine")]
     pub recall_last_cmd_line: String,
     pub cols: String,
     pub lines: String,
diff --git a/src/command/import.rs b/src/command/import.rs
index c51e918f..9a0364da 100644
--- a/src/command/import.rs
+++ b/src/command/import.rs
@@ -78,7 +78,17 @@ async fn import_resh(db: &mut (impl Database + Send + Sync)) -> Result<()> {
         .split('\n')
         .map(str::trim)
         .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| {
             #[allow(clippy::cast_possible_truncation)]
             #[allow(clippy::cast_sign_loss)]
-- 
cgit v1.2.3