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

improved unarr parsing

Browse Source
This commit is contained in:
Felix Kauselmann 2015-04-08 15:34:26 +02:00
parent ccd4c9e2d8
commit 183fcb6f5a
1 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
compressed_archive/unarr/compressed_archive.cpp
View File

@ -12,27 +12,46 @@ extern"C" {
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
stream = ar_open_file(filePath.toStdString().c_str()); stream = ar_open_file(filePath.toStdString().c_str());
//try to open archive if (!stream)
{
return;
}
//open archive
ar = ar_open_rar_archive(stream); ar = ar_open_rar_archive(stream);
if (!ar) ar = ar_open_zip_archive(stream, false); //TODO: build unarr with 7z support and test this!
//if (!ar) ar = ar_open_7z_archive(stream); //if (!ar) ar = ar_open_7z_archive(stream);
if (!ar) ar = ar_open_tar_archive(stream); if (!ar) ar = ar_open_tar_archive(stream);
//zip detection is costly, so it comes last...
if (!ar) ar = ar_open_zip_archive(stream, false);
if (!ar) if (!ar)
{ {
return; return;
} }
//initial parse //initial parse
while (ar_parse_entry(ar)) while (ar_parse_entry(ar))
{ {
numFiles++; //make sure we really got a file header
fileNames.append(ar_entry_get_name(ar)); if (ar_entry_get_size(ar) > 0)
offsets.append(ar_entry_get_offset(ar)); {
fileNames.append(ar_entry_get_name(ar));
offsets.append(ar_entry_get_offset(ar));
numFiles++;
}
}
if (!ar_at_eof(ar))
{
//fail if the initial parse didn't reach EOF
//this might be a bit too drastic
qDebug() << "Error while parsing archive";
return;
} }
if (numFiles > 0) if (numFiles > 0)
{ {
valid = true; valid = true;
tools = true;
} }
} }
@ -54,6 +73,7 @@ bool CompressedArchive::isValid()
bool CompressedArchive::toolsLoaded() bool CompressedArchive::toolsLoaded()
{ {
//for backwards compatibilty
return tools; return tools;
} }
@ -78,11 +98,20 @@ void CompressedArchive::getAllData(const QVector<quint32> & indexes, ExtractDele
} }
else else
{ {
//TODO:
//since we already have offset lists, we want to use ar_parse_entry_at here as well
//speed impact?
ar_parse_entry(ar); ar_parse_entry(ar);
} }
buffer.resize(ar_entry_get_size(ar)); buffer.resize(ar_entry_get_size(ar));
ar_entry_uncompress(ar, buffer.data(), buffer.size()); if (ar_entry_uncompress(ar, buffer.data(), buffer.size())) //did we extract it?
delegate->fileExtracted(indexes.at(i), buffer); //return extracted files :) {
delegate->fileExtracted(indexes.at(i), buffer); //return extracted file
}
else
{
delegate->crcError(indexes.at(i)); //we could not extract it...
}
i++; i++;
} }
} }
@ -93,13 +122,15 @@ QByteArray CompressedArchive::getRawDataAtIndex(int index)
if(index >= 0 && index < getNumFiles()) if(index >= 0 && index < getNumFiles())
{ {
ar_parse_entry_at(ar, offsets.at(index)); ar_parse_entry_at(ar, offsets.at(index));
while (ar_entry_get_size(ar)==0)
{
ar_parse_entry(ar);
}
buffer.resize(ar_entry_get_size(ar)); buffer.resize(ar_entry_get_size(ar));
ar_entry_uncompress(ar, buffer.data(), buffer.size()); if(ar_entry_uncompress(ar, buffer.data(), buffer.size()))
//return buffer; {
return buffer;
}
else
{
return QByteArray();
}
} }
return buffer; return buffer;
} }