Lib/rename regular to normal

cli/benches/list.rs

@@ -6,7 +6,7 @@ use portable_network_archive::{cli, command};
 use test::Bencher;
 
 #[bench]
-fn regular(b: &mut Bencher) {
+fn normal(b: &mut Bencher) {
     b.iter(|| {
         command::entry(cli::Cli::parse_from([
             "pna",

cli/src/command/chmod.rs

@@ -8,7 +8,7 @@ use crate::{
     utils::{GlobPatterns, PathPartExt},
 };
 use clap::{Parser, ValueHint};
-use pna::RegularEntry;
+use pna::NormalEntry;
 use std::{
     io,
     path::PathBuf,
@@ -75,7 +75,7 @@ fn archive_chmod(args: ChmodCommand) -> io::Result<()> {
 }
 
 #[inline]
-fn transform_entry<T>(entry: RegularEntry<T>, mode: Mode) -> RegularEntry<T> {
+fn transform_entry<T>(entry: NormalEntry<T>, mode: Mode) -> NormalEntry<T> {
     let metadata = entry.metadata().clone();
     let permission = metadata.permission().map(|p| {
         let mode = mode.apply_to(p.permissions());

cli/src/command/chown.rs

@@ -10,7 +10,7 @@ use crate::{
     utils::{GlobPatterns, PathPartExt},
 };
 use clap::{Parser, ValueHint};
-use pna::RegularEntry;
+use pna::NormalEntry;
 use std::ops::Not;
 use std::{io, path::PathBuf, str::FromStr};
 
@@ -74,7 +74,7 @@ fn archive_chown(args: ChownCommand) -> io::Result<()> {
 }
 
 #[inline]
-fn transform_entry<T>(entry: RegularEntry<T>, owner: &Owner) -> RegularEntry<T> {
+fn transform_entry<T>(entry: NormalEntry<T>, owner: &Owner) -> NormalEntry<T> {
     let metadata = entry.metadata().clone();
     let permission = metadata.permission().map(|p| {
         let user = owner.user();

cli/src/command/commons.rs

@@ -4,8 +4,8 @@ use crate::{
 };
 use normalize_path::*;
 use pna::{
-    prelude::*, Archive, EntryBuilder, EntryName, EntryPart, EntryReference, ReadEntry,
-    RegularEntry, SolidEntryBuilder, WriteOptions, MIN_CHUNK_BYTES_SIZE, PNA_HEADER,
+    prelude::*, Archive, EntryBuilder, EntryName, EntryPart, EntryReference, NormalEntry,
+    ReadEntry, SolidEntryBuilder, WriteOptions, MIN_CHUNK_BYTES_SIZE, PNA_HEADER,
 };
 use std::{
     env::temp_dir,
@@ -115,7 +115,7 @@ pub(crate) fn create_entry(
         keep_options,
         owner_options,
     }: CreateOptions,
-) -> io::Result<RegularEntry> {
+) -> io::Result<NormalEntry> {
     if path.is_symlink() {
         let source = fs::read_link(path)?;
         let entry = EntryBuilder::new_symbolic_link(
@@ -363,9 +363,9 @@ pub(crate) trait TransformStrategy {
     where
         W: Write,
         T: AsRef<[u8]>,
-        F: FnMut(io::Result<RegularEntry<T>>) -> io::Result<Option<RegularEntry<T>>>,
-        RegularEntry<T>: From<RegularEntry>,
-        RegularEntry<T>: Entry;
+        F: FnMut(io::Result<NormalEntry<T>>) -> io::Result<Option<NormalEntry<T>>>,
+        NormalEntry<T>: From<NormalEntry>,
+        NormalEntry<T>: Entry;
 }
 
 pub(crate) struct TransformStrategyUnSolid;
@@ -380,9 +380,9 @@ impl TransformStrategy for TransformStrategyUnSolid {
     where
         W: Write,
         T: AsRef<[u8]>,
-        F: FnMut(io::Result<RegularEntry<T>>) -> io::Result<Option<RegularEntry<T>>>,
-        RegularEntry<T>: From<RegularEntry>,
-        RegularEntry<T>: Entry,
+        F: FnMut(io::Result<NormalEntry<T>>) -> io::Result<Option<NormalEntry<T>>>,
+        NormalEntry<T>: From<NormalEntry>,
+        NormalEntry<T>: Entry,
     {
         match read_entry? {
             ReadEntry::Solid(s) => {
@@ -393,7 +393,7 @@ impl TransformStrategy for TransformStrategyUnSolid {
                 }
                 Ok(())
             }
-            ReadEntry::Regular(n) => {
+            ReadEntry::Normal(n) => {
                 if let Some(entry) = transformer(Ok(n))? {
                     archive.add_entry(entry)?;
                 }
@@ -415,9 +415,9 @@ impl TransformStrategy for TransformStrategyKeepSolid {
     where
         W: Write,
         T: AsRef<[u8]>,
-        F: FnMut(io::Result<RegularEntry<T>>) -> io::Result<Option<RegularEntry<T>>>,
-        RegularEntry<T>: From<RegularEntry>,
-        RegularEntry<T>: Entry,
+        F: FnMut(io::Result<NormalEntry<T>>) -> io::Result<Option<NormalEntry<T>>>,
+        NormalEntry<T>: From<NormalEntry>,
+        NormalEntry<T>: Entry,
     {
         match read_entry? {
             ReadEntry::Solid(s) => {
@@ -438,7 +438,7 @@ impl TransformStrategy for TransformStrategyKeepSolid {
                 archive.add_entry(builder.build()?)?;
                 Ok(())
             }
-            ReadEntry::Regular(n) => {
+            ReadEntry::Normal(n) => {
                 if let Some(entry) = transformer(Ok(n))? {
                     archive.add_entry(entry)?;
                 }
@@ -478,7 +478,7 @@ pub(crate) fn run_process_archive<'p, Provider, F>(
 ) -> io::Result<()>
 where
     Provider: FnMut() -> Option<&'p str>,
-    F: FnMut(io::Result<RegularEntry>) -> io::Result<()>,
+    F: FnMut(io::Result<NormalEntry>) -> io::Result<()>,
 {
     let password = password_provider();
     run_read_entries(archive_provider, |entry| match entry? {
@@ -488,7 +488,7 @@ where
             }
             Ok(())
         }
-        ReadEntry::Regular(regular) => processor(Ok(regular)),
+        ReadEntry::Normal(regular) => processor(Ok(regular)),
     })
 }
 
@@ -550,7 +550,7 @@ pub(crate) fn run_entries<'p, P, Provider, F>(
 where
     P: AsRef<Path>,
     Provider: FnMut() -> Option<&'p str>,
-    F: FnMut(io::Result<RegularEntry<std::borrow::Cow<[u8]>>>) -> io::Result<()>,
+    F: FnMut(io::Result<NormalEntry<std::borrow::Cow<[u8]>>>) -> io::Result<()>,
 {
     let password = password_provider();
     run_read_entries_mem(path, |entry| {
@@ -560,7 +560,7 @@ where
                     processor(r.map(Into::into))?;
                 }
             }
-            ReadEntry::Regular(r) => processor(Ok(r))?,
+            ReadEntry::Normal(r) => processor(Ok(r))?,
         }
         Ok(())
     })
@@ -579,8 +579,8 @@ where
     P: AsRef<Path>,
     Provider: FnMut() -> Option<&'p str>,
     F: FnMut(
-        io::Result<RegularEntry<std::borrow::Cow<[u8]>>>,
-    ) -> io::Result<Option<RegularEntry<std::borrow::Cow<[u8]>>>>,
+        io::Result<NormalEntry<std::borrow::Cow<[u8]>>>,
+    ) -> io::Result<Option<NormalEntry<std::borrow::Cow<[u8]>>>>,
     Transform: TransformStrategy,
 {
     let password = password_provider();
@@ -633,7 +633,7 @@ where
     O: AsRef<Path>,
     P: AsRef<Path>,
     Provider: FnMut() -> Option<&'p str>,
-    F: FnMut(io::Result<RegularEntry>) -> io::Result<Option<RegularEntry>>,
+    F: FnMut(io::Result<NormalEntry>) -> io::Result<Option<NormalEntry>>,
     Transform: TransformStrategy,
 {
     let password = password_provider();
@@ -664,7 +664,7 @@ pub(crate) fn run_entries<'p, P, Provider, F>(
 where
     P: AsRef<Path>,
     Provider: FnMut() -> Option<&'p str>,
-    F: FnMut(io::Result<RegularEntry>) -> io::Result<()>,
+    F: FnMut(io::Result<NormalEntry>) -> io::Result<()>,
 {
     let path = path.as_ref();
     let provider = PathArchiveProvider(path);

cli/src/command/extract.rs

@@ -14,7 +14,7 @@ use crate::{
     utils::{self, fmt::DurationDisplay, GlobPatterns},
 };
 use clap::{ArgGroup, Parser, ValueHint};
-use pna::{prelude::*, DataKind, EntryReference, Permission, ReadOptions, RegularEntry};
+use pna::{prelude::*, DataKind, EntryReference, NormalEntry, Permission, ReadOptions};
 use rayon::ThreadPoolBuilder;
 #[cfg(target_os = "macos")]
 use std::os::macos::fs::FileTimesExt;
@@ -202,7 +202,7 @@ where
         .build()
         .map_err(io::Error::other)?;
 
-    let mut hard_link_entries = Vec::<RegularEntry>::new();
+    let mut hard_link_entries = Vec::<NormalEntry>::new();
 
     let (tx, rx) = std::sync::mpsc::channel();
     run_entries(path, password_provider, |entry| {
@@ -237,7 +237,7 @@ where
 }
 
 pub(crate) fn extract_entry<T>(
-    item: RegularEntry<T>,
+    item: NormalEntry<T>,
     password: Option<&str>,
     OutputOption {
         overwrite,

cli/src/command/list.rs

@@ -19,8 +19,8 @@ use clap::{
     ArgGroup, Parser,
 };
 use pna::{
-    prelude::*, Compression, DataKind, Encryption, ExtendedAttribute, RawChunk, ReadEntry,
-    ReadOptions, RegularEntry, SolidHeader,
+    prelude::*, Compression, DataKind, Encryption, ExtendedAttribute, NormalEntry, RawChunk,
+    ReadEntry, ReadOptions, SolidHeader,
 };
 use rayon::prelude::*;
 #[cfg(feature = "memmap")]
@@ -98,7 +98,7 @@ struct TableRow {
 
 impl<T>
     TryFrom<(
-        &RegularEntry<T>,
+        &NormalEntry<T>,
         Option<&str>,
         SystemTime,
         Option<&SolidHeader>,
@@ -113,7 +113,7 @@ where
     #[inline]
     fn try_from(
         (entry, password, now, solid, numeric_owner): (
-            &RegularEntry<T>,
+            &NormalEntry<T>,
             Option<&str>,
             SystemTime,
             Option<&SolidHeader>,
@@ -266,7 +266,7 @@ pub(crate) fn run_list_archive(
             ReadEntry::Solid(_) => {
                 log::warn!("This archive contain solid mode entry. if you need to show it use --solid option.");
             }
-            ReadEntry::Regular(item) => {
+            ReadEntry::Normal(item) => {
                 entries.push((&item, password, now, None, args.numeric_owner).try_into()?)
             }
         }
@@ -308,7 +308,7 @@ pub(crate) fn run_list_archive_mem(
             ReadEntry::Solid(_) => {
                 log::warn!("This archive contain solid mode entry. if you need to show it use --solid option.");
             }
-            ReadEntry::Regular(item) => {
+            ReadEntry::Normal(item) => {
                 entries.push((&item, password, now, None, args.numeric_owner).try_into()?)
             }
         }

cli/src/command/strip.rs

@@ -11,7 +11,7 @@ use crate::{
     utils::PathPartExt,
 };
 use clap::{Args, Parser, ValueHint};
-use pna::{prelude::*, Metadata, RawChunk, RegularEntry};
+use pna::{prelude::*, Metadata, NormalEntry, RawChunk};
 use std::{io, path::PathBuf};
 
 #[derive(Args, Clone, Eq, PartialEq, Hash, Debug)]
@@ -71,7 +71,7 @@ fn strip_metadata(args: StripCommand) -> io::Result<()> {
 }
 
 #[inline]
-fn strip_entry_metadata<T>(mut entry: RegularEntry<T>, options: &StripOptions) -> RegularEntry<T>
+fn strip_entry_metadata<T>(mut entry: NormalEntry<T>, options: &StripOptions) -> NormalEntry<T>
 where
     T: Clone,
     RawChunk<T>: Chunk,

cli/src/command/xattr.rs

@@ -12,7 +12,7 @@ use crate::{
 use base64::Engine;
 use clap::{Parser, ValueHint};
 use indexmap::IndexMap;
-use pna::RegularEntry;
+use pna::NormalEntry;
 use std::{
     fmt::{Display, Formatter, Write},
     io,
@@ -219,11 +219,11 @@ fn archive_set_xattr(args: SetXattrCommand) -> io::Result<()> {
 
 #[inline]
 fn transform_entry<T>(
-    entry: RegularEntry<T>,
+    entry: NormalEntry<T>,
     name: Option<&str>,
     value: &[u8],
     remove: Option<&str>,
-) -> RegularEntry<T> {
+) -> NormalEntry<T> {
     let mut xattrs = entry
         .xattrs()
         .iter()

cli/src/ext.rs

@@ -1,12 +1,12 @@
 use crate::chunk::{self, Ace};
-use pna::{prelude::*, RawChunk, RegularEntry};
+use pna::{prelude::*, NormalEntry, RawChunk};
 use std::io;
 
-pub(crate) trait RegularEntryExt {
+pub(crate) trait NormalEntryExt {
     fn acl(&self) -> io::Result<Vec<Ace>>;
 }
 
-impl<T> RegularEntryExt for RegularEntry<T>
+impl<T> NormalEntryExt for NormalEntry<T>
 where
     RawChunk<T>: Chunk,
 {

lib/benches/create_extract.rs

@@ -75,7 +75,7 @@ fn bench_read_archive_from_slice(b: &mut Bencher, mut options: WriteOptionsBuild
             let mut buf = Vec::with_capacity(1000);
             match item.unwrap() {
                 ReadEntry::Solid(_) => (),
-                ReadEntry::Regular(item) => {
+                ReadEntry::Normal(item) => {
                     item.reader(ReadOptions::with_password(Some("password")))
                         .unwrap()
                         .read_to_end(&mut buf)