GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

use ServerConfig::into_server instead of server::from_config

Browse source
This commit is contained in:
Dustin J. Mitchell 2021-01-10 21:35:24 -05:00
parent 15ffc62279
commit b004b6cb93
6 changed files with 65 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cli/src/invocation/mod.rs
View file

@ -3,7 +3,7 @@
use crate::argparse::{Command, Subcommand};
use config::Config;
use failure::{format_err, Fallible};
use taskchampion::{server, Replica, ReplicaConfig, ServerConfig, Uuid};
use taskchampion::{Replica, ReplicaConfig, Server, ServerConfig, Uuid};
use termcolor::{ColorChoice, StandardStream};
mod cmd;
@ -109,10 +109,10 @@ fn get_replica(settings: &Config) -> Fallible<Replica> {
}
/// Get the server for this invocation
fn get_server(settings: &Config) -> Fallible<Box<dyn server::Server>> {
fn get_server(settings: &Config) -> Fallible<Box<dyn Server>> {
// if server_client_key and server_origin are both set, use
// the remote server
if let (Ok(client_key), Ok(origin)) = (
let config = if let (Ok(client_key), Ok(origin)) = (
settings.get_str("server_client_key"),
settings.get_str("server_origin"),
) {
@ -123,16 +123,17 @@ fn get_server(settings: &Config) -> Fallible<Box<dyn server::Server>> {
log::debug!("Using sync-server with origin {}", origin);
log::debug!("Sync client ID: {}", client_key);
Ok(server::from_config(ServerConfig::Remote {
ServerConfig::Remote {
origin,
client_key,
encryption_secret: encryption_secret.as_bytes().to_vec(),
})?)
}
} else {
let server_dir = settings.get_str("server_dir")?.into();
log::debug!("Using local sync-server at `{:?}`", server_dir);
Ok(server::from_config(ServerConfig::Local { server_dir })?)
}
ServerConfig::Local { server_dir }
};
Ok(config.into_server()?)
}
/// Get a WriteColor implementation based on whether the output is a tty.