Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a37549 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "aflags: list: merge package and name into fully qualified name" into main

parents 7254e18a d408e965
Loading
Loading
Loading
Loading
+8 −13
Original line number Diff line number Diff line
@@ -116,32 +116,28 @@ enum Command {
}

struct PaddingInfo {
    longest_package_col: usize,
    longest_name_col: usize,
    longest_flag_col: usize,
    longest_val_col: usize,
    longest_value_picked_from_col: usize,
    longest_permission_col: usize,
}

fn format_flag_row(flag: &Flag, info: &PaddingInfo) -> String {
    let pkg = &flag.package;
    let p0 = info.longest_package_col + 1;

    let name = &flag.name;
    let p1 = info.longest_name_col + 1;
    let full_name = flag.qualified_name();
    let p0 = info.longest_flag_col + 1;

    let val = flag.value.to_string();
    let p2 = info.longest_val_col + 1;
    let p1 = info.longest_val_col + 1;

    let value_picked_from = flag.value_picked_from.to_string();
    let p3 = info.longest_value_picked_from_col + 1;
    let p2 = info.longest_value_picked_from_col + 1;

    let perm = flag.permission.to_string();
    let p4 = info.longest_permission_col + 1;
    let p3 = info.longest_permission_col + 1;

    let container = &flag.container;

    format!("{pkg:p0$}{name:p1$}{val:p2$}{value_picked_from:p3$}{perm:p4$}{container}\n")
    format!("{full_name:p0$}{val:p1$}{value_picked_from:p2$}{perm:p3$}{container}\n")
}

fn set_flag(qualified_name: &str, value: &str) -> Result<()> {
@@ -164,8 +160,7 @@ fn set_flag(qualified_name: &str, value: &str) -> Result<()> {
fn list() -> Result<String> {
    let flags = DeviceConfigSource::list_flags()?;
    let padding_info = PaddingInfo {
        longest_package_col: flags.iter().map(|f| f.package.len()).max().unwrap_or(0),
        longest_name_col: flags.iter().map(|f| f.name.len()).max().unwrap_or(0),
        longest_flag_col: flags.iter().map(|f| f.qualified_name().len()).max().unwrap_or(0),
        longest_val_col: flags.iter().map(|f| f.value.to_string().len()).max().unwrap_or(0),
        longest_value_picked_from_col: flags
            .iter()