Compare commits
No commits in common. "master" and "V2.0.3" have entirely different histories.
|
|
@ -1206,7 +1206,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "rasp_mgr"
|
||||
version = "2.0.4"
|
||||
version = "2.0.3"
|
||||
dependencies = [
|
||||
"async-std",
|
||||
"clap",
|
||||
|
|
|
|||
20
Cargo.toml
20
Cargo.toml
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "rasp_mgr"
|
||||
version = "2.0.4"
|
||||
version = "2.0.3"
|
||||
description = "A simple server manager for local newtrok"
|
||||
authors = ["PiyushXCoder <piyush.raj.kit@gmail.com>"]
|
||||
license = "GPL-3.0-only"
|
||||
|
|
@ -12,17 +12,17 @@ edition = "2018"
|
|||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[dependencies]
|
||||
clap = "2.33"
|
||||
toml = "0.5"
|
||||
clap = "2.33.3"
|
||||
toml = "0.5.8"
|
||||
|
||||
tide = "0.16"
|
||||
async-std = { version = "1.6", features = ["attributes"] }
|
||||
tide = "0.16.0"
|
||||
async-std = { version = "1.6.0", features = ["attributes"] }
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
|
||||
humantime = "2.1"
|
||||
humantime = "2.1.0"
|
||||
|
||||
sys-info = "0.9"
|
||||
libc = "0.2"
|
||||
mnt = "0.3"
|
||||
sys-info = "0.9.0"
|
||||
libc = "0.2.97"
|
||||
mnt = "0.3.1"
|
||||
|
||||
libmedium = "0.6"
|
||||
libmedium = "0.6.0"
|
||||
|
|
|
|||
|
|
@ -1,29 +1,35 @@
|
|||
# Maintainer: Rajnish Mishra <contact.rajnishmishra@gmail.com>
|
||||
|
||||
pkgname=raspmgr
|
||||
pkgname=raspmgr-git
|
||||
_pkgname=Rasp-Manager
|
||||
pkgver=2.0.2
|
||||
pkgver=1.0.0.r11.1901188
|
||||
pkgrel=1
|
||||
pkgdesc="A simple server manager for local network (especially for Raspberry Pi)"
|
||||
arch=('any')
|
||||
url="https://github.com/PiyushXCoder/${_pkgname}"
|
||||
license=('GPL3')
|
||||
makedepends=('git' 'cargo')
|
||||
source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/PiyushXCoder/${_pkgname}/archive/V${pkgver}.tar.gz")
|
||||
sha256sums=('76df28aa278424420914737567085a358eddbbe23840103e72d59f2749d26838')
|
||||
source=("git+${url}.git")
|
||||
md5sums=('SKIP')
|
||||
|
||||
pkgver() {
|
||||
cd "${_pkgname}"
|
||||
v=$(grep -R -A3 '^version =' Cargo.toml | grep 'version =' | cut -d\" -f2)
|
||||
printf "$v.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
cd "${_pkgname}"
|
||||
sed -i 's/port = 8080/port = 80/g;s/\".\/static\"/\"\/var\/lib\/rasp_mgr\/static\"/g' Config.toml
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
cd "${_pkgname}"
|
||||
cargo build --release
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${_pkgname}-${pkgver}"
|
||||
cd "${_pkgname}"
|
||||
install -Dm755 "target/release/rasp_mgr" "${pkgdir}/usr/bin/rasp_mgr"
|
||||
install -Dm644 "Config.toml" "${pkgdir}/etc/rasp_mgr/Config.toml"
|
||||
install -Dm644 "rasp_mgr.service" "${pkgdir}/usr/lib/systemd/system/rasp_mgr.service"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
|
|
@ -9,7 +8,6 @@
|
|||
<title>Rasp Manager</title>
|
||||
<link rel="stylesheet" href="awsm.min.css">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<header>
|
||||
<h1>Rasp Manager</h1>
|
||||
|
|
@ -32,9 +30,10 @@
|
|||
|
||||
<script src="jquery-3.6.0.min.js"></script>
|
||||
<script>
|
||||
$.get("/sysinfo", function (data) {
|
||||
$.get("/sysinfo", function(data) {
|
||||
var data = JSON.parse(data);
|
||||
var area = $('#sysinfo');
|
||||
var pushin = function (parent, label, dat) {
|
||||
var pushin = function(parent, label, dat) {
|
||||
parent.append($('<b>').append(label))
|
||||
.append(dat)
|
||||
.append('<br>');
|
||||
|
|
@ -44,10 +43,10 @@
|
|||
var fset = $('<fieldset>');
|
||||
fset.append($('<legend>').append('System'));
|
||||
pushin(fset, 'System Name: ', data.system_name);
|
||||
if (data.os_version != undefined)
|
||||
if(data.os_version != undefined)
|
||||
pushin(fset, 'Operating System Version: ', data.os_version);
|
||||
pushin(fset, 'Kernel Version: ', data.kernel_ver);
|
||||
if (data.last_uadate != undefined)
|
||||
if(data.last_uadate != undefined)
|
||||
pushin(fset, 'Last Update: ', data.last_uadate);
|
||||
pushin(fset, 'Hostname: ', data.hostname);
|
||||
pushin(fset, 'Boot Time: ', data.boot_time);
|
||||
|
|
@ -69,39 +68,38 @@
|
|||
|
||||
var fset = $('<fieldset>');
|
||||
fset.append($('<legend>').append('Disk'));
|
||||
fset.append($('<small>', { style: 'color: grey' }).append('available/total<br>'));
|
||||
fset.append($('<small>', {style:'color: grey'}).append('available/total<br>'));
|
||||
data.disk.forEach(e => {
|
||||
pushin(fset, '→ ' + e.mount, '');
|
||||
pushin(fset, '→ '+e.mount, '');
|
||||
var available = e.available;
|
||||
var total = e.total;
|
||||
var unit_available = 'MB';
|
||||
var unit_total = 'MB';
|
||||
|
||||
if (available > 1024) {
|
||||
if(available > 1024) {
|
||||
available /= 1024;
|
||||
unit_available = 'GB';
|
||||
}
|
||||
if (total > 1024) {
|
||||
if(total > 1024) {
|
||||
total /= 1024;
|
||||
unit_total = 'GB';
|
||||
}
|
||||
|
||||
pushin(fset, '', +available.toFixed(2) + ' ' + unit_available + '/' + total.toFixed(2) + ' ' + unit_total);
|
||||
pushin(fset, '', +available.toFixed(2)+ ' '+unit_available+'/' +total.toFixed(2)+ ' '+unit_total);
|
||||
});
|
||||
area.append(fset);
|
||||
|
||||
var fset = $('<fieldset>');
|
||||
fset.append($('<legend>').append('Temperature'));
|
||||
data.temperature.forEach(e => {
|
||||
pushin(fset, '→ ' + e.label + ': ', e.temp.toFixed(2) + '°C');
|
||||
pushin(fset, '→ '+e.label+': ', e.temp.toFixed(2) +'°C');
|
||||
});
|
||||
area.append(fset);
|
||||
|
||||
}).fail(function () {
|
||||
$('#sysinfo').empty().append($('<span>', { style: 'color: red' })
|
||||
}).fail(function() {
|
||||
$('#sysinfo').empty().append($('<span>', {style: 'color: red'})
|
||||
.append('Error in getting system information!'));
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Loading…
Reference in New Issue