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

Move install ID from $XDG_CONFIG_HOME/asciinema/install-id to $XDG_STATE_HOME/asciinema/install-id

Browse Source 
It still reuses existing one from $XDG_CONFIG_HOME when the new one
doesn't exist to make upgrade from CLI 2.x to 3.0 seamless.
This commit is contained in:
Marcin Kulik
2025-08-29 18:26:57 +02:00
parent ca7bf62232
commit 4928a14f74
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/config.rs
View File

@@ -101,11 +101,14 @@ impl Config {
pub fn get_install_id(&self) -> Result<String> {
let path = install_id_path()?;
let legacy_path = legacy_install_id_path()?;
if let Some(id) = read_install_id(&path)? {
Ok(id)
} else if let Some(id) = read_install_id(&legacy_path)? {
Ok(id)
} else {
let id = create_install_id();
let id = generate_install_id();
save_install_id(&path, &id)?;
Ok(id)
@@ -190,7 +193,7 @@ fn read_install_id(path: &PathBuf) -> Result<Option<String>> {
}
}
fn create_install_id() -> String {
fn generate_install_id() -> String {
Uuid::new_v4().to_string()
}
@@ -205,22 +208,26 @@ fn save_install_id(path: &PathBuf, id: &str) -> Result<()> {
}
pub fn user_config_path() -> Result<PathBuf> {
Ok(home()?.join("config.toml"))
Ok(config_home()?.join("config.toml"))
}
fn legacy_user_config_path() -> Result<PathBuf> {
Ok(home()?.join("config"))
Ok(config_home()?.join("config"))
}
fn user_defaults_path() -> Result<PathBuf> {
Ok(home()?.join("defaults.toml"))
Ok(config_home()?.join("defaults.toml"))
}
fn install_id_path() -> Result<PathBuf> {
Ok(home()?.join(INSTALL_ID_FILENAME))
Ok(state_home()?.join(INSTALL_ID_FILENAME))
}
fn home() -> Result<PathBuf> {
fn legacy_install_id_path() -> Result<PathBuf> {
Ok(config_home()?.join(INSTALL_ID_FILENAME))
}
fn config_home() -> Result<PathBuf> {
env::var("ASCIINEMA_CONFIG_HOME")
.map(PathBuf::from)
.or(env::var("XDG_CONFIG_HOME").map(|home| Path::new(&home).join("asciinema")))
@@ -228,6 +235,19 @@ fn home() -> Result<PathBuf> {
.map_err(|_| anyhow!("need $HOME or $XDG_CONFIG_HOME or $ASCIINEMA_CONFIG_HOME"))
}
fn state_home() -> Result<PathBuf> {
env::var("ASCIINEMA_STATE_HOME")
.map(PathBuf::from)
.or(env::var("XDG_STATE_HOME").map(|home| Path::new(&home).join("asciinema")))
.or(env::var("HOME").map(|home| {
Path::new(&home)
.join(".local")
.join("state")
.join("asciinema")
}))
.map_err(|_| anyhow!("need $HOME or $XDG_STATE_HOME or $ASCIINEMA_STATE_HOME"))
}
fn parse_key<S: AsRef<str>>(key: S) -> Result<Key> {
let key = key.as_ref();
let chars: Vec<char> = key.chars().collect();