reMarkable/signature-rM
1
0
Fork 0
mirror of https://github.com/rM-self-serve/signature-rM.git synced 2025-09-06 05:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

check space

Browse Source
This commit is contained in:
rM-self-serve
2023-12-06 09:44:39 -06:00
parent 74d64881b4
commit 77eef2b421
4 changed files with 206 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
Cargo.lock generated
View File

@@ -59,6 +59,18 @@ dependencies = [
"windows-sys",
]
[[package]]
name = "autocfg"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "4.4.10"
@@ -105,18 +117,93 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]]
name = "core-foundation-sys"
version = "0.8.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
[[package]]
name = "crossbeam-deque"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
dependencies = [
"cfg-if",
"crossbeam-epoch",
"crossbeam-utils",
]
[[package]]
name = "crossbeam-epoch"
version = "0.9.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
dependencies = [
"autocfg",
"cfg-if",
"crossbeam-utils",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
dependencies = [
"cfg-if",
]
[[package]]
name = "either"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
[[package]]
name = "heck"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
[[package]]
name = "libc"
version = "0.2.150"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
[[package]]
name = "memchr"
version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memoffset"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [
"autocfg",
]
[[package]]
name = "ntapi"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
dependencies = [
"winapi",
]
[[package]]
name = "once_cell"
version = "1.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
[[package]]
name = "proc-macro2"
version = "1.0.70"
@@ -135,6 +222,26 @@ dependencies = [
"proc-macro2",
]
[[package]]
name = "rayon"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
dependencies = [
"either",
"rayon-core",
]
[[package]]
name = "rayon-core"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
dependencies = [
"crossbeam-deque",
"crossbeam-utils",
]
[[package]]
name = "regex"
version = "1.10.2"
@@ -164,12 +271,19 @@ version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "scopeguard"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "signature-rm"
version = "1.0.0"
version = "1.0.2"
dependencies = [
"clap",
"regex",
"sysinfo",
]
[[package]]
@@ -189,6 +303,21 @@ dependencies = [
"unicode-ident",
]
[[package]]
name = "sysinfo"
version = "0.29.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
dependencies = [
"cfg-if",
"core-foundation-sys",
"libc",
"ntapi",
"once_cell",
"rayon",
"winapi",
]
[[package]]
name = "unicode-ident"
version = "1.0.12"
@@ -201,6 +330,28 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows-sys"
version = "0.48.0"

3
Cargo.toml
View File

@@ -1,12 +1,13 @@
[package]
name = "signature-rm"
version = "1.0.0"
version = "1.0.2"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
clap = { version = "4.4", features = ["derive"] }
regex = "1.10.2"
sysinfo = "0.29.11"
[profile.release]
opt-level = 's'

6
install-signature-rm.sh
View File

@@ -2,9 +2,9 @@
# Copyright (c) 2023 rM-self-serve
# SPDX-License-Identifier: MIT
sigrm_sha256sum='939c29fb918bd36ba58b11e94ba862016a539003933c5e97c92d9167ddbd7ece'
sigrm_sha256sum='eb82b757586b187edfd7ba742149b0929d96c124e488fef191524e13ae6bf63e'
release='v1.0.1'
release='v1.0.2'
installfile='./install-signature-rm.sh'
gh_pkgname='signature-rM'
@@ -80,9 +80,7 @@ echo ""
echo "Finished installing ${gh_pkgname}"
echo ""
echo "To use ${gh_pkgname}, run:"
echo "$ systemctl stop xochitl"
echo "$ $pkgname apply"
echo "$ systemctl start xochitl"
echo ""
remove_installfile

50
src/main.rs
View File

@@ -3,7 +3,9 @@ use regex::Regex;
use std::fs::OpenOptions;
use std::io::{Error, ErrorKind, Write};
use std::os::unix::fs::FileExt;
use std::path::Path;
use std::process::{Command, ExitCode, Stdio};
use sysinfo::{DiskExt, System, SystemExt};
pub const XOBIN_PATH: &str = "/usr/bin/xochitl";
pub const RM_CONF: &str = "/usr/share/remarkable/update.conf";
@@ -56,6 +58,9 @@ fn main() -> ExitCode {
match &cli.command {
Some(Commands::Apply { no_prompt }) => {
if !check_space() {
return ExitCode::FAILURE;
}
if !apply_entry(no_prompt) {
return ExitCode::FAILURE;
}
@@ -69,6 +74,9 @@ fn main() -> ExitCode {
println!("Select either '--backup' or '--reverse'");
return ExitCode::FAILURE;
}
if !check_space() {
return ExitCode::FAILURE;
}
if *backup && !revert_from_backup_entry(no_prompt) {
return ExitCode::FAILURE;
}
@@ -299,3 +307,45 @@ fn cmd_cp(from: &str, to: &str) -> std::io::Result<String> {
.output()?;
String::from_utf8(command_out.stdout).map_err(|err| Error::new(ErrorKind::Other, err))
}
fn check_space() -> bool {
let mut sys = System::new();
sys.refresh_disks_list();
let Some(root_disk_free_mb) = disk_free_mbyt(&sys, "/") else {
println!("Can not find '/'");
return false;
};
let Some(home_disk_free_mb) = disk_free_mbyt(&sys, "/home") else {
println!("Can not find '/home'");
return false;
};
let need = 1;
if root_disk_free_mb < need {
println!("Not enough space on '/'");
println!("Have: {root_disk_free_mb}MB, Need: {need}MB");
println!("Try to free space by running: journalctl --vacuum-time=1m");
println!("Or: systemctl restart xochitl");
return false;
}
let need = 12;
if home_disk_free_mb < need {
println!("Not enough space on '/home'");
println!("Have: {root_disk_free_mb}MB, Need: {need}MB");
return false;
}
true
}
fn disk_free_mbyt(sys: &System, disk: &str) -> Option<u64> {
sys.disks()
.into_iter()
.filter(|v| v.mount_point() == Path::new(disk))
.map(|v| v.available_space() / 1024 / 1024)
.collect::<Vec<u64>>()
.into_iter()
.nth(0)
}