mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-10-31 16:25:15 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added exit and notification on 7z lib not found

Browse Source
This commit is contained in:
Luis Ángel San Martín
2013-11-24 12:55:03 +01:00
parent 92331af971
commit 8255637028
12 changed files with 105 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
compressed_archive/compressed_archive.cpp
View File

@ -3,11 +3,13 @@
#include <QLibrary>
#include <QDebug>
#include <QApplication>
#include "open_callbacks.h"
#include "extract_callbacks.h"
#include "yacreader_global.h"
//DEFINE_GUID(CLSID_CFormat7z,0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00);
//DEFINE_GUID(IArchiveKK,0x23170F69, 0x40C1, 0x278A, 0x00, 0x00, 0x00, 0x06, 0x00, 0x60, 0x00, 0x00);
@ -56,12 +58,14 @@ struct SevenZipInterface {
//SevenZipInterface * szInterface;
CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) :
QObject(parent),sevenzLib(0),valid(false)
QObject(parent),sevenzLib(0),valid(false),tools(false)
{
szInterface = new SevenZipInterface;
//load functions
loadFunctions();
if(!loadFunctions())
return;
tools = true;
//load file
if(szInterface->createObjectFunc != 0)
{
@ -106,7 +110,7 @@ CompressedArchive::~CompressedArchive()
delete sevenzLib;
}
void CompressedArchive::loadFunctions()
bool CompressedArchive::loadFunctions()
{
//LOAD library
//TODO check if this works in OSX (7z.so instead of 7z.dylib)
@ -115,7 +119,11 @@ void CompressedArchive::loadFunctions()
if(sevenzLib == 0)
sevenzLib = new QLibrary("./utils/7z");
if(!sevenzLib->load())
{
qDebug() << "Loading 7z.dll : " + sevenzLib->errorString() << endl;
QApplication::exit(YACReader::SevenZNotFound); //TODO app still crashing
return false;
}
else
{
qDebug() << "Loading functions" << endl;
@ -135,6 +143,8 @@ void CompressedArchive::loadFunctions()
if((szInterface->setLargePageModeFunc = (SetLargePageModeFunc)sevenzLib->resolve("SetLargePageMode")) == 0)
qDebug() << "fail loading function : SetLargePageMode" << endl;
}
return true;
}
QList<QString> CompressedArchive::getFileNames()
@ -170,6 +180,11 @@ bool CompressedArchive::isValid()
return valid;
}
bool CompressedArchive::toolsLoaded()
{
return tools;
}
int CompressedArchive::getNumFiles()
{
quint32 numItems = 0;

4
compressed_archive/compressed_archive.h
View File

@ -41,10 +41,12 @@ public slots:
QByteArray getRawDataAtIndex(int index);
QList<QString> getFileNames();
bool isValid();
bool toolsLoaded();
private:
SevenZipInterface * szInterface;
QLibrary * sevenzLib;
void loadFunctions();
bool loadFunctions();
bool tools;
bool valid;
};