From fbabecbe9eaeb6b2158a83190e000fc6af9c8f2c Mon Sep 17 00:00:00 2001
From: Ilia Ross <ilia@ross.gdn>
Date: Sun, 24 Sep 2023 22:12:59 +0300
Subject: [PATCH] Fix support for new ZSTD and XZ formats

---
 filemin/extract.cgi                               |   2 +-
 filemin/filemin-lib.pl                            |   1 +
 .../mime/application-x-xz-compressed-tar.png      | Bin 0 -> 764 bytes
 filemin/images/icons/mime/application-zstd.png    | Bin 0 -> 764 bytes
 4 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 filemin/images/icons/mime/application-x-xz-compressed-tar.png
 create mode 100644 filemin/images/icons/mime/application-zstd.png

diff --git a/filemin/extract.cgi b/filemin/extract.cgi
index b9c95a3cc..50ddf036e 100755
--- a/filemin/extract.cgi
+++ b/filemin/extract.cgi
@@ -12,7 +12,7 @@ if ($archive_type =~ /x-bzip/) {
 	$cmd = "tar xvjfp ".quotemeta("$cwd/$in{'file'}").
 	       " -C ".quotemeta($cwd);
 	}
-elsif ($archive_type =~ /x-tar|\/gzip|x-xz|x-compressed-tar/) {
+elsif ($archive_type =~ /x-tar|\/gzip|x-xz|zstd|x-compressed-tar/) {
 	$cmd = "tar xfp ".quotemeta("$cwd/$in{'file'}").
 	       " -C ".quotemeta($cwd);
 	}
diff --git a/filemin/filemin-lib.pl b/filemin/filemin-lib.pl
index ac6e612e1..c6998f085 100644
--- a/filemin/filemin-lib.pl
+++ b/filemin/filemin-lib.pl
@@ -397,6 +397,7 @@ sub print_interface {
                    index($type, "-x-tar") != -1           ||
                    (index($type, "-x-bzip") != -1 && has_command('bzip2')) ||
                    (index($type, "-gzip") != -1   && has_command('gzip'))  ||
+                   (index($type, "zstd") != -1   && has_command('zstd'))  ||
                    (index($type, "-x-xz") != -1   && has_command('xz'))
                   ) &&
                   has_command('tar')))
diff --git a/filemin/images/icons/mime/application-x-xz-compressed-tar.png b/filemin/images/icons/mime/application-x-xz-compressed-tar.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3a48f9956eba42a40a059b1949b67708ff59528
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10(nV9K~y-6rIfKw+fW#Vzk6-RaWX`e5d*ElMk~q$JOR8wc_Rik
zMqU7>O2E*iW1b)rL!&Ywf+ZFpsvVmo*Z1BI?R66gr3oDA4A!-eKOg<Sg|!v{Aw&q&
zc$+5H+A#puT9PC=R!U9Evb2l(?Ci{TyItGucJ1lusV&RWDy1e#k{nxW5kNE=jeY@v
zF=inwAq3mo+gx5=0&s9}z}3|iLI?m=uh&~X5DFmzrIb5ZNMRV#Y&HQ1f&gnRT5EzJ
z2!PNBgfRxKHA0Am!ljf%QB(!j>vdd)=Xn6a2ZXg2=S731lpG!&k|YVf?*mjBfRKRH
zTBEhb7_+d25NvF0aCCHpl(Hh$S_8<c3U~7|J@4=D)9G}oYnS7Qg?rPq=h3>^?{qrs
z?d?@HOc9G2Vku?SvwQeW#AR8|kiPT<({`FB2GCklmSsgO9jWUXnA^26hMk=qE-o%O
zKR;)8cekoYN(mqZ@c!}fF)4}yt+hLtE8q8tqR7oGT5F1;z!*cL(IAfF4?Z9Ug8?fm
zEBslS`Lr*|^E_&`8cHc19v-SHM4F})MM1OKTzcf--(uu>KGU&?<CuQGPru*C^SoCD
zYprRuTD05kDp+P&#^&ZGwOVcI(CP5WWWxRZJ-E%wvW(GaM5EC_O8F{cV+=)6pp>eJ
z#p>!Rx3{<4+}u=EEE?|m)mjtBG3)E=Rj|3cyBln6ZM_S_5LkXH+?I~VV|u;b05Bdf
zdU|^LxVE;|_B<~d4u=efL-IT)&vTxipJ!YY1$mz1?n~2@EXzpKlwPklI5|1_etmuY
uRs8)od<MP%pMd{w$jdUoPvD!i_Q!8es1V$q!wyLR0000<MNUMnLSTY${!(-R

literal 0
HcmV?d00001

diff --git a/filemin/images/icons/mime/application-zstd.png b/filemin/images/icons/mime/application-zstd.png
new file mode 100644
index 0000000000000000000000000000000000000000..e3a48f9956eba42a40a059b1949b67708ff59528
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10(nV9K~y-6rIfKw+fW#Vzk6-RaWX`e5d*ElMk~q$JOR8wc_Rik
zMqU7>O2E*iW1b)rL!&Ywf+ZFpsvVmo*Z1BI?R66gr3oDA4A!-eKOg<Sg|!v{Aw&q&
zc$+5H+A#puT9PC=R!U9Evb2l(?Ci{TyItGucJ1lusV&RWDy1e#k{nxW5kNE=jeY@v
zF=inwAq3mo+gx5=0&s9}z}3|iLI?m=uh&~X5DFmzrIb5ZNMRV#Y&HQ1f&gnRT5EzJ
z2!PNBgfRxKHA0Am!ljf%QB(!j>vdd)=Xn6a2ZXg2=S731lpG!&k|YVf?*mjBfRKRH
zTBEhb7_+d25NvF0aCCHpl(Hh$S_8<c3U~7|J@4=D)9G}oYnS7Qg?rPq=h3>^?{qrs
z?d?@HOc9G2Vku?SvwQeW#AR8|kiPT<({`FB2GCklmSsgO9jWUXnA^26hMk=qE-o%O
zKR;)8cekoYN(mqZ@c!}fF)4}yt+hLtE8q8tqR7oGT5F1;z!*cL(IAfF4?Z9Ug8?fm
zEBslS`Lr*|^E_&`8cHc19v-SHM4F})MM1OKTzcf--(uu>KGU&?<CuQGPru*C^SoCD
zYprRuTD05kDp+P&#^&ZGwOVcI(CP5WWWxRZJ-E%wvW(GaM5EC_O8F{cV+=)6pp>eJ
z#p>!Rx3{<4+}u=EEE?|m)mjtBG3)E=Rj|3cyBln6ZM_S_5LkXH+?I~VV|u;b05Bdf
zdU|^LxVE;|_B<~d4u=efL-IT)&vTxipJ!YY1$mz1?n~2@EXzpKlwPklI5|1_etmuY
uRs8)od<MP%pMd{w$jdUoPvD!i_Q!8es1V$q!wyLR0000<MNUMnLSTY${!(-R

literal 0
HcmV?d00001