0xrsydn/idx-cli
1
mirror of https://github.com/0xrsydn/idx-cli.git synced 2026-08-07 01:33:52 +00:00
Code Issues Projects Releases 1 Packages Wiki Activity

fix: stabilize cache behavior and local xdg paths

Browse source
This commit is contained in:
Rasyidan Akbar F. 2026-03-17 08:52:11 +07:00
commit 018b8aeb55
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/cache.rs
View file

@ -53,7 +53,7 @@ impl Cache {
};
let age = Utc::now().signed_duration_since(entry.fetched_at);
if age
> chrono::Duration::from_std(Duration::from_secs(entry.ttl_secs))
>= chrono::Duration::from_std(Duration::from_secs(entry.ttl_secs))
.map_err(|e| IdxError::CacheMiss(e.to_string()))?
{
return Ok(None);
@ -204,6 +204,11 @@ impl Cache {
}
pub fn cache_dir() -> Result<PathBuf, IdxError> {
if let Ok(dir) = std::env::var("XDG_CACHE_HOME")
&& !dir.is_empty()
{
return Ok(PathBuf::from(dir).join("idx"));
}
ProjectDirs::from("", "", "idx")
.map(|d| d.cache_dir().to_path_buf())
.ok_or_else(|| IdxError::ConfigError("unable to resolve cache dir".to_string()))
@ -212,18 +217,23 @@ pub fn cache_dir() -> Result<PathBuf, IdxError> {
#[cfg(test)]
mod tests {
use std::fs;
use std::sync::atomic::{AtomicUsize, Ordering};
use serde::{Deserialize, Serialize};
use super::{Cache, CacheEntry};
static TMP_COUNTER: AtomicUsize = AtomicUsize::new(0);
#[derive(Debug, Serialize, Deserialize, PartialEq)]
struct T {
v: i32,
}
fn tmp() -> std::path::PathBuf {
let p = std::env::temp_dir().join(format!("idx-cache-test-{}", std::process::id()));
let suffix = TMP_COUNTER.fetch_add(1, Ordering::Relaxed);
let p =
std::env::temp_dir().join(format!("idx-cache-test-{}-{suffix}", std::process::id()));
let _ = fs::remove_dir_all(&p);
fs::create_dir_all(&p).expect("create tmp cache dir");
p

5
src/config.rs
View file

@ -197,6 +197,11 @@ pub fn default_config_toml() -> String {
}
pub fn config_path() -> Result<PathBuf, IdxError> {
if let Ok(dir) = std::env::var("XDG_CONFIG_HOME")
&& !dir.is_empty()
{
return Ok(PathBuf::from(dir).join("idx").join("config.toml"));
}
ProjectDirs::from("", "", "idx")
.map(|d| d.config_dir().join("config.toml"))
.ok_or_else(|| IdxError::ConfigError("unable to resolve config dir".to_string()))