fix: Use dirs crate for home_dir() function

This commit is contained in:
Michael Aaron Murphy 2022-03-27 16:05:04 +02:00 committed by Michael Murphy
parent e578f2d19c
commit b770b59e7b
8 changed files with 10 additions and 6 deletions

2
Cargo.lock generated
View file

@ -1406,6 +1406,7 @@ version = "1.1.1"
dependencies = [
"blocking",
"const_format",
"dirs 4.0.0",
"futures-lite",
"serde",
"serde_json",
@ -1429,6 +1430,7 @@ version = "1.1.1"
dependencies = [
"anyhow",
"async-pidfd",
"dirs 4.0.0",
"flume",
"fork",
"freedesktop-desktop-entry",

View file

@ -13,6 +13,7 @@ members = ["bin", "plugins", "service"]
[dependencies]
blocking = "1.2.0"
const_format = "0.2.22"
dirs = "4.0.0"
futures-lite = "1.12.0"
serde = { version = "1.0.136", features = ["derive"] }
serde_json = "1.0.79"

View file

@ -34,3 +34,4 @@ url = "2.2.2"
sysfs-class = "0.1.3"
anyhow = "1.0.56"
flume = "0.10.12"
dirs = "4.0.0"

View file

@ -46,7 +46,7 @@ impl Default for App {
fn default() -> Self {
Self {
entries: BTreeMap::default(),
home: std::env::home_dir().expect("no home dir"),
home: dirs::home_dir().expect("no home dir"),
out: async_stdout(),
search_results: Vec::with_capacity(100),
}

View file

@ -73,7 +73,7 @@ impl App {
let mut queue = VecDeque::new();
queue.push_back(
std::env::home_dir()
dirs::home_dir()
.expect("user does not have home dir")
.join(LOCAL_PATH),
);

View file

@ -57,7 +57,7 @@ const ALLOWED_FAVICON_MIME: [&str; 5] = [
impl Default for App {
fn default() -> Self {
let cache = std::env::home_dir()
let cache = dirs::home_dir()
.map(|cache| cache.join(".cache/pop-launcher"))
.expect("no home dir");
@ -228,8 +228,7 @@ async fn favicon_url_from_page_source(domain: &str, client: &HttpClient) -> Opti
.text()
.await
.ok()
.map(|html| parse_favicon(&html))
.flatten()
.and_then(|html| parse_favicon(&html))
.map(|icon_url| {
if !icon_url.starts_with("https://") {
format!("https://{}{}", domain, icon_url)

View file

@ -34,6 +34,7 @@ pub struct PluginBinary {
path: Cow<'static, str>,
#[serde(default)]
#[allow(dead_code)]
args: Vec<Cow<'static, str>>,
}

View file

@ -28,7 +28,7 @@ pub fn plugin_paths() -> impl Iterator<Item = Cow<'static, Path>> {
PLUGIN_PATHS.iter().map(|path| {
#[allow(deprecated)]
if let Some(path) = path.strip_prefix("~/") {
let path = std::env::home_dir()
let path = dirs::home_dir()
.expect("user does not have home dir")
.join(path);
Cow::Owned(path)