Merge pull request #2183 from Kingtous/master
feat: add build date on about page
This commit is contained in:
commit
fb17d64f1a
@ -67,6 +67,7 @@ rdev = { git = "https://github.com/asur4s/rdev" }
|
|||||||
url = { version = "2.1", features = ["serde"] }
|
url = { version = "2.1", features = ["serde"] }
|
||||||
|
|
||||||
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
|
reqwest = { version = "0.11", features = ["blocking", "json", "rustls-tls"], default-features=false }
|
||||||
|
chrono = "0.4.23"
|
||||||
|
|
||||||
[target.'cfg(not(any(target_os = "android", target_os = "linux")))'.dependencies]
|
[target.'cfg(not(any(target_os = "android", target_os = "linux")))'.dependencies]
|
||||||
cpal = "0.13.5"
|
cpal = "0.13.5"
|
||||||
|
@ -1029,10 +1029,12 @@ class _AboutState extends State<_About> {
|
|||||||
return _futureBuilder(future: () async {
|
return _futureBuilder(future: () async {
|
||||||
final license = await bind.mainGetLicense();
|
final license = await bind.mainGetLicense();
|
||||||
final version = await bind.mainGetVersion();
|
final version = await bind.mainGetVersion();
|
||||||
return {'license': license, 'version': version};
|
final buildDate = await bind.mainGetBuildDate();
|
||||||
|
return {'license': license, 'version': version, 'buildDate': buildDate};
|
||||||
}(), hasData: (data) {
|
}(), hasData: (data) {
|
||||||
final license = data['license'].toString();
|
final license = data['license'].toString();
|
||||||
final version = data['version'].toString();
|
final version = data['version'].toString();
|
||||||
|
final buildDate = data['buildDate'].toString();
|
||||||
const linkStyle = TextStyle(decoration: TextDecoration.underline);
|
const linkStyle = TextStyle(decoration: TextDecoration.underline);
|
||||||
final scrollController = ScrollController();
|
final scrollController = ScrollController();
|
||||||
return DesktopScrollWrapper(
|
return DesktopScrollWrapper(
|
||||||
@ -1048,6 +1050,7 @@ class _AboutState extends State<_About> {
|
|||||||
height: 8.0,
|
height: 8.0,
|
||||||
),
|
),
|
||||||
Text('Version: $version').marginSymmetric(vertical: 4.0),
|
Text('Version: $version').marginSymmetric(vertical: 4.0),
|
||||||
|
Text('Build Date: $buildDate').marginSymmetric(vertical: 4.0),
|
||||||
InkWell(
|
InkWell(
|
||||||
onTap: () {
|
onTap: () {
|
||||||
launchUrlString('https://rustdesk.com/privacy');
|
launchUrlString('https://rustdesk.com/privacy');
|
||||||
|
@ -161,19 +161,23 @@ pub fn get_version_from_url(url: &str) -> String {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn gen_version() {
|
pub fn gen_version() {
|
||||||
|
use std::io::prelude::*;
|
||||||
let mut file = File::create("./src/version.rs").unwrap();
|
let mut file = File::create("./src/version.rs").unwrap();
|
||||||
for line in read_lines("Cargo.toml").unwrap() {
|
for line in read_lines("Cargo.toml").unwrap() {
|
||||||
if let Ok(line) = line {
|
if let Ok(line) = line {
|
||||||
let ab: Vec<&str> = line.split("=").map(|x| x.trim()).collect();
|
let ab: Vec<&str> = line.split("=").map(|x| x.trim()).collect();
|
||||||
if ab.len() == 2 && ab[0] == "version" {
|
if ab.len() == 2 && ab[0] == "version" {
|
||||||
use std::io::prelude::*;
|
file.write_all(format!("pub const VERSION: &str = {};\n", ab[1]).as_bytes())
|
||||||
file.write_all(format!("pub const VERSION: &str = {};", ab[1]).as_bytes())
|
|
||||||
.ok();
|
.ok();
|
||||||
file.sync_all().ok();
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// generate build date
|
||||||
|
let build_date = format!("{}", chrono::Local::now().format("%Y-%m-%d %H:%M"));
|
||||||
|
file.write_all(format!("pub const BUILD_DATE: &str = \"{}\";", build_date).as_bytes())
|
||||||
|
.ok();
|
||||||
|
file.sync_all().ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
|
fn read_lines<P>(filename: P) -> io::Result<io::Lines<io::BufReader<File>>>
|
||||||
|
@ -1025,6 +1025,10 @@ pub fn main_get_icon() -> String {
|
|||||||
return String::new();
|
return String::new();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn main_get_build_date() -> String {
|
||||||
|
crate::BUILD_DATE.to_string()
|
||||||
|
}
|
||||||
|
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
unsafe extern "C" fn translate(name: *const c_char, locale: *const c_char) -> *const c_char {
|
unsafe extern "C" fn translate(name: *const c_char, locale: *const c_char) -> *const c_char {
|
||||||
let name = CStr::from_ptr(name);
|
let name = CStr::from_ptr(name);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user