athaller/hstdb - Change AOO2RP56ASQ5DCMOR7LTSGSLVKLDYHJYQQHKOD5ULGLFJGEGLTRQC

Add session filtering (#7)

Flag --session was added which will only show entries for that session. Usefull to get commands that where executed after each other.

Created by Alexander Thaller on June 12, 2021

AOO2RP56ASQ5DCMOR7LTSGSLVKLDYHJYQQHKOD5ULGLFJGEGLTRQC

Dependencies

In channels

main

Change contents

Insertion in CHANGELOG.md at line 2 [6.1]

[6.14]

[5.0]


## 1.1.0 [UNRELEASED]
* Add flag `--session` which allows to filter entries by the given session. The
session of a history entry can be found using `--show-session`.

Replacement in src/main.rs at line 27 [8.9144]
B:BD[7.2589] → [7.2589:2615]
```
        error!("{}", err)
```
[7.2589]
[7.2615]
```
        error!("{}", err);
```

Insertion in src/opt.rs at line 206 [10.5920]

[9.184]

    /// Filter by given session
    #[structopt(long)]
    session: Option<Regex>,

Insertion in src/opt.rs at line 308 [10.5920]

[11.973]

        let session_filter = self.default_args.session;

Replacement in src/opt.rs at line 326 [10.5920]

B:BD[12.1203] → [12.1203:1256]

                    .command(command, command_text);

[12.1203]

[12.1256]

                    .command(command, command_text)
                    .session(session_filter);

Replacement in src/opt.rs at line 353 [10.5920]

B:BD[11.1938] → [11.1938:1998]

                SubCommand::SessionID => run::session_id(),

[11.1938]

[13.788]

                SubCommand::SessionID => {
                    run::session_id();
                    Ok(())
                }

Replacement in src/opt.rs at line 366 [10.5920]

B:BD[13.1105] → [14.679:728]

                SubCommand::Init => run::init(),

[13.1105]

[3.392]

                SubCommand::Init => {
                    run::init();
                    Ok(())
                }

Replacement in src/run/import.rs at line 37 [15.312]
B:BD[15.759] → [16.5763:5804]
```
    Server(#[from] server::ServerError),
```
[15.759]
[15.794]
```
    Server(#[from] server::Error),
```

Replacement in src/run/import.rs at line 68 [15.312]

B:BD[15.1503] → [15.1503:1557]

    #[error("accumulator for time finished is none")]

[15.1503]

[15.1557]

    #[error("accumulator fortime finished is none")]

Replacement in src/run/import.rs at line 244 [15.312]
B:BD[15.6943] → [15.6943:6958]
```
            })
```
[15.6943]
[15.6958]
```
            });
```
Replacement in src/run/import.rs at line 283 [15.312]
B:BD[15.8323] → [15.8323:8342]
```
                })
```
[15.8323]
[15.8342]
```
                });
```

Replacement in src/run/import.rs at line 289 [15.312]

B:BD[15.8490] → [15.8490:8562]

            panic!("line not starting with : and no multiline command")

[15.8490]

[15.8562]

            unreachable!("line not starting with : and no multiline command");

Replacement in src/run/import.rs at line 302 [15.312]
B:BD[15.8876] → [15.8876:8887]
```
        })
```
[15.8876]
[15.8887]
```
        });
```
Replacement in src/run/mod.rs at line 53 [17.1890]
B:BD[17.2484] → [16.5876:5917]
```
    Server(#[from] server::ServerError),
```
[17.2484]
[17.2524]
```
    Server(#[from] server::Error),
```
Replacement in src/run/mod.rs at line 152 [17.1890]
B:BD[12.3244] → [12.3244:3272]
```
        header.push("host")
```
[12.3244]
[12.3272]
```
        header.push("host");
```
Replacement in src/run/mod.rs at line 156 [17.1890]
B:BD[12.3316] → [12.3316:3348]
```
        header.push("duration")
```
[12.3316]
[12.3348]
```
        header.push("duration");
```
Replacement in src/run/mod.rs at line 160 [17.1890]
B:BD[12.3390] → [12.3390:3417]
```
        header.push("res")
```
[12.3390]
[12.3417]
```
        header.push("res");
```
Replacement in src/run/mod.rs at line 187 [17.1890]
B:BD[12.3832] → [12.3832:3869]
```
            row.push(entry.hostname)
```
[12.3832]
[12.3869]
```
            row.push(entry.hostname);
```

Replacement in src/run/mod.rs at line 191 [17.1890]

B:BD[12.3920] → [12.3920:3998]

            row.push(format_duration(entry.time_start, entry.time_finished)?)

[12.3920]

[12.3998]

            row.push(format_duration(entry.time_start, entry.time_finished)?);

Replacement in src/run/mod.rs at line 195 [17.1890]

B:BD[12.4047] → [12.4047:4097]

            row.push(format!("{}", entry.result))

[12.4047]

[12.4097]

            row.push(format!("{}", entry.result));

Replacement in src/run/mod.rs at line 224 [17.1890]

B:BD[12.4918] → [12.4918:4988]

        header.push(Cell::new("host").add_attribute(Attribute::Bold))

[12.4918]

[12.4988]

        header.push(Cell::new("host").add_attribute(Attribute::Bold));

Replacement in src/run/mod.rs at line 228 [17.1890]

B:BD[12.5032] → [12.5032:5106]

        header.push(Cell::new("duration").add_attribute(Attribute::Bold))

[12.5032]

[12.5106]

        header.push(Cell::new("duration").add_attribute(Attribute::Bold));

Replacement in src/run/mod.rs at line 232 [17.1890]

B:BD[12.5148] → [12.5148:5217]

        header.push(Cell::new("res").add_attribute(Attribute::Bold))

[12.5148]

[12.5217]

        header.push(Cell::new("res").add_attribute(Attribute::Bold));

Replacement in src/run/mod.rs at line 253 [17.1890]
B:BD[12.5718] → [12.5718:5755]
```
            row.push(entry.hostname)
```
[12.5718]
[12.5755]
```
            row.push(entry.hostname);
```

Replacement in src/run/mod.rs at line 257 [17.1890]

B:BD[12.5806] → [12.5806:5884]

            row.push(format_duration(entry.time_start, entry.time_finished)?)

[12.5806]

[12.5884]

            row.push(format_duration(entry.time_start, entry.time_finished)?);

Replacement in src/run/mod.rs at line 261 [17.1890]

B:BD[12.5933] → [12.5933:5983]

            row.push(format!("{}", entry.result))

[12.5933]

[12.5983]

            row.push(format!("{}", entry.result));

Replacement in src/run/mod.rs at line 325 [17.1890]
B:BD[17.6488] → [17.6488:6531]
```
pub fn session_id() -> Result<(), Error> {
```
[17.6488]
[17.6531]
```
pub fn session_id() {
```
Deletion in src/run/mod.rs at line 327 [17.1890]
B:BD[11.3031] → [14.729:741]
```
    Ok(())
```
Replacement in src/run/mod.rs at line 329 [17.1890]
B:BD[18.3331] → [14.744:781]
```
pub fn init() -> Result<(), Error> {
```
[18.3331]
[14.781]
```
pub fn init() {
```
Deletion in src/run/mod.rs at line 331 [17.1890]
B:BD[14.843] → [14.843:844]
∅:D[14.844] → [18.4020:4031]
B:BD[18.4020] → [18.4020:4031]
```
    Ok(())
```
Replacement in src/server/db.rs at line 84 [19.198]
B:BD[19.2418] → [19.2418:2453]
```
        self.remove_entry(&uuid)?;
```
[19.2418]
[19.2453]
```
        self.remove_entry(uuid)?;
```

Replacement in src/server/db.rs at line 104 [19.198]

B:BD[19.2905] → [19.2905:2988]

        let entry = bincode::deserialize(&data).map_err(Error::DeserializeEntry)?;

[19.2905]

[19.2988]

        let entry = bincode::deserialize(data).map_err(Error::DeserializeEntry)?;

Deletion in src/server/mod.rs at line 8 [16.7664]
B:BD[16.7761] → [19.3059:3089]
```
pub use Error as ServerError;
```

Replacement in src/server/mod.rs at line 169 [16.7664]

B:BD[19.6856] → [19.6856:6893]

                    warn!("{}", err)

[19.6856]

[19.6893]

                    warn!("{}", err);

Replacement in src/server/mod.rs at line 173 [16.7664]
B:BD[19.6926] → [19.6926:6955]
```
            drop(wait_group)
```
[19.6926]
[19.6955]
```
            drop(wait_group);
```

Replacement in src/server/mod.rs at line 208 [16.7664]

B:BD[2.159] → [2.159:196]

                    warn!("{}", err)

[2.159]

[19.7775]

                    warn!("{}", err);

Replacement in src/server/mod.rs at line 216 [16.7664]

B:BD[19.7934] → [19.7934:7971]

                    warn!("{}", err)

[19.7934]

[19.7971]

                    warn!("{}", err);

Replacement in src/server/mod.rs at line 220 [16.7664]
B:BD[19.8004] → [19.8004:8033]
```
            drop(wait_group)
```
[19.8004]
[19.8033]
```
            drop(wait_group);
```
Insertion in src/store/filter.rs at line 23 [12.6449]
[12.6956]
[12.6956]
```
    session: Option<Regex>,
```

Replacement in src/store/filter.rs at line 77 [12.6449]

B:BD[12.8181] → [12.8181:8266]

    pub fn filter_entries(&self, entries: Vec<Entry>) -> Result<Vec<Entry>, Error> {

[12.8181]

[4.0]

    pub fn filter_entries(&self, entries: Vec<Entry>) -> Vec<Entry> {

Insertion in src/store/filter.rs at line 99 [12.6449]

[12.9008]

[12.9134]

            .filter(|entry| {
                self.session
                    .as_ref()
                    .map_or(true, |regex| regex.is_match(&entry.session_id.to_string()))
            })

Replacement in src/store/filter.rs at line 107 [12.6449]

B:BD[4.72] → [4.72:172]

            let f = filtered.into_iter().rev().take(self.count).rev().collect();
            Ok(f)

[4.72]

[4.172]

            filtered.into_iter().rev().take(self.count).rev().collect()

Replacement in src/store/filter.rs at line 109 [12.6449]
B:BD[4.189] → [4.189:214]
```
            Ok(filtered)
```
[4.189]
[4.214]
```
            filtered
```

Insertion in src/store/filter.rs at line 113 [12.6449]

[20.156]

    pub fn session(self, session: Option<Regex>) -> Self {
        Self { session, ..self }
    }

Replacement in src/store/mod.rs at line 115 [22.10073]

B:BD[21.2474] → [12.9513:9568]

        let entries = filter.filter_entries(entries)?;

[21.2474]

[21.2545]

        let entries = filter.filter_entries(entries);

Add session filtering (#7)

Dependencies

In channels

Change contents

Insertion in CHANGELOG.md at line 2 [6.1]

Replacement in src/main.rs at line 27 [8.9144]

Insertion in src/opt.rs at line 206 [10.5920]

Insertion in src/opt.rs at line 308 [10.5920]

Replacement in src/opt.rs at line 326 [10.5920]

Replacement in src/opt.rs at line 353 [10.5920]

Replacement in src/opt.rs at line 366 [10.5920]

Replacement in src/run/import.rs at line 37 [15.312]

Replacement in src/run/import.rs at line 68 [15.312]

Replacement in src/run/import.rs at line 244 [15.312]

Replacement in src/run/import.rs at line 283 [15.312]

Replacement in src/run/import.rs at line 289 [15.312]

Replacement in src/run/import.rs at line 302 [15.312]

Replacement in src/run/mod.rs at line 53 [17.1890]

Replacement in src/run/mod.rs at line 152 [17.1890]

Replacement in src/run/mod.rs at line 156 [17.1890]

Replacement in src/run/mod.rs at line 160 [17.1890]

Replacement in src/run/mod.rs at line 187 [17.1890]

Replacement in src/run/mod.rs at line 191 [17.1890]

Replacement in src/run/mod.rs at line 195 [17.1890]

Replacement in src/run/mod.rs at line 224 [17.1890]

Replacement in src/run/mod.rs at line 228 [17.1890]

Replacement in src/run/mod.rs at line 232 [17.1890]

Replacement in src/run/mod.rs at line 253 [17.1890]

Replacement in src/run/mod.rs at line 257 [17.1890]

Replacement in src/run/mod.rs at line 261 [17.1890]

Replacement in src/run/mod.rs at line 325 [17.1890]

Deletion in src/run/mod.rs at line 327 [17.1890]

Replacement in src/run/mod.rs at line 329 [17.1890]

Deletion in src/run/mod.rs at line 331 [17.1890]

Replacement in src/server/db.rs at line 84 [19.198]

Replacement in src/server/db.rs at line 104 [19.198]

Deletion in src/server/mod.rs at line 8 [16.7664]

Replacement in src/server/mod.rs at line 169 [16.7664]

Replacement in src/server/mod.rs at line 173 [16.7664]