ark: connect to the KArchive progress signal

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/ark/plugins/libarchive/libarchivehandler.cpp b/ark/plugins/libarchive/libarchivehandler.cpp
index 2e50005..92b5965 100644 (file)
--- a/ark/plugins/libarchive/libarchivehandler.cpp
+++ b/ark/plugins/libarchive/libarchivehandler.cpp
@@ -68,13 +68,14 @@ bool LibArchiveInterface::list()
         return false;
     }
 
+    emit progress(0.1);
     foreach (const KArchiveEntry &karchiveentry, karchive.list()) {
         ArchiveEntry archiveentry;
         copyEntry(&archiveentry, &karchiveentry);
         emit entry(archiveentry);
     }
-
     emit progress(1.0);
+
     return true;
 }
 
@@ -109,12 +110,12 @@ bool LibArchiveInterface::copyFiles(const QVariantList& files, const QString &de
             fileslist.append(variant.toString());
         }
     }
+    connect(&karchive, SIGNAL(progress(qreal)), this, SLOT(emitProgress(qreal)));
     if (!karchive.extract(fileslist, destinationDirectory, preservePaths)) {
         emit error(karchive.errorString());
         return false;
     }
 
-    emit progress(1.0);
     return true;
 }
 
@@ -144,6 +145,7 @@ bool LibArchiveInterface::addFiles(const QStringList &files, const CompressionOp
 
     const QList<KArchiveEntry> oldEntries = karchive.list();
     const QString strip(QDir::cleanPath(globalWorkDir) + QDir::separator());
+    connect(&karchive, SIGNAL(progress(qreal)), this, SLOT(emitProgress(qreal)));
     if (!karchive.add(files, QFile::encodeName(strip), QFile::encodeName(rootNode))) {
         emit error(karchive.errorString());
         return false;
@@ -157,7 +159,6 @@ bool LibArchiveInterface::addFiles(const QStringList &files, const CompressionOp
         }
     }
 
-    emit progress(1.0);
     return true;
 }
 
@@ -178,6 +179,7 @@ bool LibArchiveInterface::deleteFiles(const QVariantList &files)
     foreach (const QVariant &variant, files) {
         fileslist.append(variant.toString());
     }
+    connect(&karchive, SIGNAL(progress(qreal)), this, SLOT(emitProgress(qreal)));
     if (!karchive.remove(fileslist)) {
         emit error(karchive.errorString());
         return false;
@@ -187,10 +189,14 @@ bool LibArchiveInterface::deleteFiles(const QVariantList &files)
         emit entryRemoved(file);
     }
 
-    emit progress(1.0);
     return true;
 }
 
+void LibArchiveInterface::emitProgress(const qreal value)
+{
+    emit progress(value);
+}
+
 KERFUFFLE_EXPORT_PLUGIN(LibArchiveInterface)
 
 #include "moc_libarchivehandler.cpp"

diff --git a/ark/plugins/libarchive/libarchivehandler.h b/ark/plugins/libarchive/libarchivehandler.h
index fcecce3..0414493 100644 (file)
--- a/ark/plugins/libarchive/libarchivehandler.h
+++ b/ark/plugins/libarchive/libarchivehandler.h
@@ -44,6 +44,9 @@ public:
     bool copyFiles(const QVariantList& files, const QString &destinationDirectory, ExtractionOptions options) final;
     bool addFiles(const QStringList& files, const CompressionOptions &options) final;
     bool deleteFiles(const QVariantList& files) final;
+
+private Q_SLOTS:
+    void emitProgress(const qreal value);
 };
 
 #endif // LIBARCHIVEHANDLER_H