From 95cc472037fcb3207b510e67f1a44af4e2a2cae9 Mon Sep 17 00:00:00 2001
From: Ellie Huxtable <ellie@elliehuxtable.com>
Date: Thu, 18 Apr 2024 16:41:28 +0100
Subject: chore: move crates into crates/ dir (#1958)

I'd like to tidy up the root a little, and it's nice to have all the
rust crates in one place
---
 atuin-client/src/import/resh.rs | 140 ----------------------------------------
 1 file changed, 140 deletions(-)
 delete mode 100644 atuin-client/src/import/resh.rs

(limited to 'atuin-client/src/import/resh.rs')

diff --git a/atuin-client/src/import/resh.rs b/atuin-client/src/import/resh.rs
deleted file mode 100644
index 396d11fd..00000000
--- a/atuin-client/src/import/resh.rs
+++ /dev/null
@@ -1,140 +0,0 @@
-use std::path::PathBuf;
-
-use async_trait::async_trait;
-use directories::UserDirs;
-use eyre::{eyre, Result};
-use serde::Deserialize;
-
-use atuin_common::utils::uuid_v7;
-use time::OffsetDateTime;
-
-use super::{get_histpath, unix_byte_lines, Importer, Loader};
-use crate::history::History;
-use crate::import::read_to_end;
-
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct ReshEntry {
-    pub cmd_line: String,
-    pub exit_code: i64,
-    pub shell: String,
-    pub uname: String,
-    pub session_id: String,
-    pub home: String,
-    pub lang: String,
-    pub lc_all: String,
-    pub login: String,
-    pub pwd: String,
-    pub pwd_after: String,
-    pub shell_env: String,
-    pub term: String,
-    pub real_pwd: String,
-    pub real_pwd_after: String,
-    pub pid: i64,
-    pub session_pid: i64,
-    pub host: String,
-    pub hosttype: String,
-    pub ostype: String,
-    pub machtype: String,
-    pub shlvl: i64,
-    pub timezone_before: String,
-    pub timezone_after: String,
-    pub realtime_before: f64,
-    pub realtime_after: f64,
-    pub realtime_before_local: f64,
-    pub realtime_after_local: f64,
-    pub realtime_duration: f64,
-    pub realtime_since_session_start: f64,
-    pub realtime_since_boot: f64,
-    pub git_dir: String,
-    pub git_real_dir: String,
-    pub git_origin_remote: String,
-    pub git_dir_after: String,
-    pub git_real_dir_after: String,
-    pub git_origin_remote_after: String,
-    pub machine_id: String,
-    pub os_release_id: String,
-    pub os_release_version_id: String,
-    pub os_release_id_like: String,
-    pub os_release_name: String,
-    pub os_release_pretty_name: String,
-    pub resh_uuid: String,
-    pub resh_version: String,
-    pub resh_revision: String,
-    pub parts_merged: bool,
-    pub recalled: bool,
-    pub recall_last_cmd_line: String,
-    pub cols: String,
-    pub lines: String,
-}
-
-#[derive(Debug)]
-pub struct Resh {
-    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(".resh_history.json"))
-}
-
-#[async_trait]
-impl Importer for Resh {
-    const NAME: &'static str = "resh";
-
-    async fn new() -> Result<Self> {
-        let bytes = read_to_end(get_histpath(default_histpath)?)?;
-        Ok(Self { bytes })
-    }
-
-    async fn entries(&mut self) -> Result<usize> {
-        Ok(super::count_lines(&self.bytes))
-    }
-
-    async fn load(self, h: &mut impl Loader) -> Result<()> {
-        for b in unix_byte_lines(&self.bytes) {
-            let s = match std::str::from_utf8(b) {
-                Ok(s) => s,
-                Err(_) => continue, // we can skip past things like invalid utf8
-            };
-            let entry = match serde_json::from_str::<ReshEntry>(s) {
-                Ok(e) => e,
-                Err(_) => continue, // skip invalid json :shrug:
-            };
-
-            #[allow(clippy::cast_possible_truncation)]
-            #[allow(clippy::cast_sign_loss)]
-            let timestamp = {
-                let secs = entry.realtime_before.floor() as i64;
-                let nanosecs = (entry.realtime_before.fract() * 1_000_000_000_f64).round() as i64;
-                OffsetDateTime::from_unix_timestamp(secs)? + time::Duration::nanoseconds(nanosecs)
-            };
-            #[allow(clippy::cast_possible_truncation)]
-            #[allow(clippy::cast_sign_loss)]
-            let duration = {
-                let secs = entry.realtime_after.floor() as i64;
-                let nanosecs = (entry.realtime_after.fract() * 1_000_000_000_f64).round() as i64;
-                let base = OffsetDateTime::from_unix_timestamp(secs)?
-                    + time::Duration::nanoseconds(nanosecs);
-                let difference = base - timestamp;
-                difference.whole_nanoseconds() as i64
-            };
-
-            let imported = History::import()
-                .command(entry.cmd_line)
-                .timestamp(timestamp)
-                .duration(duration)
-                .exit(entry.exit_code)
-                .cwd(entry.pwd)
-                .hostname(entry.host)
-                // CHECK: should we add uuid here? It's not set in the other importers
-                .session(uuid_v7().as_simple().to_string());
-
-            h.push(imported.build().into()).await?;
-        }
-
-        Ok(())
-    }
-}
-- 
cgit v1.3.1