Add a clizip plugin, and update the template cliplugin file a bit.

svn path=/trunk/KDE/kdeutils/ark/; revision=961691

plugins/CMakeLists.txt

@@ -15,5 +15,6 @@ endif (LIBZIP_FOUND)
 
 add_subdirectory( clirarplugin )
 add_subdirectory( cli7zplugin )
+add_subdirectory( clizipplugin )
 add_subdirectory( libsinglefileplugin )
 add_subdirectory( unace )

plugins/cliplugin/cliplugin.cpp

@@ -52,11 +52,27 @@ class CliPlugin: public CliInterface
 				p[ListProgram] = p[ExtractProgram] = p[DeleteProgram] = p[AddProgram] = "rar";
 
 				p[ListArgs] = QStringList() << "v" << "-c-" << "$Archive";
-				p[ExtractArgs] = QStringList() << "$PreservePathSwitch" << "$RootNodeSwitch" << "$Archive" << "$Files";
+				p[ExtractArgs] = QStringList() << "-p-" << "$PreservePathSwitch" << "$PasswordSwitch" << "$RootNodeSwitch" << "$Archive" << "$Files";
 				p[PreservePathSwitch] = QStringList() << "x" << "e";
 				p[RootNodeSwitch] = QStringList() << "-ap$Path";
+				p[PasswordSwitch] = QStringList() << "-p$Password";
 
-			}
+				p[DeleteArgs] = QStringList() << "d" << "$Archive" << "$Files";
+
+				p[FileExistsExpression] = "^(.+) already exists. Overwrite it";
+				p[FileExistsInput] = QStringList()
+					<< "Y" //overwrite
+					<< "N" //skip
+					<< "A" //overwrite all
+					<< "E" //autoskip
+					<< "Q" //cancel
+					;
+
+				p[AddArgs] = QStringList() << "a" << "$Archive" << "$Files";
+
+				p[WrongPasswordPatterns] = QStringList() << "password incorrect";
+				p[ExtractionFailedPatterns] = QStringList() << "CRC failed";
+		}
 			return p;
 		}
 

plugins/clizipplugin/CMakeLists.txt

+
+include_directories(
+                     ${CMAKE_CURRENT_SOURCE_DIR}/../..
+                     ${CMAKE_CURRENT_BINARY_DIR}/../..
+                   )
+
+########### next target ###############
+
+set(kerfuffle_clizip_SRCS cliplugin.cpp)
+
+kde4_add_plugin(kerfuffle_clizip ${kerfuffle_clizip_SRCS})
+
+target_link_libraries(kerfuffle_clizip  ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle )
+
+
+
+########### install files ###############
+
+install(TARGETS kerfuffle_clizip  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install( FILES kerfuffle_clizip.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+

plugins/clizipplugin/cliplugin.cpp

+/*
+ * ark -- archiver for the KDE project
+ *
+ * Copyright (C) 2008 Claudio Bantaloukas <rockdreamer@gmail.com>
+ * Copyright (C) 2007 Henrique Pinto <henrique.pinto@kdemail.net>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+#include "kerfuffle/cliinterface.h"
+#include "kerfuffle/archivefactory.h"
+#include <kdebug.h>
+
+#include <QDir>
+
+using namespace Kerfuffle;
+
+class CliPlugin: public CliInterface
+{
+	public:
+		explicit CliPlugin( const QString & filename, QObject *parent = 0 )
+			: CliInterface( filename, parent ),
+			m_incontent(false)
+		{
+
+		}
+
+		virtual ~CliPlugin()
+		{
+
+		}
+
+		virtual ParameterList parameterList() const
+		{
+			static ParameterList p;
+			if (p.isEmpty()) {
+
+				p[CaptureProgress] = false;
+				p[ListProgram] = p[ExtractProgram] = "unzip";
+				p[DeleteProgram] = p[AddProgram] = "zip";
+
+				p[ListArgs] = QStringList() << "-l" << "-v" << "$Archive";
+				p[ExtractArgs] = QStringList() << "-p-" << "$PreservePathSwitch" << "$PasswordSwitch" << "$RootNodeSwitch" << "$Archive" << "$Files";
+				p[PreservePathSwitch] = QStringList() << "x" << "e";
+				p[RootNodeSwitch] = QStringList() << "-ap$Path";
+				p[PasswordSwitch] = QStringList() << "-p$Password";
+
+				p[DeleteArgs] = QStringList() << "d" << "$Archive" << "$Files";
+
+				p[FileExistsExpression] = "^(.+) already exists. Overwrite it";
+				p[FileExistsInput] = QStringList()
+					<< "Y" //overwrite
+					<< "N" //skip
+					<< "A" //overwrite all
+					<< "E" //autoskip
+					<< "Q" //cancel
+					;
+
+				p[AddArgs] = QStringList() << "a" << "$Archive" << "$Files";
+
+				p[WrongPasswordPatterns] = QStringList() << "password incorrect";
+				p[ExtractionFailedPatterns] = QStringList() << "CRC failed";
+			}
+			return p;
+		}
+
+
+
+
+		bool m_isFirstLine, m_incontent, m_isPasswordProtected;
+		QString m_entryFilename, m_internalId;
+
+		bool readListLine(QString line)
+		{
+
+			const QString m_headerString = "--------";
+			// skip the heading
+			if (!m_incontent){
+				if (line.startsWith(m_headerString) )
+					m_incontent = true;
+				return true;
+			}
+			// catch final line
+			if (line.startsWith(m_headerString) ) {
+				m_incontent = false;
+				return true;
+			}
+
+			// rar gives one line for the filename and a line after it with some file properties
+			if ( m_isFirstLine ) {
+				m_internalId = line.trimmed();
+				//m_entryFilename.chop(1); // handle newline
+				if (!m_internalId.isEmpty() && m_internalId.at(0) == '*')
+				{
+					m_isPasswordProtected = true;
+					m_internalId.remove( 0, 1 ); // and the spaces in front
+				}
+				else
+					m_isPasswordProtected = false;
+
+				m_isFirstLine = false;
+				return true;
+			}
+
+			QStringList fileprops = line.split(' ', QString::SkipEmptyParts);
+			m_internalId = QDir::fromNativeSeparators(m_internalId);
+			bool isDirectory = (bool)(fileprops[ 5 ].contains('d', Qt::CaseInsensitive));
+
+			QDateTime ts (QDate::fromString(fileprops[ 3 ], "dd-MM-yy"),
+					QTime::fromString(fileprops[ 4 ], "hh:mm"));
+			// rar output date with 2 digit year but QDate takes is as 19??
+			// let's take 1950 is cut-off; similar to KDateTime
+			if (ts.date().year() < 1950)
+				ts = ts.addYears(100);
+
+			m_entryFilename = m_internalId;
+			if (isDirectory && !m_internalId.endsWith('/'))
+			{
+				m_entryFilename += '/';
+			}
+
+			//kDebug( 1601 ) << m_entryFilename << " : " << fileprops ;
+			ArchiveEntry e;
+			e[ FileName ] = m_entryFilename;
+			e[ InternalID ] = m_internalId;
+			e[ Size ] = fileprops[ 0 ];
+			e[ CompressedSize] = fileprops[ 1 ];
+			e[ Ratio ] = fileprops[ 2 ];
+			e[ Timestamp ] = ts;
+			e[ IsDirectory ] = isDirectory;
+			e[ Permissions ] = fileprops[ 5 ].remove(0,1);
+			e[ CRC ] = fileprops[ 6 ];
+			e[ Method ] = fileprops[ 7 ];
+			e[ Version ] = fileprops[ 8 ];
+			e[ IsPasswordProtected] = m_isPasswordProtected;
+			kDebug( 1601 ) << "Added entry: " << e ;
+
+			entry(e);
+			m_isFirstLine = true;
+			return true;
+		}
+};
+
+KERFUFFLE_PLUGIN_FACTORY(CliPlugin)
+

plugins/clizipplugin/kerfuffle_clizip.desktop

+[Desktop Entry]
+Type=Service
+X-KDE-ServiceTypes=Kerfuffle/Plugin
+X-KDE-Library=kerfuffle_clizip
+X-KDE-PluginInfo-Author=Harald Hvaal
+X-KDE-PluginInfo-Email=haraldhv@stud.ntnu.no
+X-KDE-PluginInfo-Name=kerfuffle_clizip
+X-KDE-PluginInfo-Version=0.0.1
+X-KDE-PluginInfo-Website=http://www.kde.org
+X-KDE-PluginInfo-License=GPLv3
+X-KDE-Priority=160
+X-KDE-Kerfuffle-APIRevision=1
+X-KDE-Kerfuffle-ReadWrite=true
+Name=ZIP archive plugin
+MimeType=application/x-java-archive;application/x-jar;application/zip;application/x-zip-compressed;