ceos/universal-android-debloater-next-generation
1
0
Fork 0
mirror of https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation.git synced 2026-08-09 15:19:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

docs(ADB): more docs for ls_packs*, and validated returns Set

Browse source
This commit is contained in:
Rudxain 2024-12-15 19:49:27 -04:00
commit 4c61dc32f5
No known key found for this signature in database
GPG key ID: 0DAC837DDEF8E96C
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core/adb.rs
View file

@ -41,7 +41,7 @@ use crate::core::sync::User;
use regex::Regex;
use serde::{Deserialize, Serialize};
use static_init::dynamic;
use std::process::Command;
use std::{collections::HashSet, process::Command};
#[cfg(target_os = "windows")]
use std::os::windows::process::CommandExt;
@ -213,8 +213,14 @@ pub const PM_CLEAR_PACK: &str = "pm clear";
#[derive(Debug)]
pub struct PmCmd(ShCmd);
impl PmCmd {
/// `list packages` sub-command,
/// stripped of "package:" prefix
/// `list packages` sub-command, stripped of [`PACK_PREFIX`].
/// This is "the rawest" version (minimal overhead).
///
/// `Ok` variant:
/// - isn't sorted
/// - duplicates never _seem_ to happen, but don't assume uniqueness
///
/// See also [`ls_packs_valid`].
pub fn ls_packs(
mut self,
f: Option<PmLsPackFlag>,
@ -240,12 +246,14 @@ impl PmCmd {
})
}
/// `list packages` sub-command, pre-validated.
/// This is strongly-typed, at the cost of regex overhead.
/// This is strongly-typed, at the cost of regex & hash overhead.
///
/// See also [`ls_packs`].
pub fn ls_packs_valid(
self,
f: Option<PmLsPackFlag>,
u: Option<User>,
) -> Result<Vec<PackId>, String> {
) -> Result<HashSet<PackId>, String> {
Ok(self.ls_packs(f, u)?
.into_iter()
.map(|p| PackId::new(p).expect("One of these is wrong: `PackId` regex, ADB implementation. Or the spec now allows a wider char-set")).collect())