Compare commits

..

1 Commits

Author SHA1 Message Date
cuddle-please
00d155251b chore(release): 0.4.1
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2024-12-11 05:36:21 +00:00
4 changed files with 10 additions and 31 deletions

View File

@ -6,10 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased] ## [Unreleased]
## [0.5.0] - 2024-12-15 ## [0.4.1] - 2024-12-11
### Added
- allow taking a local path
### Fixed ### Fixed
- *(deps)* update rust crate serde to v1.0.216 - *(deps)* update rust crate serde to v1.0.216

View File

@ -26,4 +26,4 @@ hex = { version = "0.4.3" }
toml = { version = "0.8.14" } toml = { version = "0.8.14" }
[workspace.package] [workspace.package]
version = "0.5.0" version = "0.4.1"

View File

@ -1,5 +1,3 @@
use std::path::PathBuf;
use tonic::transport::{Channel, ClientTlsConfig}; use tonic::transport::{Channel, ClientTlsConfig};
use crate::{ use crate::{
@ -16,18 +14,15 @@ pub struct State {
} }
pub enum Backend { pub enum Backend {
Local { path_override: Option<PathBuf> }, Local,
Remote { url: String }, Remote { url: String },
} }
impl State { impl State {
pub async fn new(backend: Backend) -> anyhow::Result<Self> { pub async fn new(backend: Backend) -> anyhow::Result<Self> {
let (querier, commander) = match &backend { let (querier, commander) = match &backend {
Backend::Local { path_override } => { Backend::Local => {
let mut storage = Storage::new(); let storage = Storage::new();
if let Some(path_override) = path_override {
storage.with_base(path_override);
}
let engine = storage.load()?; let engine = storage.load()?;
let events = Events::default(); let events = Events::default();
let engine = SharedEngine::from(engine); let engine = SharedEngine::from(engine);
@ -58,21 +53,15 @@ impl State {
} }
pub fn unlock(&self) { pub fn unlock(&self) {
if let Backend::Local { path_override } = &self.backend { if let Backend::Local = &self.backend {
let mut storage = Storage::new(); let storage = Storage::new();
if let Some(path_override) = path_override {
storage.with_base(path_override);
}
storage.clear_lock_file(); storage.clear_lock_file();
} }
} }
pub fn info(&self) -> Option<anyhow::Result<String>> { pub fn info(&self) -> Option<anyhow::Result<String>> {
if let Backend::Local { path_override } = &self.backend { if let Backend::Local = &self.backend {
let mut storage = Storage::new(); let storage = Storage::new();
if let Some(path_override) = path_override {
storage.with_base(path_override);
}
return Some(storage.info()); return Some(storage.info());
} }

View File

@ -1,5 +1,3 @@
use std::path::PathBuf;
use clap::{Parser, Subcommand, ValueEnum}; use clap::{Parser, Subcommand, ValueEnum};
use hyperlog_tui::{ use hyperlog_tui::{
commander, commander,
@ -17,9 +15,6 @@ struct Command {
#[arg(long = "backend-url", required_if_eq("backend", "remote"))] #[arg(long = "backend-url", required_if_eq("backend", "remote"))]
backend_url: Option<String>, backend_url: Option<String>,
#[arg(long = "local-path")]
local_path: Option<PathBuf>,
} }
#[derive(ValueEnum, Clone)] #[derive(ValueEnum, Clone)]
@ -95,9 +90,7 @@ pub async fn execute() -> anyhow::Result<()> {
let backend_url = cli.backend_url; let backend_url = cli.backend_url;
let backend = match backend { let backend = match backend {
BackendArg::Local => Backend::Local { BackendArg::Local => Backend::Local,
path_override: cli.local_path.clone(),
},
BackendArg::Remote => Backend::Remote { BackendArg::Remote => Backend::Remote {
url: backend_url.expect("backend-url to be set"), url: backend_url.expect("backend-url to be set"),
}, },