From e9fac36c9d5b45de021f4b22c6d71c604bc44ae8 Mon Sep 17 00:00:00 2001
From: kpcyrd <git@rxv.cc>
Date: Mon, 2 Jan 2023 07:38:47 +0100
Subject: [PATCH] Replace battery crate with starship-battery

https://github.com/svartalf/rust-battery/pull/92
---
 Cargo.lock      | 53 +++++++++++++++++++++++++------------------------
 Cargo.toml      |  4 ++--
 src/schedule.rs |  1 +
 3 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25db4bd..79b9397 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,23 +161,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "battery"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4"
-dependencies = [
- "cfg-if",
- "core-foundation",
- "lazycell",
- "libc",
- "mach",
- "nix 0.19.1",
- "num-traits",
- "uom",
- "winapi",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.56.0"
@@ -636,12 +619,12 @@ dependencies = [
 
 [[package]]
 name = "env_logger"
-version = "0.9.3"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
 dependencies = [
- "atty",
  "humantime",
+ "is-terminal",
  "log",
  "regex",
  "termcolor",
@@ -928,7 +911,6 @@ version = "0.6.0"
 dependencies = [
  "anyhow",
  "atoi",
- "battery",
  "chrono",
  "chrono-humanize",
  "clamav-rs",
@@ -938,7 +920,7 @@ dependencies = [
  "config",
  "crossbeam-channel",
  "dirs",
- "env_logger 0.9.3",
+ "env_logger 0.10.0",
  "glob",
  "human-size",
  "ioprio",
@@ -951,6 +933,7 @@ dependencies = [
  "rand",
  "serde",
  "serde_json",
+ "starship-battery",
  "tempfile",
  "v_htmlescape",
  "walkdir",
@@ -1044,21 +1027,22 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "nix"
-version = "0.19.1"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+checksum = "77d9f3521ea8e0641a153b3cddaf008dcbf26acd4ed739a2517295e0760d12c7"
 dependencies = [
  "bitflags",
  "cc",
  "cfg-if",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
 name = "nix"
-version = "0.21.2"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77d9f3521ea8e0641a153b3cddaf008dcbf26acd4ed739a2517295e0760d12c7"
+checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c"
 dependencies = [
  "bitflags",
  "cc",
@@ -1553,6 +1537,23 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "starship-battery"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3336198ad004af4447ae69be4f4e562c26814570f8f0c1e37858405a294e015d"
+dependencies = [
+ "cfg-if",
+ "core-foundation",
+ "lazycell",
+ "libc",
+ "mach",
+ "nix 0.23.2",
+ "num-traits",
+ "uom",
+ "winapi",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index e881387..6168f5d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ edition = "2018"
 [dependencies]
 anyhow = "1.0.40"
 atoi = "1"
-battery = "0.7"
 chrono = { version = "0.4.19", features = ["serde"] }
 chrono-humanize = "0.2.1"
 clamav-rs = "0.5.3"
@@ -24,7 +23,7 @@ colored = "2.0.0"
 config = { version = "0.13", default-features = false, features = ["toml"] }
 crossbeam-channel = "0.5.1"
 dirs = "4"
-env_logger = "0.9"
+env_logger = "0.10"
 glob = "0.3.0"
 human-size = "0.4.1"
 ioprio = "0.2"
@@ -37,6 +36,7 @@ num_cpus = "1.13.0"
 rand = "0.8.3"
 serde = { version = "1.0.125", features = ["derive"] }
 serde_json = "1.0.64"
+starship-battery = "0.7.9"
 v_htmlescape = "0.15"
 walkdir = "2.3.2"
 
diff --git a/src/schedule.rs b/src/schedule.rs
index 52763aa..2cadc86 100644
--- a/src/schedule.rs
+++ b/src/schedule.rs
@@ -6,6 +6,7 @@ use crate::scan;
 use chrono::{DateTime, Datelike, Local, NaiveTime, TimeZone, Timelike, Utc};
 use rand::Rng;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use starship_battery as battery;
 use std::cmp;
 use std::str::FromStr;
 use std::thread;