Extract 7z loading to it's own function

This will unify 7z loading in all scenarios and it also fixes the search path in Linux, now the apps will always try to load 7z.so from LIBDIR/yacreader/7z.so, if it fails they'll try 7zip/7z.so

Author: luisangelsm

YACReaderLibrary/library_creator.cpp

@@ -141,12 +141,7 @@ void LibraryCreator::run()
     stopRunning = false;
     canceled = false;
 #if !defined use_unarr && !defined use_libarchive
-// check for 7z lib
-#if defined Q_OS_UNIX && !defined Q_OS_MACOS
-    QLibrary *sevenzLib = new QLibrary(QString(LIBDIR) + "/7zip/7z.so");
-#else
-    QLibrary *sevenzLib = new QLibrary(QCoreApplication::applicationDirPath() + "/utils/7z");
-#endif
+    auto sevenzLib = YACReader::load7zLibrary();
 
     if (!sevenzLib->load()) {
         QLOG_ERROR() << "Loading 7z.dll : " + sevenzLib->errorString() << Qt::endl;

YACReaderLibrary/xml_info_library_scanner.cpp

@@ -45,12 +45,7 @@ void XMLInfoLibraryScanner::scanFolder(const QString &source, const QString &tar
 void XMLInfoLibraryScanner::run()
 {
 #if !defined use_unarr && !defined use_libarchive
-// check for 7z lib
-#if defined Q_OS_UNIX && !defined Q_OS_MACOS
-    QLibrary *sevenzLib = new QLibrary(QString(LIBDIR) + "/7zip/7z.so");
-#else
-    QLibrary *sevenzLib = new QLibrary(QCoreApplication::applicationDirPath() + "/utils/7z");
-#endif
+    auto sevenzLib = YACReader::load7zLibrary();
 
     if (!sevenzLib->load()) {
         QLOG_ERROR() << "Loading 7z.dll : " + sevenzLib->errorString() << Qt::endl;

common/yacreader_global.cpp

@@ -1,6 +1,8 @@
 #include "yacreader_global.h"
 
 #include <QModelIndex>
+#include <QLibrary>
+#include <QCoreApplication>
 
 using namespace YACReader;
 
@@ -119,3 +121,17 @@ void YACReader::iterate(const QModelIndex &index,
     for (int i = 0; i < rows; ++i)
         iterate(model->index(i, 0, index), model, iteration);
 }
+
+QLibrary *YACReader::load7zLibrary()
+{
+#if defined Q_OS_UNIX && !defined Q_OS_MACOS
+    QFileInfo sevenzlibrary(QString(LIBDIR) + "/yacreader/7z.so");
+    if (sevenzlibrary.exists()) {
+        return new QLibrary(sevenzlibrary.absoluteFilePath());
+    } else {
+        retrun new QLibrary(QString(LIBDIR) + "/7zip/7z.so");
+    }
+#else
+    return new QLibrary(QCoreApplication::applicationDirPath() + "/utils/7z");
+#endif
+}

common/yacreader_global.h

@@ -6,6 +6,8 @@
 #include <QMetaType>
 #include <QAbstractItemModel>
 
+class QLibrary;
+
 #define VERSION "9.15.0"
 
 // Used to check if the database needs to be updated, the version is stored in the database.
@@ -100,6 +102,7 @@ QDataStream &operator>>(QDataStream &stream, OpenComicSource &source);
 QString getSettingsPath();
 QString colorToName(LabelColors colors);
 QString labelColorToRGBString(LabelColors color);
+QLibrary *load7zLibrary();
 
 void iterate(const QModelIndex &index,
              const QAbstractItemModel *model,

compressed_archive/compressed_archive.cpp

@@ -2,6 +2,7 @@
 
 #include "compressed_archive.h"
 #include "extract_delegate.h"
+#include "yacreader_global.h"
 
 #include <QLibrary>
 #include <QFileInfo>
@@ -78,7 +79,7 @@ const unsigned char tar[6] = "ustar";
 const unsigned char arj[2] = { static_cast<unsigned char>(0x60), static_cast<unsigned char>(0xEA) };
 
 CompressedArchive::CompressedArchive(const QString &filePath, QObject *parent)
-    : QObject(parent), sevenzLib(0), valid(false), tools(false)
+    : QObject(parent), sevenzLib(nullptr), tools(false), valid(false)
 {
     szInterface = new SevenZipInterface;
     // load functions
@@ -174,18 +175,10 @@ CompressedArchive::~CompressedArchive()
 bool CompressedArchive::loadFunctions()
 {
     // LOAD library
-    if (sevenzLib == 0) {
-#if defined Q_OS_UNIX && !defined Q_OS_MACOS
-        QFileInfo sevenzlibrary(QString(LIBDIR) + "/yacreader/7z.so");
-        if (sevenzlibrary.exists()) {
-            sevenzLib = new QLibrary(sevenzlibrary.absoluteFilePath());
-        } else {
-            sevenzLib = new QLibrary(QString(LIBDIR) + "/7zip/7z.so");
-        }
-#else
-        sevenzLib = new QLibrary(QCoreApplication::applicationDirPath() + "/utils/7z");
-#endif
+    if (sevenzLib == nullptr) {
+        sevenzLib = YACReader::load7zLibrary();
     }
+
     if (!sevenzLib->load()) {
         qDebug() << "Error Loading 7z.dll : " + sevenzLib->errorString() << Qt::endl;
         QCoreApplication::exit(700); // TODO yacreader_global can't be used here, it is GUI dependant, YACReader::SevenZNotFound