mirror of
https://github.com/YACReader/yacreader
synced 2025-07-17 20:44:32 -04:00
Format code using clang-format
This commit is contained in:
Luis Ángel San Martín
@ -15,21 +15,21 @@ using namespace YACReader;
|
||||
|
||||
QMutex YACReaderClientConnectionWorker::dbMutex;
|
||||
//int YACReaderClientConnectionWorker::count = 0;
|
||||
YACReaderLocalServer::YACReaderLocalServer(QObject *parent) :
|
||||
QObject(parent)
|
||||
YACReaderLocalServer::YACReaderLocalServer(QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
localServer = new QLocalServer(this);
|
||||
localServer = new QLocalServer(this);
|
||||
QLocalServer::removeServer(YACREADERLIBRARY_GUID);
|
||||
if (!localServer->listen(YACREADERLIBRARY_GUID)) {
|
||||
if (!localServer->listen(YACREADERLIBRARY_GUID)) {
|
||||
QLOG_ERROR() << "Unable to create local server";
|
||||
}
|
||||
}
|
||||
|
||||
connect(localServer, SIGNAL(newConnection()), this, SLOT(sendResponse()));
|
||||
connect(localServer, SIGNAL(newConnection()), this, SLOT(sendResponse()));
|
||||
}
|
||||
|
||||
bool YACReaderLocalServer::isListening()
|
||||
{
|
||||
return localServer->isListening();
|
||||
return localServer->isListening();
|
||||
}
|
||||
|
||||
/*void YACReaderLocalServer::run()
|
||||
@ -40,30 +40,29 @@ bool YACReaderLocalServer::isListening()
|
||||
|
||||
void YACReaderLocalServer::sendResponse()
|
||||
{
|
||||
QLocalSocket *clientConnection = localServer->nextPendingConnection();
|
||||
//connect(clientConnection, SIGNAL(disconnected()),clientConnection, SLOT(deleteLater()));
|
||||
clientConnection->setParent(0);
|
||||
QLocalSocket *clientConnection = localServer->nextPendingConnection();
|
||||
//connect(clientConnection, SIGNAL(disconnected()),clientConnection, SLOT(deleteLater()));
|
||||
clientConnection->setParent(0);
|
||||
|
||||
YACReaderClientConnectionWorker * worker = new YACReaderClientConnectionWorker(clientConnection);
|
||||
if(worker != 0)
|
||||
{
|
||||
clientConnection->moveToThread(worker);
|
||||
connect(worker,SIGNAL(comicUpdated(quint64, ComicDB)),this,SIGNAL(comicUpdated(quint64, ComicDB)));
|
||||
connect(worker,SIGNAL(finished()),worker,SLOT(deleteLater()));
|
||||
worker->start();
|
||||
}
|
||||
YACReaderClientConnectionWorker *worker = new YACReaderClientConnectionWorker(clientConnection);
|
||||
if (worker != 0) {
|
||||
clientConnection->moveToThread(worker);
|
||||
connect(worker, SIGNAL(comicUpdated(quint64, ComicDB)), this, SIGNAL(comicUpdated(quint64, ComicDB)));
|
||||
connect(worker, SIGNAL(finished()), worker, SLOT(deleteLater()));
|
||||
worker->start();
|
||||
}
|
||||
|
||||
QLOG_TRACE() << "connection incoming";
|
||||
//clientConnection->waitForBytesWritten();*/
|
||||
//clientConnection->disconnectFromServer();
|
||||
//clientConnection->waitForBytesWritten();*/
|
||||
//clientConnection->disconnectFromServer();
|
||||
}
|
||||
|
||||
bool YACReaderLocalServer::isRunning()
|
||||
{
|
||||
QLocalSocket socket;
|
||||
socket.connectToServer(YACREADERLIBRARY_GUID);
|
||||
if (socket.waitForConnected(500))
|
||||
return true; // Server is running (another instance of YACReaderLibrary has been launched)
|
||||
QLocalSocket socket;
|
||||
socket.connectToServer(YACREADERLIBRARY_GUID);
|
||||
if (socket.waitForConnected(500))
|
||||
return true; // Server is running (another instance of YACReaderLibrary has been launched)
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -72,23 +71,20 @@ void YACReaderLocalServer::close()
|
||||
localServer->close();
|
||||
}
|
||||
|
||||
|
||||
YACReaderClientConnectionWorker::YACReaderClientConnectionWorker( QLocalSocket *cc)
|
||||
:QThread(),clientConnection(cc)
|
||||
YACReaderClientConnectionWorker::YACReaderClientConnectionWorker(QLocalSocket *cc)
|
||||
: QThread(), clientConnection(cc)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
YACReaderClientConnectionWorker::~YACReaderClientConnectionWorker()
|
||||
{
|
||||
|
||||
}
|
||||
/*#include <QFile>
|
||||
#include <QTextStream>
|
||||
#include <QDateTime>*/
|
||||
void YACReaderClientConnectionWorker::run()
|
||||
{
|
||||
/*{
|
||||
/*{
|
||||
QFile f(QString("c:/temp/thread%1.txt").arg(count));
|
||||
f.open(QIODevice::Append);
|
||||
QTextStream out(&f);
|
||||
@ -97,116 +93,104 @@ void YACReaderClientConnectionWorker::run()
|
||||
}
|
||||
uint t1 = QDateTime::currentMSecsSinceEpoch();*/
|
||||
|
||||
quint64 libraryId;
|
||||
ComicDB comic;
|
||||
quint64 libraryId;
|
||||
ComicDB comic;
|
||||
qulonglong nextComicId;
|
||||
int tries = 0;
|
||||
int dataAvailable = 0;
|
||||
QByteArray packageSize;
|
||||
int tries = 0;
|
||||
int dataAvailable = 0;
|
||||
QByteArray packageSize;
|
||||
clientConnection->waitForReadyRead(1000);
|
||||
while(((long unsigned int)packageSize.size() < sizeof(quint32)) && (tries < 20))
|
||||
{
|
||||
packageSize.append(clientConnection->read(sizeof(quint32) - packageSize.size()));
|
||||
clientConnection->waitForReadyRead(100);
|
||||
if(dataAvailable == packageSize.size())
|
||||
{
|
||||
tries++;
|
||||
}
|
||||
dataAvailable = packageSize.size();
|
||||
}
|
||||
if(tries == 20)
|
||||
{
|
||||
while (((long unsigned int)packageSize.size() < sizeof(quint32)) && (tries < 20)) {
|
||||
packageSize.append(clientConnection->read(sizeof(quint32) - packageSize.size()));
|
||||
clientConnection->waitForReadyRead(100);
|
||||
if (dataAvailable == packageSize.size()) {
|
||||
tries++;
|
||||
}
|
||||
dataAvailable = packageSize.size();
|
||||
}
|
||||
if (tries == 20) {
|
||||
QLOG_ERROR() << "Local connection: unable to read the message size" << clientConnection->errorString();
|
||||
return;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
QDataStream sizeStream(packageSize);
|
||||
sizeStream.setVersion(QDataStream::Qt_4_8);
|
||||
quint32 totalSize = 0;
|
||||
sizeStream >> totalSize;
|
||||
QDataStream sizeStream(packageSize);
|
||||
sizeStream.setVersion(QDataStream::Qt_4_8);
|
||||
quint32 totalSize = 0;
|
||||
sizeStream >> totalSize;
|
||||
|
||||
tries = 0;
|
||||
QByteArray data;
|
||||
tries = 0;
|
||||
QByteArray data;
|
||||
int dataRead = 0;
|
||||
while((quint32)data.size() < totalSize && tries < 200)
|
||||
{
|
||||
data.append(clientConnection->readAll());
|
||||
if((quint32)data.length() < totalSize)
|
||||
clientConnection->waitForReadyRead(100);
|
||||
if(dataRead == data.length()) //no bytes were read
|
||||
while ((quint32)data.size() < totalSize && tries < 200) {
|
||||
data.append(clientConnection->readAll());
|
||||
if ((quint32)data.length() < totalSize)
|
||||
clientConnection->waitForReadyRead(100);
|
||||
if (dataRead == data.length()) //no bytes were read
|
||||
tries++;
|
||||
dataRead = data.length();
|
||||
}
|
||||
if(tries == 200)
|
||||
{
|
||||
QLOG_ERROR() << QString("Local connection: unable to read message (%1,%2)").arg(data.size()).arg(totalSize);
|
||||
return;
|
||||
}
|
||||
QDataStream dataStream(data);
|
||||
quint8 msgType;
|
||||
dataStream >> msgType;
|
||||
dataStream >> libraryId;
|
||||
dataStream >> comic;
|
||||
}
|
||||
if (tries == 200) {
|
||||
QLOG_ERROR() << QString("Local connection: unable to read message (%1,%2)").arg(data.size()).arg(totalSize);
|
||||
return;
|
||||
}
|
||||
QDataStream dataStream(data);
|
||||
quint8 msgType;
|
||||
dataStream >> msgType;
|
||||
dataStream >> libraryId;
|
||||
dataStream >> comic;
|
||||
|
||||
bool nextComicInfoAvailable;
|
||||
|
||||
if(dataStream.atEnd()) {
|
||||
if (dataStream.atEnd()) {
|
||||
nextComicInfoAvailable = false;
|
||||
} else {
|
||||
nextComicInfoAvailable = true;
|
||||
dataStream >> nextComicId;
|
||||
}
|
||||
|
||||
switch (msgType)
|
||||
{
|
||||
case YACReader::RequestComicInfo:
|
||||
{
|
||||
QList<ComicDB> siblings;
|
||||
getComicInfo(libraryId,comic,siblings);
|
||||
switch (msgType) {
|
||||
case YACReader::RequestComicInfo: {
|
||||
QList<ComicDB> siblings;
|
||||
getComicInfo(libraryId, comic, siblings);
|
||||
|
||||
QByteArray block;
|
||||
QDataStream out(&block, QIODevice::WriteOnly);
|
||||
out.setVersion(QDataStream::Qt_4_8);
|
||||
out << (quint32)0;
|
||||
out << comic;
|
||||
out << siblings;
|
||||
out.device()->seek(0);
|
||||
out << (quint32)(block.size() - sizeof(quint32));
|
||||
QByteArray block;
|
||||
QDataStream out(&block, QIODevice::WriteOnly);
|
||||
out.setVersion(QDataStream::Qt_4_8);
|
||||
out << (quint32)0;
|
||||
out << comic;
|
||||
out << siblings;
|
||||
out.device()->seek(0);
|
||||
out << (quint32)(block.size() - sizeof(quint32));
|
||||
|
||||
int written = 0;
|
||||
tries = 0;
|
||||
while(written != block.size() && tries < 200)
|
||||
{
|
||||
int ret = clientConnection->write(block);
|
||||
clientConnection->waitForBytesWritten(10);
|
||||
if(ret != -1)
|
||||
{
|
||||
written += ret;
|
||||
clientConnection->flush();
|
||||
}
|
||||
else
|
||||
tries++;
|
||||
}
|
||||
if(tries == 200 && written != block.size())
|
||||
{
|
||||
QLOG_ERROR() << QString("Local connection (comic info requested): unable to send response (%1,%2)").arg(written).arg(block.size());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case YACReader::SendComicInfo:
|
||||
{
|
||||
if (nextComicInfoAvailable) {
|
||||
updateComic(libraryId,comic,nextComicId);
|
||||
} else {
|
||||
updateComic(libraryId,comic);
|
||||
int written = 0;
|
||||
tries = 0;
|
||||
while (written != block.size() && tries < 200) {
|
||||
int ret = clientConnection->write(block);
|
||||
clientConnection->waitForBytesWritten(10);
|
||||
if (ret != -1) {
|
||||
written += ret;
|
||||
clientConnection->flush();
|
||||
} else
|
||||
tries++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (tries == 200 && written != block.size()) {
|
||||
QLOG_ERROR() << QString("Local connection (comic info requested): unable to send response (%1,%2)").arg(written).arg(block.size());
|
||||
}
|
||||
break;
|
||||
}
|
||||
case YACReader::SendComicInfo: {
|
||||
if (nextComicInfoAvailable) {
|
||||
updateComic(libraryId, comic, nextComicId);
|
||||
} else {
|
||||
updateComic(libraryId, comic);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
clientConnection->waitForDisconnected();
|
||||
clientConnection->deleteLater();
|
||||
/*count++;
|
||||
clientConnection->waitForDisconnected();
|
||||
clientConnection->deleteLater();
|
||||
/*count++;
|
||||
uint t2 = QDateTime::currentMSecsSinceEpoch();
|
||||
{
|
||||
QFile f(QString("c:/temp/thread%1.txt").arg(count));
|
||||
@ -217,21 +201,21 @@ void YACReaderClientConnectionWorker::run()
|
||||
}*/
|
||||
}
|
||||
|
||||
void YACReaderClientConnectionWorker::getComicInfo(quint64 libraryId, ComicDB & comic, QList<ComicDB> & siblings)
|
||||
void YACReaderClientConnectionWorker::getComicInfo(quint64 libraryId, ComicDB &comic, QList<ComicDB> &siblings)
|
||||
{
|
||||
QMutexLocker locker(&dbMutex);
|
||||
QMutexLocker locker(&dbMutex);
|
||||
comic = DBHelper::getComicInfo(libraryId, comic.id);
|
||||
siblings = DBHelper::getSiblings(libraryId, comic.parentId);
|
||||
}
|
||||
|
||||
void YACReaderClientConnectionWorker::updateComic(quint64 libraryId, ComicDB & comic)
|
||||
void YACReaderClientConnectionWorker::updateComic(quint64 libraryId, ComicDB &comic)
|
||||
{
|
||||
QMutexLocker locker(&dbMutex);
|
||||
QMutexLocker locker(&dbMutex);
|
||||
DBHelper::update(libraryId, comic.info);
|
||||
emit comicUpdated(libraryId, comic);
|
||||
emit comicUpdated(libraryId, comic);
|
||||
}
|
||||
|
||||
void YACReaderClientConnectionWorker::updateComic(quint64 libraryId, ComicDB & comic, qulonglong nextComicId)
|
||||
void YACReaderClientConnectionWorker::updateComic(quint64 libraryId, ComicDB &comic, qulonglong nextComicId)
|
||||
{
|
||||
QMutexLocker locker(&dbMutex);
|
||||
DBHelper::update(libraryId, comic.info);
|
||||
|
||||
Reference in New Issue
Block a user