hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reimplement code extracting information from file name.

Browse Source 
This code tokenizes the file name based on commas and extracts
relevant parts sequentially.

`host=` is expected to be the first part.

Since Windows renames files adding (1), (2) etc. before the .exe
in case of duplicates, which causes the host or key values to be
garbled.

This allows using a `,` (comma) symbol as a final delimiter.

Fixes #4162
This commit is contained in:
Guido Falsi 2023-04-27 18:47:26 +02:00
parent 96560d9199
commit 5a25573125
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/license.rs
View File

@ -36,24 +36,38 @@ pub fn get_license_from_string(s: &str) -> ResultType<License> {
} else { } else {
s s
}; };
/*
* The following code tokenizes the file name based on commas and
* extracts relevant parts sequentially.
*
* host= is expected to be the first part.
*
* Since Windows renames files adding (1), (2) etc. before the .exe
* in case of duplicates, which causes the host or key values to be
* garbled.
*
* This allows using a ',' (comma) symbol as a final delimiter.
*/
if s.contains("host=") { if s.contains("host=") {
let strs: Vec<&str> = s.split("host=").collect(); let stripped = &s[s.find("host=").unwrap_or(0)..s.len()];
if strs.len() == 2 { let strs: Vec<&str> = stripped.split(",").collect();
let strs2: Vec<&str> = strs[1].split(",key=").collect(); let mut host = "";
let host; let mut key = "";
let mut key = ""; let strs_iter = strs.iter();
if strs2.len() == 2 { for el in strs_iter {
host = strs2[0]; if el.starts_with("host=") {
key = strs2[1]; host = &el[5..el.len()];
} else { }
host = strs[1];
if el.starts_with("key=") {
key = &el[4..el.len()];
} }
return Ok(License {
host: host.to_owned(),
key: key.to_owned(),
api: "".to_owned(),
});
} }
return Ok(License {
host: host.to_owned(),
key: key.to_owned(),
api: "".to_owned(),
});
} else { } else {
let strs = if s.contains("-licensed-") { let strs = if s.contains("-licensed-") {
s.split("-licensed-") s.split("-licensed-")