Mirrors/asciinema
1
0
Fork 0
mirror of https://github.com/asciinema/asciinema.git synced 2025-12-16 11:48:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support legacy server URL env var ASCIINEMA_API_URL

Browse Source
This commit is contained in:
Marcin Kulik
2023-12-28 21:13:54 +01:00
parent 08d83ad5a7
commit 761e346269
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/config.rs
View File

@@ -14,7 +14,6 @@ const INSTALL_ID_FILENAME: &str = "install-id";
#[allow(unused)] #[allow(unused)]
pub struct Config { pub struct Config {
server: Server, server: Server,
api: Api,
cmd: Cmd, cmd: Cmd,
} }
@@ -24,12 +23,6 @@ pub struct Server {
url: Option<String>, url: Option<String>,
} }
#[derive(Debug, Deserialize)]
#[allow(unused)]
pub struct Api {
url: Option<String>,
}
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
#[allow(unused)] #[allow(unused)]
pub struct Cmd { pub struct Cmd {
@@ -63,7 +56,6 @@ impl Config {
pub fn new(server_url: Option<String>) -> Result<Self> { pub fn new(server_url: Option<String>) -> Result<Self> {
let mut config = config::Config::builder() let mut config = config::Config::builder()
.set_default("server.url", None::<Option<String>>)? .set_default("server.url", None::<Option<String>>)?
.set_default("api.url", None::<Option<String>>)?
.set_default("cmd.rec.input", false)? .set_default("cmd.rec.input", false)?
.set_default("cmd.rec.env", "SHELL,TERM")? .set_default("cmd.rec.env", "SHELL,TERM")?
.set_default("cmd.rec.pause_key", "C-\\")? .set_default("cmd.rec.pause_key", "C-\\")?
@@ -83,6 +75,13 @@ impl Config {
config = config.set_override("server.url", Some(url))?; config = config.set_override("server.url", Some(url))?;
} }
if let (Err(_), Ok(url)) = (
env::var("ASCIINEMA_SERVER_URL"),
env::var("ASCIINEMA_API_URL"),
) {
env::set_var("ASCIINEMA_SERVER_URL", url);
}
Ok(config.build()?.try_deserialize()?) Ok(config.build()?.try_deserialize()?)
} }