refactor, remove login device info in sciter

Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-08-11 19:28:25 +08:00
parent 3c3d1a84ef
commit 6608bf882f
3 changed files with 5 additions and 22 deletions

View File

@ -595,8 +595,8 @@ impl UI {
handle_relay_id(id)
}
fn get_hostname(&self) -> String {
get_hostname()
fn get_login_device_info(&self) -> String {
get_login_device_info_json()
}
}
@ -682,7 +682,7 @@ impl sciter::EventHandler for UI {
fn get_langs();
fn default_video_save_directory();
fn handle_relay_id(String);
fn get_hostname();
fn get_login_device_info();
}
}

View File

@ -1323,18 +1323,5 @@ function getHttpHeaders() {
}
function getDeviceInfo() {
var os;
if (is_win) {
os = 'windows';
} else if (is_linux) {
os = 'linux';
} else if (is_osx) {
os = 'macos';
}
return {
os: os,
type: 'client',
name: handler.get_hostname()
};
return JSON.parse(handler.get_login_device_info());
}

View File

@ -974,10 +974,6 @@ pub fn get_fingerprint() -> String {
return ipc::get_fingerprint();
}
pub fn get_hostname() -> String {
crate::common::hostname()
}
#[inline]
pub fn get_login_device_info() -> LoginDeviceInfo {
LoginDeviceInfo {
@ -990,7 +986,7 @@ pub fn get_login_device_info() -> LoginDeviceInfo {
#[inline]
pub fn get_login_device_info_json() -> String {
serde_json::to_string(&get_login_device_info()).unwrap_or_default()
serde_json::to_string(&get_login_device_info()).unwrap_or("{}".to_string())
}
// notice: avoiding create ipc connection repeatedly,