Skip to content

Commit be13905

Browse files
RudxainAnonymousWP
authored andcommitted
chore(deps): upgrade ureq to v3
1 parent b778966 commit be13905

File tree

4 files changed

+177
-19
lines changed

4 files changed

+177
-19
lines changed

Cargo.lock

Lines changed: 153 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ log = "^0.4"
3030
regex = "^1.10.2"
3131
toml = "^0"
3232
dirs = "^6"
33-
ureq = { version = "2", features = ["json"] }
33+
ureq = { version = "3", features = ["json"] }
3434
retry = "^2.0.0"
3535
iced = { version = "^0.12.0", features = ["advanced", "image"] }
3636
rfd = "^0.15"

src/core/uad_lists.rs

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,28 @@ pub fn load_debloat_lists(remote: bool) -> Result<PackageHashMap, PackageHashMap
206206
let mut error = false;
207207
let list: PackageHashMap = if remote {
208208
retry(Fixed::from_millis(1000).take(60), || {
209-
match ureq::get(
210-
&format!("https://raw.githubusercontent.com/Universal-Debloater-Alliance/universal-android-debloater/\
211-
main/resources/assets/{LIST_FNAME}"),
212-
)
209+
match ureq::get(format!(
210+
"https://raw.githubusercontent.com\
211+
/Universal-Debloater-Alliance\
212+
/universal-android-debloater\
213+
/main\
214+
/resources\
215+
/assets\
216+
/{LIST_FNAME}"
217+
))
213218
.call()
214219
{
215-
Ok(data) => {
216-
// TODO: max resp size is 10MB, list is ~1.3MB;
217-
// TODO: https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/discussions/608
218-
#[warn(clippy::expect_used, reason = "this will panic if GH servers rate-limit the user, or many other reasons.")]
219-
let text = data.into_string().expect("response should be Ok type");
220+
Ok(mut data) => {
221+
// https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/discussions/608
222+
let text = data
223+
.body_mut()
224+
.with_config()
225+
.limit(1 << (3 + 10 + 10))
226+
.read_to_string()
227+
.expect("remote list is bigger than 8MiB");
220228
fs::write(cached_uad_lists.clone(), &text).expect("Unable to write file");
221-
let list: PackageHashMap = serde_json::from_str(&text).expect("Unable to parse");
229+
let list: PackageHashMap =
230+
serde_json::from_str(&text).expect("Unable to parse");
222231
OperationResult::Ok(list)
223232
}
224233
Err(e) => {

src/core/update.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ pub async fn download_file(url: &str, dest_file: PathBuf) -> Result<(), String>
5959
debug!("downloading file from {url}");
6060

6161
match ureq::get(url).call() {
62-
Ok(res) => {
62+
Ok(mut res) => {
6363
let mut file = fs::File::create(dest_file).map_err(|e| e.to_string())?;
6464

65-
if let Err(e) = copy(&mut res.into_reader(), &mut file) {
65+
if let Err(e) = copy(&mut res.body_mut().as_reader(), &mut file) {
6666
return Err(e.to_string());
6767
}
6868
}
@@ -175,10 +175,10 @@ pub fn get_latest_release() -> Result<Option<Release>, ()> {
175175
pub fn get_latest_release() -> Result<Option<Release>, ()> {
176176
debug!("Checking for {NAME} update");
177177

178-
if let Ok(res) = ureq::get("https://api.github.com/repos/Universal-Debloater-Alliance/universal-android-debloater/releases/latest")
178+
if let Ok(mut res) = ureq::get("https://api.github.com/repos/Universal-Debloater-Alliance/universal-android-debloater/releases/latest")
179179
.call() {
180180
let release: Release = serde_json::from_value(
181-
res.into_json::<serde_json::Value>()
181+
res.body_mut().read_json::<serde_json::Value>()
182182
.map_err(|_| ())?
183183
.clone(),
184184
)

0 commit comments

Comments
 (0)