mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unarr: support unicode filenames

Browse Source
This commit is contained in:
Felix Kauselmann 2017-09-19 23:16:58 +02:00
parent 169904421c
commit 2250422cb6
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compressed_archive/unarr/compressed_archive.cpp
View File

@ -4,21 +4,22 @@
#include <QDebug> #include <QDebug>
#include "extract_delegate.h" #include "extract_delegate.h"
extern"C" {
#include <unarr.h> #include <unarr.h>
}
CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) : CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent) :
QObject(parent),valid(false),tools(true),numFiles(0),ar(NULL),stream(NULL) QObject(parent),valid(false),tools(true),numFiles(0),ar(NULL),stream(NULL)
{ {
//open file //open file
stream = ar_open_file(filePath.toStdString().c_str()); #ifdef Q_OS_WIN
stream = ar_open_file_w((wchar_t *)filePath.utf16());
#else
stream = ar_open_file(filePath.toLocal8Bit().constData());
#endif
if (!stream) if (!stream)
{ {
return; return;
} }
//open archive //open archive
ar = ar_open_rar_archive(stream); ar = ar_open_rar_archive(stream);
//TODO: build unarr with 7z support and test this! //TODO: build unarr with 7z support and test this!
@ -30,9 +31,9 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent)
{ {
return; return;
} }
//initial parse //initial parse
while (ar_parse_entry(ar)) while (ar_parse_entry(ar))
{ {
//make sure we really got a file header //make sure we really got a file header
if (ar_entry_get_size(ar) > 0) if (ar_entry_get_size(ar) > 0)
@ -43,7 +44,7 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent)
} }
} }
if (!ar_at_eof(ar)) if (!ar_at_eof(ar))
{ {
//fail if the initial parse didn't reach EOF //fail if the initial parse didn't reach EOF
//this might be a bit too drastic //this might be a bit too drastic
qDebug() << "Error while parsing archive"; qDebug() << "Error while parsing archive";
@ -84,11 +85,11 @@ int CompressedArchive::getNumFiles()
void CompressedArchive::getAllData(const QVector<quint32> & indexes, ExtractDelegate * delegate) void CompressedArchive::getAllData(const QVector<quint32> & indexes, ExtractDelegate * delegate)
{ {
if (indexes.isEmpty()) if (indexes.isEmpty())
return; return;
QByteArray buffer; QByteArray buffer;
int i=0; int i=0;
while (i < indexes.count()) while (i < indexes.count())
{ {
@ -102,7 +103,7 @@ void CompressedArchive::getAllData(const QVector<quint32> & indexes, ExtractDele
else else
{ {
delegate->crcError(indexes.at(i)); //we could not extract it... delegate->crcError(indexes.at(i)); //we could not extract it...
} }
i++; i++;
} }
} }