From 8e56d30cf88cadcb326d3f111245f2bac23fc36f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 18 Aug 2018 20:55:03 +0900 Subject: Fixed support for existing tar.lzma files. This requires commit 6bbc2b45 from tdelibs to be installed too. Signed-off-by: Michele Calgaro --- ark/archiveformatinfo.cpp | 1 + ark/ark.desktop | 2 +- ark/ark_part.desktop | 2 +- ark/tar.cpp | 8 +++++++- 4 files changed, 10 insertions(+), 3 deletions(-) (limited to 'ark') diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp index 4a961d6..d3c73a6 100644 --- a/ark/archiveformatinfo.cpp +++ b/ark/archiveformatinfo.cpp @@ -53,6 +53,7 @@ void ArchiveFormatInfo::buildFormatInfos() addFormatInfo( TAR_FORMAT, "application/x-tzo", ".tar.lzo" ); addFormatInfo( TAR_FORMAT, "application/x-tarz", ".tar.z" ); addFormatInfo( TAR_FORMAT, "application/x-tbz", ".tar.bz2" ); + addFormatInfo( TAR_FORMAT, "application/x-tlzma", ".tar.lzma" ); addFormatInfo( TAR_FORMAT, "application/x-tlz", ".tar.lz" ); addFormatInfo( TAR_FORMAT, "application/x-tar", ".tar" ); diff --git a/ark/ark.desktop b/ark/ark.desktop index 60ab3ae..f78681b 100644 --- a/ark/ark.desktop +++ b/ark/ark.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-lzip;application/x-tlz +MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-lzip;application/x-tlz;application/x-tlzma GenericName=Archiving Tool GenericName[af]=Argiveer Program GenericName[ar]=أداة أرشفة diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop index 0c8ba07..bcb9c60 100644 --- a/ark/ark_part.desktop +++ b/ark/ark_part.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-lzip;application/x-tlz +MimeType=application/x-gzip;application/x-lha;application/x-tar;application/x-tgz;application/x-tbz;application/x-zip;application/x-bzip;application/x-tzo;application/x-lzop;application/x-rar;application/x-zoo;application/x-tarz;application/x-archive;application/x-bzip2;application/x-jar;application/x-deb;application/x-ace;application/x-7z;application/x-arc;application/x-arj;application/x-compress;application/x-cpio;application/x-pak;application/x-lzma;application/x-xz;application/x-txz;application/x-lzip;application/x-tlz;application/x-tlzma Comment=Archive Handling Tool Comment[af]=Argief Handtering Program Comment[ar]=أداة التعامل مع الملفات المضغوطة diff --git a/ark/tar.cpp b/ark/tar.cpp index 0c6f3d2..cef9596 100644 --- a/ark/tar.cpp +++ b/ark/tar.cpp @@ -200,6 +200,9 @@ TQString TarArch::getCompressor() if ( m_fileMimeType == "application/x-tbz" ) return TQString( "bzip2" ); + if ( m_fileMimeType == "application/x-tlzma" ) + return TQString( "lzma" ); + if ( m_fileMimeType == "application/x-tlz" ) return TQString( "lzip" ); @@ -224,6 +227,9 @@ TQString TarArch::getUnCompressor() if ( m_fileMimeType == "application/x-tbz" ) return TQString( "bunzip2" ); + if ( m_fileMimeType == "application/x-tlzma" ) + return TQString( "lzma" ); + if ( m_fileMimeType == "application/x-tlz" ) return TQString( "lzip" ); @@ -389,7 +395,7 @@ void TarArch::createTmp() kdDebug(1601) << "Uncompressor is " << strUncompressor << endl; *kp << strUncompressor; TDEProcess::Communication flag = TDEProcess::AllOutput; - if (strUncompressor == "lzip") { + if (strUncompressor == "lzip" || strUncompressor == "lzma") { *kp << "-d"; } else if (strUncompressor == "lzop") -- cgit v1.2.3