Pagwin/ppi
1
0
Fork 0
mirror of https://github.com/Pagwin-Fedora/ppi.git synced 2025-07-17 22:15:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added a nicer error message when config missing

Browse source 
also cleaned up some dead code that was commented out
This commit is contained in:
Pagwin 2024-01-30 10:47:24 -05:00
parent e0e10be15c
commit c573ef8748
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/main.rs
View file

@ -44,11 +44,24 @@ fn main() -> Result<(),Errors> {
let config:Config = toml::from_str({
let mut buf = String::new();
let _ = std::fs::File::open(
let _ = match std::fs::File::open(
{let mut n = dirs::config_dir().expect("no config dir so edit the source code to make it work buddy");
n.push(clap::crate_name!().to_owned() + "/config.toml");
n
}).expect("error opening file").read_to_string(&mut buf);
}){
Ok(mut file)=>file.read_to_string(&mut buf),
Err(e)=>{
if std::io::ErrorKind::NotFound == e.kind() {
eprintln!("Config file not found have you created one at \"~/.config/ppi/config.toml\"?");
}
else{
eprintln!("unexpected error has occurred");
eprintln!("{:?}",e);
}
std::process::exit(1);
}
};
buf
}.as_str()).unwrap_or_default();
@ -97,26 +110,6 @@ fn main() -> Result<(),Errors> {
std::env::set_current_dir(&loc)?;
handle_process(std::process::Command::new("git")
.args(["checkout", skelly_branch.as_str()]))?;
// let branch = repo.branches(Some(git2::BranchType::Remote))?.find(|branch|{
// if let Ok(branch) = branch{
// if let Ok(Some(name)) = branch.0.name(){
// name == format!("origin/{}",skelly_branch)
// }else{false}
// }else{false}
// }).ok_or(git2::Error::from_str(format!("no branch with name {}",skelly_branch).as_str()))??;
// match repo.set_head(branch.0.into_reference().name().ok_or(git2::Error::from_str("the branch with a name somehow has a reference without a name"))?){
// Err(e)=>{
// panic!("{}",e.message());
// }
// _=>{}
// }
//#[cfg(debug_assertions)]
//{
// eprintln!("head set");
// std::io::stdin().read_line(&mut String::new())?;
//}
repo.remote_delete("origin")?;
@ -126,8 +119,6 @@ fn main() -> Result<(),Errors> {
std::io::stdin().read_line(&mut String::new())?;
}
let mut walk = repo.revwalk()?;
walk.set_sorting(git2::Sort::TIME)?;
walk.push_head()?;