athaller/hstdb - Change I5WVRUHGAQGWFZGX7YBKCGQKLHXZHZTCBWFIUCXVGY2WVFB77VQQC

Some cleanup of opt args and arg for entries count to display

Created by Alexander Thaller on September 25, 2020

I5WVRUHGAQGWFZGX7YBKCGQKLHXZHZTCBWFIUCXVGY2WVFB77VQQC

Dependencies

In channels

main

Change contents

Replacement in src/opt.rs at line 86 [3.5920]

B:BD[3.7289] → [2.290:349]

∅:D[2.349] → [4.60:190]

B:BD[4.60] → [4.60:190]

    /// Path to folder in which to store the history files
    #[structopt(
        short,
        long,
        default_value = into_str!(default_data_dir())
    )]
    data_dir: PathBuf,

[3.7289]

[4.190]

    #[structopt(flatten)]
    data_dir: DataDir,

Replacement in src/opt.rs at line 89 [3.5920]

B:BD[4.191] → [4.191:358]

    /// Path to the socket for communication with the server
    #[structopt(short, long, default_value = into_str!(default_socket_path()))]
    socket_path: PathBuf,

[4.191]

[4.358]

    #[structopt(flatten)]
    socket_path: Socket,

Insertion in src/opt.rs at line 102 [3.5920]
[3.7489]
[4.430]
```
    #[structopt(flatten)]
    data_dir: DataDir,
```

Replacement in src/opt.rs at line 106 [3.5920]

B:BD[4.431] → [2.385:444]

∅:D[2.444] → [4.491:621]

B:BD[4.491] → [4.491:621]

    /// Path to folder in which to store the history files
    #[structopt(
        short,
        long,
        default_value = into_str!(default_data_dir())
    )]
    data_dir: PathBuf,

[4.431]

[4.621]

    #[structopt(flatten)]
    socket_path: Socket,
}
#[derive(StructOpt, Debug)]
struct Import {
    #[structopt(flatten)]
    data_dir: DataDir,
    /// Path to the existing histdb sqlite file
    #[structopt(short, long, default_value = into_str!(default_histdb_sqlite_path()))]
    import_file: PathBuf,
}

Insertion in src/opt.rs at line 120 [3.5920]
[4.622]
[4.622]
```
#[derive(StructOpt, Debug)]
struct Socket {
```
Replacement in src/opt.rs at line 128 [3.5920]
B:BD[3.7520] → [3.7520:7536]
```
struct Import {
```
[3.7520]
[2.445]
```
struct DataDir {
```

Deletion in src/opt.rs at line 136 [3.5920]

B:BD[4.980] → [4.980:981]

B:BD[4.981] → [2.505:640]

∅:D[2.640] → [3.7615:7641]

B:BD[3.7615] → [3.7615:7641]


    /// Path to the existing histdb sqlite file
    #[structopt(short, long, default_value = into_str!(default_histdb_sqlite_path()))]
    import_file: PathBuf,

Replacement in src/opt.rs at line 139 [3.5920]

B:BD[3.7672] → [4.982:1165]

struct Socket {
    /// Path to the socket for communication with the server
    #[structopt(short, long, default_value = into_str!(default_socket_path()))]
    socket_path: PathBuf,

[3.7672]

[4.1165]

struct DefaultArgs {
    #[structopt(flatten)]
    data_dir: DataDir,
    /// How many entries to print
    #[structopt(short, long, default_value = "25")]
    entries_count: usize,

Replacement in src/opt.rs at line 184 [3.5920]

B:BD[3.8222] → [2.922:981]

∅:D[2.981] → [3.8282:8299]

B:BD[3.8282] → [3.8282:8299]

B:BD[3.8322] → [3.8322:8435]

    /// Path to folder in which to store the history files
    #[structopt(
        short,
        long,
        default_value = into_str!(default_data_dir())
    )]
    data_dir: PathBuf,

[3.8222]

[3.8618]

    #[structopt(flatten)]
    default_args: DefaultArgs,

Replacement in src/opt.rs at line 257 [3.5920]

B:BD[3.10068] → [4.1259:1460]

                SubCommand::ZSHAddHistory(o) => Self::run_zsh_add_history(o.command, o.socket_path),
                SubCommand::Server(o) => Self::run_server(o.cache_path, o.socket_path, o.data_dir),

[3.10068]

[4.1460]

                SubCommand::ZSHAddHistory(o) => {
                    Self::run_zsh_add_history(o.command, o.socket_path.socket_path)
                }
                SubCommand::Server(o) => {
                    Self::run_server(o.cache_path, o.socket_path.socket_path, o.data_dir.data_dir)
                }

Replacement in src/opt.rs at line 267 [3.5920]

B:BD[4.1681] → [4.1681:1767]

                SubCommand::Import(o) => Self::run_import(o.import_file, o.data_dir),

[4.1681]

[3.10730]

                SubCommand::Import(o) => Self::run_import(o.import_file, o.data_dir.data_dir),

Replacement in src/opt.rs at line 270 [3.5920]

B:BD[3.10746] → [3.10746:10800]

            None => Self::run_default(self.data_dir),

[3.10746]

[3.10800]

            None => Self::run_default(self.default_args),

Replacement in src/opt.rs at line 274 [3.5920]

B:BD[3.10817] → [3.10817:10878]

    fn run_default(data_dir: PathBuf) -> Result<(), Error> {

[3.10817]

[3.10878]

    fn run_default(args: DefaultArgs) -> Result<(), Error> {

Replacement in src/opt.rs at line 280 [3.5920]

B:BD[3.11017] → [3.11017:11099]

        let entries = store::new(data_dir).get_nth_entries(Some(&hostname), 25)?;

[3.11017]

[3.11099]

        let entries = store::new(args.data_dir.data_dir)
            .get_nth_entries(Some(&hostname), args.entries_count)?;