summaryrefslogtreecommitdiff
path: root/plugins/extract
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/extract')
-rw-r--r--plugins/extract/README.md93
-rw-r--r--plugins/extract/_extract52
-rw-r--r--plugins/extract/extract.plugin.zsh124
3 files changed, 191 insertions, 78 deletions
diff --git a/plugins/extract/README.md b/plugins/extract/README.md
index ac4a8e197..7bedfb1c6 100644
--- a/plugins/extract/README.md
+++ b/plugins/extract/README.md
@@ -14,49 +14,56 @@ plugins=(... extract)
## Supported file extensions
-| Extension | Description |
-| :---------------- | :----------------------------------- |
-| `7z` | 7zip file |
-| `Z` | Z archive (LZW) |
-| `apk` | Android app file |
-| `aar` | Android library file |
-| `bz2` | Bzip2 file |
-| `cab` | Microsoft cabinet archive |
-| `cpio` | Cpio archive |
-| `deb` | Debian package |
-| `ear` | Enterprise Application aRchive |
-| `gz` | Gzip file |
-| `ipa` | iOS app package |
-| `ipsw` | iOS firmware file |
-| `jar` | Java Archive |
-| `lrz` | LRZ archive |
-| `lz4` | LZ4 archive |
-| `lzma` | LZMA archive |
-| `obscpio` | cpio archive used on OBS |
-| `rar` | WinRAR archive |
-| `rpm` | RPM package |
-| `sublime-package` | Sublime Text package |
-| `tar` | Tarball |
-| `tar.bz2` | Tarball with bzip2 compression |
-| `tar.gz` | Tarball with gzip compression |
-| `tar.lrz` | Tarball with lrzip compression |
-| `tar.lz` | Tarball with lzip compression |
-| `tar.lz4` | Tarball with lz4 compression |
-| `tar.xz` | Tarball with lzma2 compression |
-| `tar.zma` | Tarball with lzma compression |
-| `tar.zst` | Tarball with zstd compression |
-| `tbz` | Tarball with bzip compression |
-| `tbz2` | Tarball with bzip2 compression |
-| `tgz` | Tarball with gzip compression |
-| `tlz` | Tarball with lzma compression |
-| `txz` | Tarball with lzma2 compression |
-| `tzst` | Tarball with zstd compression |
-| `war` | Web Application archive (Java-based) |
-| `xpi` | Mozilla XPI module file |
-| `xz` | LZMA2 archive |
-| `zip` | Zip archive |
-| `zst` | Zstandard file (zstd) |
-| `zpaq` | Zpaq file |
+| Extension | Description |
+| :---------------- | :-------------------------------------- |
+| `7z` | 7zip file |
+| `apk` | Android app file |
+| `aar` | Android library file |
+| `bz2` | Bzip2 file |
+| `cab` | Microsoft cabinet archive |
+| `cpio` | Cpio archive |
+| `deb` | Debian package |
+| `ear` | Enterprise Application aRchive |
+| `exe` | Windows executable file |
+| `gz` | Gzip file |
+| `ipa` | iOS app package |
+| `ipsw` | iOS firmware file |
+| `jar` | Java Archive |
+| `lrz` | LRZ archive |
+| `lz4` | LZ4 archive |
+| `lzma` | LZMA archive |
+| `obscpio` | cpio archive used on OBS |
+| `pk3` | Renamed Zip archive used by Quake games |
+| `pk4` | Renamed Zip archive used by Quake games |
+| `pk7` | Renamed 7zip file used by Quake games |
+| `rar` | WinRAR archive |
+| `rpm` | RPM package |
+| `sublime-package` | Sublime Text package |
+| `tar` | Tarball |
+| `tar.bz2` | Tarball with bzip2 compression |
+| `tar.gz` | Tarball with gzip compression |
+| `tar.lrz` | Tarball with lrzip compression |
+| `tar.lz` | Tarball with lzip compression |
+| `tar.lz4` | Tarball with lz4 compression |
+| `tar.xz` | Tarball with lzma2 compression |
+| `tar.zma` | Tarball with lzma compression |
+| `tar.zst` | Tarball with zstd compression |
+| `tbz` | Tarball with bzip compression |
+| `tbz2` | Tarball with bzip2 compression |
+| `tgz` | Tarball with gzip compression |
+| `tlz` | Tarball with lzma compression |
+| `txz` | Tarball with lzma2 compression |
+| `tzst` | Tarball with zstd compression |
+| `vsix` | VS Code extension zip file |
+| `war` | Web Application archive (Java-based) |
+| `whl` | Python wheel file |
+| `xpi` | Mozilla XPI module file |
+| `xz` | LZMA2 archive |
+| `Z` | Z archive (LZW) |
+| `zip` | Zip archive |
+| `zlib` | zlib archive |
+| `zst` | Zstandard file (zstd) |
+| `zpaq` | Zpaq file |
See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for more information
regarding archive formats.
diff --git a/plugins/extract/_extract b/plugins/extract/_extract
index 56b17058f..6641443d3 100644
--- a/plugins/extract/_extract
+++ b/plugins/extract/_extract
@@ -1,7 +1,57 @@
#compdef extract
#autoload
+local -a exts=(
+ 7z
+ aar
+ apk
+ bz2
+ cab
+ cpio
+ crx
+ deb
+ ear
+ gz
+ ipa
+ ipsw
+ jar
+ lrz
+ lz4
+ lzma
+ obscpio
+ pk3
+ pk4
+ pk7
+ rar
+ rpm
+ sublime-package
+ tar
+ tar.bz2
+ tar.gz
+ tar.lrz
+ tar.lz
+ tar.lz4
+ tar.xz
+ tar.zma
+ tar.zst
+ tbz
+ tbz2
+ tgz
+ tlz
+ txz
+ tzst
+ vsix
+ war
+ whl
+ xpi
+ xz
+ Z
+ zip
+ zpaq
+ zst
+)
+
_arguments \
'(-r --remove)'{-r,--remove}'[Remove archive.]' \
- "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|cpio|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|obscpio|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst|zpaq)(-.)'" \
+ "*::archive file:_files -g '(#i)*.(${(j:|:)exts})(-.)'" \
&& return 0
diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh
index 7b7a2fa4f..aed77e7d7 100644
--- a/plugins/extract/extract.plugin.zsh
+++ b/plugins/extract/extract.plugin.zsh
@@ -27,63 +27,119 @@ EOF
fi
local success=0
- local extract_dir="${1:t:r}"
local file="$1" full_path="${1:A}"
+ local extract_dir="${1:t:r}"
+
+ # Remove the .tar extension if the file name is .tar.*
+ if [[ $extract_dir =~ '\.tar$' ]]; then
+ extract_dir="${extract_dir:r}"
+ fi
+
+ # If there's a file or directory with the same name as the archive
+ # add a random string to the end of the extract directory
+ if [[ -e "$extract_dir" ]]; then
+ local rnd="${(L)"${$(( [##36]$RANDOM*$RANDOM ))}":1:5}"
+ extract_dir="${extract_dir}-${rnd}"
+ fi
+
+ # Create an extraction directory based on the file name
+ command mkdir -p "$extract_dir"
+ builtin cd -q "$extract_dir"
+ echo "extract: extracting to $extract_dir" >&2
+
case "${file:l}" in
(*.tar.gz|*.tgz)
- (( $+commands[pigz] )) && { tar -I pigz -xvf "$file" } || tar zxvf "$file" ;;
+ (( $+commands[pigz] )) && { tar -I pigz -xvf "$full_path" } || tar zxvf "$full_path" ;;
(*.tar.bz2|*.tbz|*.tbz2)
- (( $+commands[pbzip2] )) && { tar -I pbzip2 -xvf "$file" } || tar xvjf "$file" ;;
+ (( $+commands[pbzip2] )) && { tar -I pbzip2 -xvf "$full_path" } || tar xvjf "$full_path" ;;
(*.tar.xz|*.txz)
- (( $+commands[pixz] )) && { tar -I pixz -xvf "$file" } || {
+ (( $+commands[pixz] )) && { tar -I pixz -xvf "$full_path" } || {
tar --xz --help &> /dev/null \
- && tar --xz -xvf "$file" \
- || xzcat "$file" | tar xvf - } ;;
+ && tar --xz -xvf "$full_path" \
+ || xzcat "$full_path" | tar xvf - } ;;
(*.tar.zma|*.tlz)
tar --lzma --help &> /dev/null \
- && tar --lzma -xvf "$file" \
- || lzcat "$file" | tar xvf - ;;
+ && tar --lzma -xvf "$full_path" \
+ || lzcat "$full_path" | tar xvf - ;;
(*.tar.zst|*.tzst)
tar --zstd --help &> /dev/null \
- && tar --zstd -xvf "$file" \
- || zstdcat "$file" | tar xvf - ;;
- (*.tar) tar xvf "$file" ;;
- (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$file" ;;
- (*.tar.lz4) lz4 -c -d "$file" | tar xvf - ;;
- (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$file" ;;
- (*.gz) (( $+commands[pigz] )) && pigz -dk "$file" || gunzip -k "$file" ;;
- (*.bz2) bunzip2 "$file" ;;
- (*.xz) unxz "$file" ;;
- (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$file" ;;
- (*.lz4) lz4 -d "$file" ;;
- (*.lzma) unlzma "$file" ;;
- (*.z) uncompress "$file" ;;
- (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$file" -d "$extract_dir" ;;
- (*.rar) unrar x -ad "$file" ;;
+ && tar --zstd -xvf "$full_path" \
+ || zstdcat "$full_path" | tar xvf - ;;
+ (*.tar) tar xvf "$full_path" ;;
+ (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$full_path" ;;
+ (*.tar.lz4) lz4 -c -d "$full_path" | tar xvf - ;;
+ (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$full_path" ;;
+ (*.gz) (( $+commands[pigz] )) && pigz -cdk "$full_path" > "${file:t:r}" || gunzip -ck "$full_path" > "${file:t:r}" ;;
+ (*.bz2) (( $+commands[pbzip2] )) && pbzip2 -d "$full_path" || bunzip2 "$full_path" ;;
+ (*.xz) unxz "$full_path" ;;
+ (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$full_path" ;;
+ (*.lz4) lz4 -d "$full_path" ;;
+ (*.lzma) unlzma "$full_path" ;;
+ (*.z) uncompress "$full_path" ;;
+ (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl|*.vsix|*.crx|*.pk3|*.pk4) unzip "$full_path" ;;
+ (*.rar)
+ if (( $+commands[unrar] )); then
+ unrar x -ad "$full_path"
+ elif (( $+commands[unar] )); then
+ unar -o . "$full_path"
+ else
+ echo "extract: cannot extract RAR files: install unrar or unar" >&2
+ success=1
+ fi ;;
(*.rpm)
- command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
- && rpm2cpio "$full_path" | cpio --quiet -id ;;
- (*.7z) 7za x "$file" ;;
+ rpm2cpio "$full_path" | cpio --quiet -id ;;
+ (*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;;
(*.deb)
- command mkdir -p "$extract_dir/control" "$extract_dir/data"
- builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
+ command mkdir -p "control" "data"
+ ar vx "$full_path" > /dev/null
builtin cd -q control; extract ../control.tar.*
builtin cd -q ../data; extract ../data.tar.*
builtin cd -q ..; command rm *.tar.* debian-binary ;;
- (*.zst) unzstd "$file" ;;
- (*.cab) cabextract -d "$extract_dir" "$file" ;;
- (*.cpio|*.obscpio) cpio -idmvF "$file" ;;
- (*.zpaq) zpaq x "$file" ;;
+ (*.zst) unzstd --stdout "$full_path" > "${file:t:r}" ;;
+ (*.cab|*.exe) cabextract "$full_path" ;;
+ (*.cpio|*.obscpio) cpio -idmvF "$full_path" ;;
+ (*.zpaq) zpaq x "$full_path" ;;
+ (*.zlib) zlib-flate -uncompress < "$full_path" > "${file:r}" ;;
(*)
echo "extract: '$file' cannot be extracted" >&2
success=1 ;;
esac
(( success = success > 0 ? success : $? ))
- (( success == 0 && remove_archive == 0 )) && rm "$full_path"
+ (( success == 0 && remove_archive == 0 )) && command rm "$full_path"
shift
- # Go back to original working directory in case we ran cd previously
+ # Go back to original working directory
builtin cd -q "$pwd"
+
+ # If content of extract dir is a single directory, move its contents up
+ # Glob flags:
+ # - D: include files starting with .
+ # - N: no error if directory is empty
+ # - Y2: at most give 2 files
+ local -a content
+ content=("${extract_dir}"/*(DNY2))
+ if [[ ${#content} -eq 1 && -e "${content[1]}" ]]; then
+ # The extracted file/folder (${content[1]}) may have the same name as $extract_dir
+ # If so, we need to rename it to avoid conflicts in a 3-step process
+ #
+ # 1. Move and rename the extracted file/folder to a temporary random name
+ # 2. Delete the empty folder
+ # 3. Rename the extracted file/folder to the original name
+ if [[ "${content[1]:t}" == "$extract_dir" ]]; then
+ # =(:) gives /tmp/zsh<random>, with :t it gives zsh<random>
+ local tmp_name==(:); tmp_name="${tmp_name:t}"
+ command mv "${content[1]}" "$tmp_name" \
+ && command rmdir "$extract_dir" \
+ && command mv "$tmp_name" "$extract_dir"
+ # Otherwise, if the extracted folder name already exists in the current
+ # directory (because of a previous file / folder), keep the extract_dir
+ elif [[ ! -e "${content[1]:t}" ]]; then
+ command mv "${content[1]}" . \
+ && command rmdir "$extract_dir"
+ fi
+ elif [[ ${#content} -eq 0 ]]; then
+ command rmdir "$extract_dir"
+ fi
done
}
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-02-14 02:07:11 +0000