Much faster archive loading

tsujan · Dec 18, 2019 · cfa1f8f · cfa1f8f
1 parent 8c889f6
commit cfa1f8f
Show file tree

Hide file tree

Showing 12 changed files with 117 additions and 108 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+V0.3.2
+---------
+ * Added a workaround for the low performance of QMimeDatabase. Loading of heavy archives is much faster now.
+
 V0.3.1
 ---------
  * Fixed archiving of files from different folders.

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	25 Oct 2019, V0.3.1
+	18 Dec 2019, V0.4
 
 See "ChangeLog" for changes.
diff --git a/backends.cpp b/backends.cpp
@@ -53,9 +53,19 @@ Backend::~Backend() {
 }
 
 QString Backend::getMimeType(const QString &fname) {
-  QMimeDatabase mimeDatabase;
-  QMimeType mimeType = mimeDatabase.mimeTypeForFile(QFileInfo(fname));
-  return mimeType.name();
+  QString mimeType, suffix;
+  int left = fname.indexOf(QLatin1Char('.'));
+  if (left != -1) {
+    suffix = fname.right(fname.size() - left - 1);
+    mimeType = mimeTypes_.value(suffix);
+  }
+  if (mimeType.isEmpty()) {
+    QMimeDatabase mimeDatabase;
+    mimeType = mimeDatabase.mimeTypeForFile(QFileInfo(fname)).name();
+    if (!suffix.isEmpty())
+      mimeTypes_.insert(suffix, mimeType);
+  }
+  return mimeType;
 }
 
 void Backend::loadFile(const QString& path, bool withPassword) {

diff --git a/backends.h b/backends.h
@@ -109,6 +109,8 @@ private slots:
 
   QProcess proc_;
 
+  QHash<QString, QString> mimeTypes_; // to speed up mime type search
+
   QString filepath_, tmpfilepath_, arqiverDir_;
   QStringList fileArgs_;
   /* "keyArgs_" is used, instead of QProcess::arguments(), to exlude file/item names

diff --git a/data/translations/arqiver.ts b/data/translations/arqiver.ts
@@ -12,37 +12,37 @@
 <context>
     <name>Arqiver::Backend</name>
     <message>
-        <location filename="../../backends.cpp" line="819"/>
-        <location filename="../../backends.cpp" line="862"/>
+        <location filename="../../backends.cpp" line="829"/>
+        <location filename="../../backends.cpp" line="872"/>
         <source>Could not read archive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="822"/>
-        <location filename="../../backends.cpp" line="867"/>
+        <location filename="../../backends.cpp" line="832"/>
+        <location filename="../../backends.cpp" line="877"/>
         <source>Archive Loaded</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="829"/>
-        <location filename="../../backends.cpp" line="915"/>
+        <location filename="../../backends.cpp" line="839"/>
+        <location filename="../../backends.cpp" line="925"/>
         <source>Modification Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="850"/>
-        <location filename="../../backends.cpp" line="884"/>
+        <location filename="../../backends.cpp" line="860"/>
+        <location filename="../../backends.cpp" line="894"/>
         <source>Extraction Finished</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="853"/>
-        <location filename="../../backends.cpp" line="903"/>
+        <location filename="../../backends.cpp" line="863"/>
+        <location filename="../../backends.cpp" line="913"/>
         <source>Extraction Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="996"/>
+        <location filename="../../backends.cpp" line="1006"/>
         <source>%1 is missing from your system.
 Please install it for this kind of archive!</source>
         <translation type="unfinished"></translation>
@@ -477,33 +477,33 @@ Do you want to continue?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1315"/>
+        <location filename="../../mainWin.cpp" line="1318"/>
         <source>A simple Qt archive manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1316"/>
+        <location filename="../../mainWin.cpp" line="1319"/>
         <source>based on libarchive, gzip and 7z</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1317"/>
+        <location filename="../../mainWin.cpp" line="1320"/>
         <source>Author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1318"/>
+        <location filename="../../mainWin.cpp" line="1321"/>
         <source>aka.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1319"/>
-        <location filename="../../mainWin.cpp" line="1320"/>
+        <location filename="../../mainWin.cpp" line="1322"/>
+        <location filename="../../mainWin.cpp" line="1323"/>
         <source>About Arqiver</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1319"/>
+        <location filename="../../mainWin.cpp" line="1322"/>
         <source>Translators</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/data/translations/arqiver_eo.ts b/data/translations/arqiver_eo.ts
@@ -12,37 +12,37 @@
 <context>
     <name>Arqiver::Backend</name>
     <message>
-        <location filename="../../backends.cpp" line="819"/>
-        <location filename="../../backends.cpp" line="862"/>
+        <location filename="../../backends.cpp" line="829"/>
+        <location filename="../../backends.cpp" line="872"/>
         <source>Could not read archive</source>
         <translation>La arkivo ne legeblis</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="822"/>
-        <location filename="../../backends.cpp" line="867"/>
+        <location filename="../../backends.cpp" line="832"/>
+        <location filename="../../backends.cpp" line="877"/>
         <source>Archive Loaded</source>
         <translation>Arkivo Ŝargita</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="829"/>
-        <location filename="../../backends.cpp" line="915"/>
+        <location filename="../../backends.cpp" line="839"/>
+        <location filename="../../backends.cpp" line="925"/>
         <source>Modification Finished</source>
         <translation>Modifado Farita</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="850"/>
-        <location filename="../../backends.cpp" line="884"/>
+        <location filename="../../backends.cpp" line="860"/>
+        <location filename="../../backends.cpp" line="894"/>
         <source>Extraction Finished</source>
         <translation>Ekstraktado Farita</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="853"/>
-        <location filename="../../backends.cpp" line="903"/>
+        <location filename="../../backends.cpp" line="863"/>
+        <location filename="../../backends.cpp" line="913"/>
         <source>Extraction Failed</source>
         <translation>Ekstraktado Malsukcesis</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="996"/>
+        <location filename="../../backends.cpp" line="1006"/>
         <source>%1 is missing from your system.
 Please install it for this kind of archive!</source>
         <translation>%1 mankas al via sistemo.
@@ -482,33 +482,33 @@ Do you want to continue?
         <translation>Ligilo Al %1</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1315"/>
+        <location filename="../../mainWin.cpp" line="1318"/>
         <source>A simple Qt archive manager</source>
         <translation>Simpla Qt-Arkivilo</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1316"/>
+        <location filename="../../mainWin.cpp" line="1319"/>
         <source>based on libarchive, gzip and 7z</source>
         <translation>bazita sur libarchive, gzip kaj 7z</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1317"/>
+        <location filename="../../mainWin.cpp" line="1320"/>
         <source>Author</source>
         <translation>Verkinto</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1318"/>
+        <location filename="../../mainWin.cpp" line="1321"/>
         <source>aka.</source>
         <translation>akk.</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1319"/>
-        <location filename="../../mainWin.cpp" line="1320"/>
+        <location filename="../../mainWin.cpp" line="1322"/>
+        <location filename="../../mainWin.cpp" line="1323"/>
         <source>About Arqiver</source>
         <translation>Pri Arqiver</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1319"/>
+        <location filename="../../mainWin.cpp" line="1322"/>
         <source>Translators</source>
         <translation>Tradukintoj</translation>
     </message>

diff --git a/data/translations/arqiver_nl.ts b/data/translations/arqiver_nl.ts
@@ -12,37 +12,37 @@
 <context>
     <name>Arqiver::Backend</name>
     <message>
-        <location filename="../../backends.cpp" line="819"/>
-        <location filename="../../backends.cpp" line="862"/>
+        <location filename="../../backends.cpp" line="829"/>
+        <location filename="../../backends.cpp" line="872"/>
         <source>Could not read archive</source>
         <translation>Kan archief niet uitlezen</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="822"/>
-        <location filename="../../backends.cpp" line="867"/>
+        <location filename="../../backends.cpp" line="832"/>
+        <location filename="../../backends.cpp" line="877"/>
         <source>Archive Loaded</source>
         <translation>Archief geladen</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="829"/>
-        <location filename="../../backends.cpp" line="915"/>
+        <location filename="../../backends.cpp" line="839"/>
+        <location filename="../../backends.cpp" line="925"/>
         <source>Modification Finished</source>
         <translation>Bewerking voltooid</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="850"/>
-        <location filename="../../backends.cpp" line="884"/>
+        <location filename="../../backends.cpp" line="860"/>
+        <location filename="../../backends.cpp" line="894"/>
         <source>Extraction Finished</source>
         <translation>Uitpakken voltooid</translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="853"/>
-        <location filename="../../backends.cpp" line="903"/>
+        <location filename="../../backends.cpp" line="863"/>
+        <location filename="../../backends.cpp" line="913"/>
         <source>Extraction Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../backends.cpp" line="996"/>
+        <location filename="../../backends.cpp" line="1006"/>
         <source>%1 is missing from your system.
 Please install it for this kind of archive!</source>
         <translation>%1 is niet geïnstalleerd.
@@ -479,33 +479,33 @@ Do you want to continue?
         <translation>Link naar: %1</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1315"/>
+        <location filename="../../mainWin.cpp" line="1318"/>
         <source>A simple Qt archive manager</source>
         <translation>Een eenvoudige Qt-archiefbeheerder</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1316"/>
+        <location filename="../../mainWin.cpp" line="1319"/>
         <source>based on libarchive, gzip and 7z</source>
         <translation>gebaseerd op libarchive, gzip en 7z</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1317"/>
+        <location filename="../../mainWin.cpp" line="1320"/>
         <source>Author</source>
         <translation>Maker</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1318"/>
+        <location filename="../../mainWin.cpp" line="1321"/>
         <source>aka.</source>
         <translation>ook bekend als</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1319"/>
-        <location filename="../../mainWin.cpp" line="1320"/>
+        <location filename="../../mainWin.cpp" line="1322"/>
+        <location filename="../../mainWin.cpp" line="1323"/>
         <source>About Arqiver</source>
         <translation>Over Arqiver</translation>
     </message>
     <message>
-        <location filename="../../mainWin.cpp" line="1319"/>
+        <location filename="../../mainWin.cpp" line="1322"/>
         <source>Translators</source>
         <translation>Vertalers</translation>
     </message>