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

Prepare release v16.0.0 (#1143)

Browse source 
* Prepare release v16.0.0

* Remove debug output

* Fix kv dupes if the store already exists

* Add limit in frontend as well as sync backend
This commit is contained in:
Ellie Huxtable 2023-08-07 11:18:39 +01:00 committed by GitHub
parent 2b1d39e270
commit 0d5332a87f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cargo.lock generated
View file

@ -80,7 +80,7 @@ dependencies = [
[[package]]
name = "atuin"
version = "15.0.0"
version = "16.0.0"
dependencies = [
"async-trait",
"atuin-client",
@ -120,7 +120,7 @@ dependencies = [
[[package]]
name = "atuin-client"
version = "15.0.0"
version = "16.0.0"
dependencies = [
"async-trait",
"atuin-common",
@ -166,7 +166,7 @@ dependencies = [
[[package]]
name = "atuin-common"
version = "15.0.0"
version = "16.0.0"
dependencies = [
"chrono",
"eyre",
@ -180,7 +180,7 @@ dependencies = [
[[package]]
name = "atuin-server"
version = "15.0.0"
version = "16.0.0"
dependencies = [
"argon2",
"async-trait",
@ -208,7 +208,7 @@ dependencies = [
[[package]]
name = "atuin-server-database"
version = "15.0.0"
version = "16.0.0"
dependencies = [
"async-trait",
"atuin-common",
@ -222,7 +222,7 @@ dependencies = [
[[package]]
name = "atuin-server-postgres"
version = "15.0.0"
version = "16.0.0"
dependencies = [
"async-trait",
"atuin-common",

2
Cargo.toml
View file

@ -10,7 +10,7 @@ members = [
[workspace.package]
name = "atuin"
version = "15.0.0"
version = "16.0.0"
authors = ["Ellie Huxtable <ellie@elliehuxtable.com>"]
rust-version = "1.59"
license = "MIT"

2
atuin-client/Cargo.toml
View file

@ -23,7 +23,7 @@ sync = [
]
[dependencies]
atuin-common = { path = "../atuin-common", version = "15.0.0" }
atuin-common = { path = "../atuin-common", version = "16.0.0" }
log = { workspace = true }
base64 = { workspace = true }

3
atuin-client/src/encryption.rs
View file

@ -147,8 +147,7 @@ fn encode(h: &History) -> Result<Vec<u8>> {
encode::write_str(&mut output, &h.id)?;
encode::write_str(
&mut output,
&dbg!(h
.timestamp
&(h.timestamp
.to_rfc3339_opts(chrono::SecondsFormat::AutoSi, true)),
)?;
encode::write_sint(&mut output, h.duration)?;

8
atuin-client/src/kv.rs
View file

@ -7,6 +7,7 @@ use crate::settings::Settings;
const KV_VERSION: &str = "v0";
const KV_TAG: &str = "kv";
const KV_VAL_MAX_LEN: usize = 100 * 1024;
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct KvRecord {
@ -91,6 +92,13 @@ impl KvStore {
key: &str,
value: &str,
) -> Result<()> {
if value.len() > KV_VAL_MAX_LEN {
return Err(eyre!(
"kv value too large: max len {} bytes",
KV_VAL_MAX_LEN
));
}
let host_id = Settings::host_id().expect("failed to get host_id");
let record = KvRecord {

7
atuin-client/src/record/sync.rs
View file

@ -124,7 +124,12 @@ async fn sync_upload(
// we need to iterate from the remote tail, and keep going until
// remote tail = current local tail
let mut record = Some(store.get(start).await.unwrap());
let mut record = if current_tail.is_some() {
let r = store.get(start).await.unwrap();
store.next(&r).await?
} else {
Some(store.get(start).await.unwrap())
};
let mut buf = Vec::with_capacity(upload_page_size);

2
atuin-server-database/Cargo.toml
View file

@ -10,7 +10,7 @@ homepage = { workspace = true }
repository = { workspace = true }
[dependencies]
atuin-common = { path = "../atuin-common", version = "15.0.0" }
atuin-common = { path = "../atuin-common", version = "16.0.0" }
tracing = "0.1"
chrono = { workspace = true }

4
atuin-server-postgres/Cargo.toml
View file

@ -10,8 +10,8 @@ homepage = { workspace = true }
repository = { workspace = true }
[dependencies]
atuin-common = { path = "../atuin-common", version = "15.0.0" }
atuin-server-database = { path = "../atuin-server-database", version = "15.0.0" }
atuin-common = { path = "../atuin-common", version = "16.0.0" }
atuin-server-database = { path = "../atuin-server-database", version = "16.0.0" }
tracing = "0.1"
chrono = { workspace = true }

4
atuin-server/Cargo.toml
View file

@ -10,8 +10,8 @@ homepage = { workspace = true }
repository = { workspace = true }
[dependencies]
atuin-common = { path = "../atuin-common", version = "15.0.0" }
atuin-server-database = { path = "../atuin-server-database", version = "15.0.0" }
atuin-common = { path = "../atuin-common", version = "16.0.0" }
atuin-server-database = { path = "../atuin-server-database", version = "16.0.0" }
tracing = "0.1"
chrono = { workspace = true }

8
atuin/Cargo.toml
View file

@ -39,10 +39,10 @@ sync = ["atuin-client/sync"]
server = ["atuin-server", "atuin-server-postgres", "tracing-subscriber"]
[dependencies]
atuin-server-postgres = { path = "../atuin-server-postgres", version = "15.0.0", optional = true }
atuin-server = { path = "../atuin-server", version = "15.0.0", optional = true }
atuin-client = { path = "../atuin-client", version = "15.0.0", optional = true, default-features = false }
atuin-common = { path = "../atuin-common", version = "15.0.0" }
atuin-server-postgres = { path = "../atuin-server-postgres", version = "16.0.0", optional = true }
atuin-server = { path = "../atuin-server", version = "16.0.0", optional = true }
atuin-client = { path = "../atuin-client", version = "16.0.0", optional = true, default-features = false }
atuin-common = { path = "../atuin-common", version = "16.0.0" }
log = { workspace = true }
env_logger = "0.10.0"