lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor into_string body reading

Browse Source
This commit is contained in:
Martin Algesten
2021-03-25 17:37:11 +01:00
parent 7c6ed53df3
commit 3cfa9e6b35
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/response.rs
View File

@@ -335,10 +335,10 @@ impl Response {
/// ///
pub fn into_string(self) -> io::Result<String> { pub fn into_string(self) -> io::Result<String> {
#[cfg(feature = "charset")] #[cfg(feature = "charset")]
{
let encoding = Encoding::for_label(self.charset().as_bytes()) let encoding = Encoding::for_label(self.charset().as_bytes())
.or_else(|| Encoding::for_label(DEFAULT_CHARACTER_SET.as_bytes())) .or_else(|| Encoding::for_label(DEFAULT_CHARACTER_SET.as_bytes()))
.unwrap(); .unwrap();
let mut buf: Vec<u8> = vec![]; let mut buf: Vec<u8> = vec![];
self.into_reader() self.into_reader()
.take((INTO_STRING_LIMIT + 1) as u64) .take((INTO_STRING_LIMIT + 1) as u64)
@@ -349,21 +349,14 @@ impl Response {
"response too big for into_string", "response too big for into_string",
)); ));
} }
#[cfg(feature = "charset")]
{
let (text, _, _) = encoding.decode(&buf); let (text, _, _) = encoding.decode(&buf);
Ok(text.into_owned()) Ok(text.into_owned())
} }
#[cfg(not(feature = "charset"))] #[cfg(not(feature = "charset"))]
{ {
let mut buf: Vec<u8> = vec![];
self.into_reader()
.take((INTO_STRING_LIMIT + 1) as u64)
.read_to_end(&mut buf)?;
if buf.len() > INTO_STRING_LIMIT {
return Err(io::Error::new(
io::ErrorKind::Other,
"response too big for into_string",
));
}
Ok(String::from_utf8_lossy(&buf).to_string()) Ok(String::from_utf8_lossy(&buf).to_string())
} }
} }