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

ThumbnailCreator uses 7z shared library

Browse Source
This commit is contained in:
Luis Ángel San Martín 2013-08-26 22:00:29 +02:00
parent c96950584f
commit 731b3fa476
3 changed files with 22 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReader/comic.h
View File

@ -97,7 +97,6 @@ class ComicDB;
{ {
Q_OBJECT Q_OBJECT
private: private:
QList<QString> filter(const QList<QString> & src);
QList<QVector<quint32> > getSections(int & sectionIndex); QList<QVector<quint32> > getSections(int & sectionIndex);
public: public:
FileComic(); FileComic();
@ -108,6 +107,7 @@ class ComicDB;
virtual bool load(const QString & path, const ComicDB & comic); virtual bool load(const QString & path, const ComicDB & comic);
void crcError(int index); void crcError(int index);
void unknownError(int index); void unknownError(int index);
static QList<QString> filter(const QList<QString> & src);
public slots: public slots:
void process(); void process();
}; };

81
YACReaderLibrary/library_creator.cpp
View File

@ -9,6 +9,9 @@
#include "qnaturalsorting.h" #include "qnaturalsorting.h"
#include "db_helper.h" #include "db_helper.h"
#include "compressed_archive.h"
#include "comic.h"
#include <algorithm> #include <algorithm>
using namespace std; using namespace std;
@ -470,73 +473,31 @@ void ThumbnailCreator::create()
else else
{ {
_7z = new QProcess(); CompressedArchive archive(_fileSource);
QStringList attributes; //se filtran para obtener sólo los formatos soportados
attributes << "l" << "-ssc-" << "-r" << _fileSource << "*.jpg" << "*.jpeg" << "*.png" << "*.gif" << "*.tiff" << "*.tif" << "*.bmp"; QList<QString> order = archive.getFileNames();
//connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(loadFirstImage(void))); QList<QString> fileNames = FileComic::filter(order);
connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SIGNAL(openingError(QProcess::ProcessError)));
_7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes);
_7z->waitForFinished(60000);
QRegExp rx("[0-9]{4}-[0-9]{2}-[0-9]{2}[ ]+[0-9]{2}:[0-9]{2}:[0-9]{2}[ ]+.{5}[ ]+([0-9]+)[ ]+([0-9]+)[ ]+(.+)"); if(fileNames.size() == 0)
{
_cover.load(":/images/notCover.png");
if(_target!="")
_cover.save(_target);
}
else
{
qSort(fileNames.begin(),fileNames.end(), naturalSortLessThanCI);
int index = order.indexOf(fileNames.first());
QString ba = QString::fromUtf8(_7z->readAllStandardOutput());
QList<QString> lines = ba.split('\n');
QString line;
_currentName = "ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ"; //TODO
QString name;
if(_coverPage == 1)
{
foreach(line,lines)
{
if(rx.indexIn(line)!=-1)
{
name = rx.cap(3).trimmed();
if(naturalSortLessThanCI(name,_currentName))
_currentName = name;
_numPages++;
}
}
}
else
{
QList<QString> names;
foreach(line,lines)
{
if(rx.indexIn(line)!=-1)
{
name = rx. cap(3).trimmed();
names.append(name);
}
}
std::sort(names.begin(),names.end(),naturalSortLessThanCI);
_currentName = names[_coverPage-1];
}
delete _7z;
attributes.clear();
_currentName = QDir::fromNativeSeparators(_currentName).split('/').last(); //separator fixed.
#ifdef Q_OS_WIN32
attributes << "e" << "-so" << "-r" << _fileSource << QString(_currentName.toLocal8Bit().constData()); //TODO platform dependency?? OEM 437
#else
attributes << "e" << "-so" << "-r" << _fileSource << _currentName; //TODO platform dependency?? OEM 437
#endif
_7z = new QProcess();
connect(_7z,SIGNAL(error(QProcess::ProcessError)),this,SIGNAL(openingError(QProcess::ProcessError)));
//connect(_7z,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(writeThumbnail(void)));
_7z->start(QCoreApplication::applicationDirPath()+"/utils/7z",attributes);
_7z->waitForFinished(60000);
QByteArray image = _7z->readAllStandardOutput();
QString error = _7z->readAllStandardError();
QImage p;
if(_target=="") if(_target=="")
{ {
if(!_cover.loadFromData(image)) if(!_cover.loadFromData(archive.getRawDataAtIndex(index)))
_cover.load(":/images/notCover.png"); _cover.load(":/images/notCover.png");
} }
else else
{ {
if(p.loadFromData(image)) QImage p;
if(p.loadFromData(archive.getRawDataAtIndex(index)))
{ {
QImage scaled; QImage scaled;
if(p.width()>p.height()) //landscape?? if(p.width()>p.height()) //landscape??
@ -551,6 +512,6 @@ void ThumbnailCreator::create()
p.save(_target); p.save(_target);
} }
} }
delete _7z; }
} }
} }

1
YACReaderLibrary/library_creator.h
View File

@ -66,7 +66,6 @@
public: public:
ThumbnailCreator(QString fileSource, QString target, int coverPage = 1); ThumbnailCreator(QString fileSource, QString target, int coverPage = 1);
private: private:
QProcess * _7z;
QString _fileSource; QString _fileSource;
QString _target; QString _target;
QString _currentName; QString _currentName;