Updating branch refs/heads/peter/libsqueeze to d62f93326d0b937d53cbb2b80b0c8e2862421cc6 (commit) from 502e288247fee04515fec09b630bfc8e2fbad663 (commit)
commit d62f93326d0b937d53cbb2b80b0c8e2862421cc6 Author: Peter de Ridder <pe...@xfce.org> Date: Sun Jun 17 13:26:59 2012 +0200 Configure time selection of refresh parser .gitignore | 3 ++ configure.in.in | 3 ++ data/Makefile.am | 10 ++--- data/gnu-tar.squeeze | 77 -------------------------------------------- data/gnu-tar.squeeze.in | 81 +++++++++++++++++++++++++++++++++++++++++++++++ data/unzip.squeeze | 34 ------------------- data/unzip.squeeze.in | 51 +++++++++++++++++++++++++++++ data/zip.squeeze | 45 -------------------------- data/zip.squeeze.in | 57 +++++++++++++++++++++++++++++++++ 9 files changed, 199 insertions(+), 162 deletions(-) diff --git a/.gitignore b/.gitignore index 4702bae..4ad5a06 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,9 @@ config.status config.sub configure configure.in +data/gnu-tar.squeeze +data/zip.squeeze +data/unzip.squeeze depcomp docs/reference/libsqueeze/version.xml gtk-doc.make diff --git a/configure.in.in b/configure.in.in index 8ecc71f..c037b4b 100644 --- a/configure.in.in +++ b/configure.in.in @@ -172,6 +172,9 @@ icons/48x48/Makefile icons/scalable/Makefile pixmaps/Makefile data/Makefile +data/gnu-tar.squeeze +data/zip.squeeze +data/unzip.squeeze docs/Makefile docs/reference/Makefile docs/reference/libsqueeze/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 63126e1..dcc7afe 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,8 +1,6 @@ squeezedir = $(datadir)/squeeze -squeeze_DATA = gnu-tar.squeeze \ - zip.squeeze \ - unzip.squeeze +squeeze_in_files = gnu-tar.squeeze.in zip.squeeze.in unzip.squeeze.in +squeeze_DATA = $(squeeze_in_files:.squeeze.in=.squeeze) -EXTRA_DIST = $(squeeze_DATA) - -# DISCLEANFILES = $(squeeze_DATA) +EXTRA_DIST = $(squeeze_in_files) +DISTCLEANFILES = $(squeeze_DATA) diff --git a/data/gnu-tar.squeeze b/data/gnu-tar.squeeze deleted file mode 100644 index 3a59abf..0000000 --- a/data/gnu-tar.squeeze +++ /dev/null @@ -1,77 +0,0 @@ -[Desktop Entry] -Name=Gnu Tar -Version=1.0 -Type=X-Squeeze-Archiver -MimeType=application/x-tar;application/x-tarz;application/x-tzo;application/x-compressed-tar;application/x-bzip-compressed-tar -X-Squeeze-Version=0.3 - -[application/x-tar] -X-Squeeze-Requires=tar -X-Squeeze-New=tar -cf %a %F -X-Squeeze-Add=tar -rf %a %F -X-Squeeze-Remove=tar -f %a --delete %F -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-compressed-tar] -X-Squeeze-Requires=tar;gzip;gunzip -X-Squeeze-New=tar -zcf %a %F -X-Squeeze-Add=gunzip -c %a > %t;tar -rf %a %F;gzip -c %t > %a -X-Squeeze-Remove=gunzip -c %a > %t;tar -f %t --delete %F; gzip -c %t > %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-bzip-compressed-tar] -X-Squeeze-Requires=tar;bzip2;bunzip2 -X-Squeeze-New=tar -jcf %a %F -X-Squeeze-Add=bunzip2 -c %a > %t;tar -rf %t %F;bzip2 -c %t > %a -X-Squeeze-Remove=bunzip2 -c %a > %t;tar -f %t --delete %F; bzip2 -c %t > %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-tarz] -X-Squeeze-Requires=tar;compress;uncompress -X-Squeeze-New=tar -Zcf %a %F -X-Squeeze-Add=lzop -dc %a > %t;tar -rf %t %F;lzop -c %t > %a -X-Squeeze-Remove=uncompress -c %a > %t;tar -f %t --delete %F; compress -c %t > %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[application/x-tzo] -X-Squeeze-Requires=tar;lzop -X-Squeeze-New=tar -cf --use-compress-program=lzop %a %F -X-Squeeze-Add=uncompress -c %a > %t;tar -rf %t %F;compress -c %t > %a -X-Squeeze-Remove=lzop -dc %a > %t;tar -f %t --delete %F; lzop -c %t > %a -X-Squeeze-Extract=tar -C %d -xf %a %F -X-Squeeze-Refresh=tar -tvvf %a - -[Squeeze-Add] -[Squeeze-Remove] -[Squeeze-Extract] -######################################################################## -# Tar does not support passwords, this is just for illustrative purposes -######################################################################## -# X-Squeeze-Options=Password;Overwrite - -[Squeeze-Refresh] -X-Squeeze-Headers=Rights;Owner/Group;Size;Date;Time -######################################################################## -# Tar does not support passwords, this is just for illustrative purposes -######################################################################## -# X-Squeeze-Options=Password - -# I wonder if this will be enough... -X-Squeeze-Parse=%s %s %u %s %s %F -X-Squeeze-Separator=space - -[Squeeze-Option-Password] -X-Squeeze-Flag=-p %s -X-Squeeze-Type=String -X-Squeeze-Value= -X-Squeeze-Description=Password - -[Squeeze-Option-Overwrite] -X-Squeeze-Flag=-f -X-Squeeze-Type=Bool -X-Squeeze-Value=FALSE -X-Squeeze-Description=Overwrite files diff --git a/data/gnu-tar.squeeze.in b/data/gnu-tar.squeeze.in new file mode 100644 index 0000000..c153a00 --- /dev/null +++ b/data/gnu-tar.squeeze.in @@ -0,0 +1,81 @@ +[Squeeze Entry] +Name=Gnu Tar +Version=1.0 +MimeType=application/x-tar;application/x-tarz;application/x-tzo;application/x-compressed-tar;application/x-bzip-compressed-tar +Actions=New;Add;Remove;Extract;Refresh + +[application/x-tar] +Requires=tar +New=tar -cf %a %F +Add=tar -rf %a %F +Remove=tar -f %a --delete %F +Extract=tar -C %d -xf %a %F +Refresh=tar -tvvf %a + +[application/x-compressed-tar] +Requires=tar;gzip;gunzip +New=tar -zcf %a %F +Add=gunzip -c %a > %t;tar -rf %a %F;gzip -c %t > %a +Remove=gunzip -c %a > %t;tar -f %t --delete %F; gzip -c %t > %a +Extract=tar -C %d -xf %a %F +Refresh=tar -tvvf %a + +[application/x-bzip-compressed-tar] +Requires=tar;bzip2;bunzip2 +New=tar -jcf %a %F +Add=bunzip2 -c %a > %t;tar -rf %t %F;bzip2 -c %t > %a +Remove=bunzip2 -c %a > %t;tar -f %t --delete %F; bzip2 -c %t > %a +Extract=tar -C %d -xf %a %F +Refresh=tar -tvvf %a + +[application/x-tarz] +Requires=tar;compress;uncompress +New=tar -Zcf %a %F +Add=lzop -dc %a > %t;tar -rf %t %F;lzop -c %t > %a +Remove=uncompress -c %a > %t;tar -f %t --delete %F; compress -c %t > %a +Extract=tar -C %d -xf %a %F +Refresh=tar -tvvf %a + +[application/x-tzo] +Requires=tar;lzop +New=tar -cf --use-compress-program=lzop %a %F +Add=uncompress -c %a > %t;tar -rf %t %F;compress -c %t > %a +Remove=lzop -dc %a > %t;tar -f %t --delete %F; lzop -c %t > %a +Extract=tar -C %d -xf %a %F +Refresh=tar -tvvf %a + +[Add] +[Remove] +[Extract] +######################################################################## +# Tar does not support passwords, this is just for illustrative purposes +######################################################################## +# Options=Password;Overwrite + +[Refresh] +Headers=Rights;Owner/Group;Size;Date +######################################################################## +# Tar does not support passwords, this is just for illustrative purposes +######################################################################## +# Options=Password + +@HAVE_PCRE_FALSE@Parser=scanf +@HAVE_PCRE_FALSE@Parse=%s %s %u %t %F + +@HAVE_PCRE_TRUE@Parser=pcre +@HAVE_PCRE_TRUE@Parse=^(?<1>[^ ]+) (?<2>[^ ]+) +(?<3>[0-9]+) (?<4>[0-9]+-[0-9]+-[0-9]+ [0-9]+:[0-9]+) (?<F>.*)$ +@HAVE_PCRE_TRUE@Types=1=s;2=s;3=u;4=t + +Parse-DateTime=%Y-%m-%d %R + +[Option-Password] +Flag=-p %s +Type=String +Value= +Description=Password + +[Option-Overwrite] +Flag=-f +Type=Bool +Value=FALSE +Description=Overwrite files diff --git a/data/unzip.squeeze b/data/unzip.squeeze deleted file mode 100644 index 673df39..0000000 --- a/data/unzip.squeeze +++ /dev/null @@ -1,34 +0,0 @@ -[Desktop Entry] -Name=UnZip -Version=1.0 -Type=X-Squeeze-Archiver -MimeType=application/x-zip -X-Squeeze-Version=0.3 - -[application/x-zip] -X-Squeeze-Requires=unzip -X-Squeeze-Refresh=unzip %a -X-Squeeze-Extract=unzip %a %F - -[Squeeze-Extract] -X-Squeeze-Options=Password;Overwrite - -[Squeeze-Refresh] -X-Squeeze-Headers=Rights;Owner/Group;Size;Date;Time;Name -X-Squeeze-Options=Password - -# I wonder if this will be enough... -X-Squeeze-Parse=%s %s %u %s %s %F -X-Squeeze-Separator=space - -[Squeeze-Option-Password] -X-Squeeze-Flag=-p %s -X-Squeeze-Type=String -X-Squeeze-Value= -X-Squeeze-Description=Password - -[Squeeze-Option-Overwrite] -X-Squeeze-Flag=-f -X-Squeeze-Type=Bool -X-Squeeze-Value=FALSE -X-Squeeze-Description=Overwrite files diff --git a/data/unzip.squeeze.in b/data/unzip.squeeze.in new file mode 100644 index 0000000..9d7336e --- /dev/null +++ b/data/unzip.squeeze.in @@ -0,0 +1,51 @@ +[Squeeze Entry] +Name=UnZip +Version=1.0 +MimeType=application/zip;application/x-zip +Actions=Extract;Refresh + +[application/zip] +Requires=unzip +Extract=unzip %a %F +Refresh=unzip -lv -qq %a +#Refresh=zipinfo -mT %a + +[application/x-zip] +Requires=unzip +Extract=unzip %a %F +Refresh=unzip -lv -qq %a +#Refresh=zipinfo -mT %a + +[Extract] +Options=Password;Overwrite + +[Refresh] +Headers=Size;Method;Compressed;Ratio;Date;CRC-32 +#Headers=Rights;Version;Platform;Size;Attributes;Ratio;Method;Date +Options=Password + +# I wonder if this will be enough... +@HAVE_PCRE_FALSE@Parser=scanf +@HAVE_PCRE_FALSE@Parse=%u %s %u %s %t %s %F +#Parse=%s %s %s %u %s %s %s %t %F + +@HAVE_PCRE_TRUE@Parser=pcre +@HAVE_PCRE_TRUE@Parse=^ +(?<1>[0-9]+) (?<2>[^ ]+) +(?<3>[0-9]+) +(?<4>[0-9]+%) (?<5>[0-9]+-[0-9]+-[0-9]+ [0-9]+:[0-9]+) (?<6>[^ ]+) (?<F>.*)$ +@HAVE_PCRE_TRUE@Types=1=u;2=s;3=u;4=s;5=t;6=s +#Parse=^(?<1>[^ ]+) +(?<2>[^ ]+) (?<3>[^ ]+) +(?<4>[0-9]+) (?<5>[^ ]+) +(?<6>[0-9]+%) (?<7>[^ ]+) (?<8>[0-9]+\.[0-9]+) (?<F>.*)$ +#Types=1=s;2=s;3=s;4=u;5=s;6=s;7=s;8=t + +Parse-DateTime=%m-%d-%Y %R +#Parse-DataTime=%Y%m%d.%H%M%S + +[Option-Password] +Flag=-p %s +Type=String +Value= +Description=Password + +[Option-Overwrite] +Flag=-f +Type=Bool +Value=FALSE +Description=Overwrite files diff --git a/data/zip.squeeze b/data/zip.squeeze deleted file mode 100644 index ab2742b..0000000 --- a/data/zip.squeeze +++ /dev/null @@ -1,45 +0,0 @@ -[Desktop Entry] -Name=Zip -Version=1.0 -Type=X-Squeeze-Archiver -MimeType=application/zip;application/x-zip -X-Squeeze-Version=0.3 - -[application/zip] -X-Squeeze-Requires=zip;unzip -X-Squeeze-Add=zip -r %a %F -X-Squeeze-Remove=zip -d %a %F -X-Squeeze-Extract=unzip %a %F -X-Squeeze-Refresh=unzip -lv -qq %a - -[application/x-zip] -X-Squeeze-Requires=zip;unzip -X-Squeeze-Add=zip -r %a %F -X-Squeeze-Remove=zip -d %a %F -X-Squeeze-Extract=unzip %a %F -X-Squeeze-Refresh=unzip -lv -qq %a - -[Squeeze-Add] -[Squeeze-Remove] -[Squeeze-Extract] -X-Squeeze-Options=Password;Overwrite - -[Squeeze-Refresh] -X-Squeeze-Headers=Size;Method;Compressed;Ratio;Date;Time;CRC-32 -X-Squeeze-Options=Password - -# I wonder if this will be enough... -X-Squeeze-Parse=%u %s %u %s %s %s %s %F -X-Squeeze-Separator=space - -[Squeeze-Option-Password] -X-Squeeze-Flag=-p %s -X-Squeeze-Type=String -X-Squeeze-Value= -X-Squeeze-Description=Password - -[Squeeze-Option-Overwrite] -X-Squeeze-Flag=-f -X-Squeeze-Type=Bool -X-Squeeze-Value=FALSE -X-Squeeze-Description=Overwrite files diff --git a/data/zip.squeeze.in b/data/zip.squeeze.in new file mode 100644 index 0000000..893d75b --- /dev/null +++ b/data/zip.squeeze.in @@ -0,0 +1,57 @@ +[Squeeze Entry] +Name=Zip +Version=1.0 +MimeType=application/zip;application/x-zip +Actions=New;Add;Remove;Extract;Refresh + +[application/zip] +Requires=zip;unzip +Add=zip -r %a %F +Remove=zip -d %a %F +Extract=unzip %a %F +Refresh=unzip -lv -qq %a +#Refresh=zipinfo -mT %a + +[application/x-zip] +Requires=zip;unzip +Add=zip -r %a %F +Remove=zip -d %a %F +Extract=unzip %a %F +Refresh=unzip -lv -qq %a +#Refresh=zipinfo -mT %a + +[Add] +[Remove] +[Extract] +Options=Password;Overwrite + +[Refresh] +Headers=Size;Method;Compressed;Ratio;Date;CRC-32 +#Headers=Rights;Version;Platform;Size;Attributes;Ratio;Method;Date +Options=Password + +# I wonder if this will be enough... +@HAVE_PCRE_FALSE@Parser=scanf +@HAVE_PCRE_FALSE@Parse=%u %s %u %s %t %s %F +#Parse=%s %s %s %u %s %s %s %t %F + +@HAVE_PCRE_TRUE@Parser=pcre +@HAVE_PCRE_TRUE@Parse=^ +(?<1>[0-9]+) (?<2>[^ ]+) +(?<3>[0-9]+) +(?<4>[0-9]+%) (?<5>[0-9]+-[0-9]+-[0-9]+ [0-9]+:[0-9]+) (?<6>[^ ]+) (?<F>.*)$ +@HAVE_PCRE_TRUE@Types=1=u;2=s;3=u;4=s;5=t;6=s +#Parse=^(?<1>[^ ]+) +(?<2>[^ ]+) (?<3>[^ ]+) +(?<4>[0-9]+) (?<5>[^ ]+) +(?<6>[0-9]+%) (?<7>[^ ]+) (?<8>[0-9]+\.[0-9]+) (?<F>.*)$ +#Types=1=s;2=s;3=s;4=u;5=s;6=s;7=s;8=t + +Parse-DateTime=%m-%d-%Y %R +#Parse-DataTime=%Y%m%d.%H%M%S + +[Option-Password] +Flag=-p %s +Type=String +Value= +Description=Password + +[Option-Overwrite] +Flag=-f +Type=Bool +Value=FALSE +Description=Overwrite files _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits