nix-community/comma
1
1
Fork 0
mirror of https://github.com/nix-community/comma.git synced 2024-09-11 03:55:24 +03:00
Code Issues Projects Releases Wiki Activity

only warn about non-existent database if nix-locate fails

Browse Source 
When using a non-standard database location for nix-index (e.g. via the
NixOS modules in the github:Mic92/nix-index-database flake), comma warns
that the database is non-existent even though it does exist and
nix-locate works fine.

This changes the logic so that it only checks if the database exists
when the `nix-locate` command fails.
This commit is contained in:
Lily Foster 2023-01-04 11:05:41 -05:00
parent 1b07c19774
commit 646e6ed37b
No known key found for this signature in database
GPG Key ID: 49340081E484C893
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/index.rs
View File

@ -1,5 +1,6 @@
use std::{
os::unix::prelude::CommandExt,
path::PathBuf,
process::Command,
time::{Duration, SystemTime},
};
@ -10,20 +11,31 @@ pub fn update_database() {
Command::new("nix-index").exec();
}
/// Prints warnings if the nix-index database is non-existent or out of date.
pub fn check_database() {
let base = xdg::BaseDirectories::with_prefix("nix-index").unwrap();
let cache_dir = base.get_cache_home();
let database_file = cache_dir.join("files");
/// Prints a warning if the nix-index database is non-existent
pub fn check_database_exists() {
let database_file = get_database_file();
if !database_file.exists() {
println!("Warning: Nix-index database does not exist, try updating with `comma --update`.");
} else if is_database_old(database_file) {
}
}
/// Prints a warning if the nix-index database is out of date.
pub fn check_database_updated() {
let database_file = get_database_file();
if is_database_old(database_file) {
println!(
"Warning: Nix-index database is older than 30 days, try updating with `comma --update`."
);
}
}
/// Get the location of the nix-index database file
fn get_database_file() -> PathBuf {
let base = xdg::BaseDirectories::with_prefix("nix-index").unwrap();
let cache_dir = base.get_cache_home();
cache_dir.join("files")
}
/// Test whether the database is more than 30 days old
fn is_database_old(database_file: std::path::PathBuf) -> bool {
let metadata = match database_file.metadata() {

3
src/main.rs
View File

@ -70,7 +70,7 @@ fn main() -> ExitCode {
let command = &args.cmd[0];
let trail = &args.cmd[1..];
index::check_database();
index::check_database_updated();
let nix_locate_output = Command::new("nix-locate")
.args(["--top-level", "--minimal", "--at-root", "--whole-name"])
@ -79,6 +79,7 @@ fn main() -> ExitCode {
.expect("failed to execute nix-locate");
if !nix_locate_output.status.success() {
index::check_database_exists();
match std::str::from_utf8(&nix_locate_output.stderr) {
Ok(stderr) => eprintln!("nix-locate failed with: {}", stderr),
Err(_) => eprint!("nix-locate failed"),