mirror of
https://github.com/house-of-vanity/v2-uri-parser.git
synced 2025-12-16 06:57:52 +00:00
Url decode names
This commit is contained in:
@@ -13,7 +13,7 @@ pub fn get_data(uri: &str) -> RawData {
|
|||||||
let query: Vec<(&str, &str)> = querystring::querify(raw_query);
|
let query: Vec<(&str, &str)> = querystring::querify(raw_query);
|
||||||
|
|
||||||
return RawData {
|
return RawData {
|
||||||
remarks: String::from(name),
|
remarks: url_decode(Some(String::from(name))).unwrap_or(String::from("")),
|
||||||
uuid: Some(parsed_address.uuid),
|
uuid: Some(parsed_address.uuid),
|
||||||
port: Some(parsed_address.port),
|
port: Some(parsed_address.port),
|
||||||
address: Some(parsed_address.address),
|
address: Some(parsed_address.address),
|
||||||
@@ -54,7 +54,7 @@ fn parse_trojan_address(raw_data: &str) -> models::TrojanAddress {
|
|||||||
|
|
||||||
let parsed = address_wo_slash.parse::<Uri>().unwrap();
|
let parsed = address_wo_slash.parse::<Uri>().unwrap();
|
||||||
|
|
||||||
return models::TrojanAddress{
|
return models::TrojanAddress {
|
||||||
uuid: url_decode(Some(uuid)).unwrap(),
|
uuid: url_decode(Some(uuid)).unwrap(),
|
||||||
address: parsed.host().unwrap().to_string(),
|
address: parsed.host().unwrap().to_string(),
|
||||||
port: parsed.port().unwrap().as_u16(),
|
port: parsed.port().unwrap().as_u16(),
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ pub fn get_data(uri: &str) -> RawData {
|
|||||||
let query: Vec<(&str, &str)> = querystring::querify(raw_query);
|
let query: Vec<(&str, &str)> = querystring::querify(raw_query);
|
||||||
|
|
||||||
return RawData {
|
return RawData {
|
||||||
remarks: String::from(name),
|
remarks: url_decode(Some(String::from(name))).unwrap_or(String::from("")),
|
||||||
uuid: Some(parsed_address.uuid),
|
uuid: Some(parsed_address.uuid),
|
||||||
port: Some(parsed_address.port),
|
port: Some(parsed_address.port),
|
||||||
address: Some(parsed_address.address),
|
address: Some(parsed_address.address),
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ fn get_raw_data_from_base64(decoded_base64: &Vec<u8>) -> RawData {
|
|||||||
let json = serde_json::from_str::<Value>(json_str).unwrap();
|
let json = serde_json::from_str::<Value>(json_str).unwrap();
|
||||||
|
|
||||||
return RawData {
|
return RawData {
|
||||||
remarks: get_str_field(&json, "ps").unwrap_or(String::from("")),
|
remarks: url_decode(get_str_field(&json, "ps")).unwrap_or(String::from("")),
|
||||||
uuid: get_str_field(&json, "id"),
|
uuid: get_str_field(&json, "id"),
|
||||||
port: get_str_field(&json, "port")
|
port: get_str_field(&json, "port")
|
||||||
.and_then(|s| Some(s.parse::<u16>().expect("port is not a number"))),
|
.and_then(|s| Some(s.parse::<u16>().expect("port is not a number"))),
|
||||||
|
|||||||
Reference in New Issue
Block a user