Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cli/simplify transform entries #1119

Merged
merged 3 commits into from
Oct 5, 2024
Merged

Cli/simplify transform entries #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6795035
:recycle: Separate functions to transform entries for chmod
ChanTsune Oct 4, 2024
e92e4d0
:recycle: Separate functions to transform entries for xattr set
ChanTsune Oct 4, 2024
82bd09f
:recycle: Separate functions to convert entries for chown
ChanTsune Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions cli/src/command/chmod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use crate::{
utils::{GlobPatterns, PathPartExt},
};
use clap::{Parser, ValueHint};
use pna::RegularEntry;
use std::{
io,
path::PathBuf,
Expand Down Expand Up @@ -43,21 +44,24 @@ fn archive_chmod(args: ChmodCommand) -> io::Result<()> {
|entry| {
let entry = entry?;
if globs.matches_any(entry.header().path()) {
let metadata = entry.metadata().clone();
let permission = metadata.permission().map(|p| {
let mode = args.mode.apply_to(p.permissions());
pna::Permission::new(p.uid(), p.uname().into(), p.gid(), p.gname().into(), mode)
});
Ok(Some(
entry.with_metadata(metadata.with_permission(permission)),
))
Ok(Some(transform_entry(entry, args.mode)))
} else {
Ok(Some(entry))
}
},
)
}

#[inline]
fn transform_entry<T>(entry: RegularEntry<T>, mode: Mode) -> RegularEntry<T> {
let metadata = entry.metadata().clone();
let permission = metadata.permission().map(|p| {
let mode = mode.apply_to(p.permissions());
pna::Permission::new(p.uid(), p.uname().into(), p.gid(), p.gname().into(), mode)
});
entry.with_metadata(metadata.with_permission(permission))
}

#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
pub(crate) enum Target {
User,
Expand Down
61 changes: 31 additions & 30 deletions cli/src/command/chown.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ use crate::{
utils::{GlobPatterns, PathPartExt},
};
use clap::{Parser, ValueHint};
use pna::RegularEntry;
use std::ops::Not;
use std::{io, path::PathBuf, str::FromStr};

Expand Down Expand Up @@ -42,43 +43,43 @@ fn archive_chown(args: ChownCommand) -> io::Result<()> {
|entry| {
let entry = entry?;
if globs.matches_any(entry.header().path()) {
let metadata = entry.metadata().clone();
let permission = metadata.permission().map(|p| {
let user = args.owner.user();
#[cfg(unix)]
let user = user.and_then(|it| {
User::from_name(it).map(|it| (it.as_raw().into(), it.name().into()))
});
#[cfg(windows)]
let user = user
.and_then(|it| User::from_name(it).map(|it| (u64::MAX, it.name().into())));
#[cfg(not(any(unix, windows)))]
let user = user.map(|_| (p.uid(), p.uname().into()));
let (uid, uname) = user.unwrap_or_else(|| (p.uid(), p.uname().into()));

let group = args.owner.group();
#[cfg(unix)]
let group = group.and_then(|it| {
Group::from_name(it).map(|it| (it.as_raw().into(), it.name().into()))
});
#[cfg(windows)]
let group = group
.and_then(|it| Group::from_name(it).map(|it| (u64::MAX, it.name().into())));
#[cfg(not(any(unix, windows)))]
let group = group.map(|_| (p.gid(), p.gname().into()));
let (gid, gname) = group.unwrap_or_else(|| (p.gid(), p.gname().into()));
pna::Permission::new(uid, uname, gid, gname, p.permissions())
});
Ok(Some(
entry.with_metadata(metadata.with_permission(permission)),
))
Ok(Some(transform_entry(entry, &args.owner)))
} else {
Ok(Some(entry))
}
},
)
}

#[inline]
fn transform_entry<T>(entry: RegularEntry<T>, owner: &Owner) -> RegularEntry<T> {
let metadata = entry.metadata().clone();
let permission = metadata.permission().map(|p| {
let user = owner.user();
#[cfg(unix)]
let user = user
.and_then(|it| User::from_name(it).map(|it| (it.as_raw().into(), it.name().into())));
#[cfg(windows)]
let user = user.and_then(|it| User::from_name(it).map(|it| (u64::MAX, it.name().into())));
#[cfg(not(any(unix, windows)))]
let user = user.map(|_| (p.uid(), p.uname().into()));
let (uid, uname) = user.unwrap_or_else(|| (p.uid(), p.uname().into()));

let group = owner.group();
#[cfg(unix)]
let group = group
.and_then(|it| Group::from_name(it).map(|it| (it.as_raw().into(), it.name().into())));
#[cfg(windows)]
let group =
group.and_then(|it| Group::from_name(it).map(|it| (u64::MAX, it.name().into())));
#[cfg(not(any(unix, windows)))]
let group = group.map(|_| (p.gid(), p.gname().into()));
let (gid, gname) = group.unwrap_or_else(|| (p.gid(), p.gname().into()));
pna::Permission::new(uid, uname, gid, gname, p.permissions())
});
entry.with_metadata(metadata.with_permission(permission))
}

#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)]
pub(crate) struct Owner {
user: Option<String>,
Expand Down
50 changes: 33 additions & 17 deletions cli/src/command/xattr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ use crate::{
use base64::Engine;
use clap::{Parser, ValueHint};
use indexmap::IndexMap;
use pna::RegularEntry;
use std::{
fmt::{Display, Formatter, Write},
io,
Expand Down Expand Up @@ -177,30 +178,45 @@ fn archive_set_xattr(args: SetXattrCommand) -> io::Result<()> {
|entry| {
let entry = entry?;
if globs.matches_any(entry.header().path()) {
let mut xattrs = entry
.xattrs()
.iter()
.map(|it| (it.name(), it.value()))
.collect::<IndexMap<_, _>>();
if let Some(name) = args.name.as_deref() {
let map_entry = xattrs.entry(name);
map_entry.or_insert(value);
}
if let Some(name) = args.name.as_deref() {
xattrs.shift_remove_entry(name);
}
let xattrs = xattrs
.into_iter()
.map(|(key, value)| pna::ExtendedAttribute::new(key.into(), value.into()))
.collect::<Vec<_>>();
Ok(Some(entry.with_xattrs(&xattrs)))
Ok(Some(transform_entry(
entry,
args.name.as_deref(),
value,
args.remove.as_deref(),
)))
} else {
Ok(Some(entry))
}
},
)
}

#[inline]
fn transform_entry<T>(
entry: RegularEntry<T>,
name: Option<&str>,
value: &[u8],
remove: Option<&str>,
) -> RegularEntry<T> {
let mut xattrs = entry
.xattrs()
.iter()
.map(|it| (it.name(), it.value()))
.collect::<IndexMap<_, _>>();
if let Some(name) = name {
let map_entry = xattrs.entry(name);
map_entry.or_insert(value);
}
if let Some(name) = remove {
xattrs.shift_remove_entry(name);
}
let xattrs = xattrs
.into_iter()
.map(|(key, value)| pna::ExtendedAttribute::new(key.into(), value.into()))
.collect::<Vec<_>>();
entry.with_xattrs(&xattrs)
}

#[derive(Clone, Eq, PartialEq, Hash, Debug)]
struct Value(Vec<u8>);

Expand Down