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

Format code using clang-format

Browse Source
This commit is contained in:
Luis Ángel San Martín
2019-05-30 19:46:37 +02:00
parent e0eb94e3ae
commit e3ec56aa43
356 changed files with 19824 additions and 21874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp
View File

@ -16,112 +16,100 @@
ComicControllerV2::ComicControllerV2() {}
void ComicControllerV2::service(HttpRequest& request, HttpResponse& response)
void ComicControllerV2::service(HttpRequest &request, HttpResponse &response)
{
QByteArray token = request.getHeader("x-request-id");
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(token);
if (ySession == nullptr) {
response.setStatus(404,"not found");
response.write("404 not found",true);
response.setStatus(404, "not found");
response.write("404 not found", true);
return;
}
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
QStringList pathElements = path.split('/');
QStringList pathElements = path.split('/');
qulonglong libraryId = pathElements.at(3).toLongLong();
QString libraryName = DBHelper::getLibraryName(libraryId);
qulonglong comicId = pathElements.at(5).toULongLong();
bool remoteComic = path.endsWith("remote");
//TODO
//if(pathElements.size() == 6)
//{
// QString action = pathElements.at(5);
// if(!action.isEmpty() && (action == "close"))
// {
// session.dismissCurrentComic();
// response.write("",true);
// return;
// }
//}
//TODO
//if(pathElements.size() == 6)
//{
// QString action = pathElements.at(5);
// if(!action.isEmpty() && (action == "close"))
// {
// session.dismissCurrentComic();
// response.write("",true);
// return;
// }
//}
YACReaderLibraries libraries = DBHelper::getLibraries();
YACReaderLibraries libraries = DBHelper::getLibraries();
ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
Comic * comicFile = FactoryComic::newComic(libraries.getPath(libraryId)+comic.path);
Comic *comicFile = FactoryComic::newComic(libraries.getPath(libraryId) + comic.path);
if(comicFile != NULL)
{
QThread * thread = NULL;
if (comicFile != NULL) {
QThread *thread = NULL;
thread = new QThread();
thread = new QThread();
comicFile->moveToThread(thread);
comicFile->moveToThread(thread);
connect(comicFile, SIGNAL(errorOpening()), thread, SLOT(quit()));
connect(comicFile, SIGNAL(errorOpening(QString)), thread, SLOT(quit()));
connect(comicFile, SIGNAL(imagesLoaded()), thread, SLOT(quit()));
connect(thread, SIGNAL(started()), comicFile, SLOT(process()));
connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
connect(thread, SIGNAL(started()), comicFile, SLOT(process()));
connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
comicFile->load(libraries.getPath(libraryId)+comic.path);
comicFile->load(libraries.getPath(libraryId) + comic.path);
if(thread != NULL)
thread->start();
if (thread != NULL)
thread->start();
if(remoteComic)
{
if (remoteComic) {
QLOG_TRACE() << "remote comic requested";
ySession->setCurrentRemoteComic(comic.id, comicFile);
}
else
{
} else {
QLOG_TRACE() << "comic requested";
ySession->setCurrentComic(comic.id, comicFile);
}
response.setHeader("Content-Type", "text/plain; charset=utf-8");
//TODO this field is not used by the client!
//TODO this field is not used by the client!
response.write(QString("library:%1\r\n").arg(libraryName).toUtf8());
response.write(QString("libraryId:%1\r\n").arg(libraryId).toUtf8());
if(remoteComic) //send previous and next comics id
if (remoteComic) //send previous and next comics id
{
QList<LibraryItem *> siblings = DBHelper::getFolderComicsFromLibrary(libraryId, comic.parentId, true);
bool found = false;
int i;
for(i = 0; i < siblings.length(); i++)
{
if (siblings.at(i)->id == comic.id)
{
for (i = 0; i < siblings.length(); i++) {
if (siblings.at(i)->id == comic.id) {
found = true;
break;
}
}
if(found)
{
if(i>0)
response.write(QString("previousComic:%1\r\n").arg(siblings.at(i-1)->id).toUtf8());
if(i<siblings.length()-1)
response.write(QString("nextComic:%1\r\n").arg(siblings.at(i+1)->id).toUtf8());
}
else
{
if (found) {
if (i > 0)
response.write(QString("previousComic:%1\r\n").arg(siblings.at(i - 1)->id).toUtf8());
if (i < siblings.length() - 1)
response.write(QString("nextComic:%1\r\n").arg(siblings.at(i + 1)->id).toUtf8());
} else {
//ERROR
}
qDeleteAll(siblings);
}
response.write(comic.toTXT().toUtf8(),true);
}
else
{
//delete comicFile;
response.setStatus(404,"not found");
response.write("404 not found",true);
}
//response.write(t.toLatin1(),true);
response.write(comic.toTXT().toUtf8(), true);
} else {
//delete comicFile;
response.setStatus(404, "not found");
response.write("404 not found", true);
}
//response.write(t.toLatin1(),true);
}

11
YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h
View File

@ -9,15 +9,16 @@
class Comic;
class QString;
class ComicControllerV2 : public HttpRequestHandler {
Q_OBJECT
class ComicControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ComicControllerV2)
public:
/** Constructor */
/** Constructor */
ComicControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
/** Generates the response */
void service(HttpRequest &request, HttpResponse &response);
};
#endif // COMICCONTROLLER_H

5
YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp
View File

@ -7,8 +7,7 @@
ComicDownloadInfoControllerV2::ComicDownloadInfoControllerV2() {}
void ComicDownloadInfoControllerV2::service(HttpRequest& request, HttpResponse& response)
void ComicDownloadInfoControllerV2::service(HttpRequest &request, HttpResponse &response)
{
response.setHeader("Content-Type", "text/plain; charset=utf-8");
@ -24,5 +23,5 @@ void ComicDownloadInfoControllerV2::service(HttpRequest& request, HttpResponse&
response.write(QString("fileName:%1\r\n").arg(comic.getFileName()).toUtf8());
response.write(QString("fileSize:%1\r\n").arg(comic.getFileSize()).toUtf8());
response.write(QString("libraryId:%1\r\n").arg(libraryId).toUtf8());
response.write(comic.toTXT().toUtf8(),true);
response.write(comic.toTXT().toUtf8(), true);
}

5
YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h
View File

@ -5,7 +5,8 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class ComicDownloadInfoControllerV2 : public HttpRequestHandler {
class ComicDownloadInfoControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ComicDownloadInfoControllerV2)
public:
@ -13,7 +14,7 @@ public:
ComicDownloadInfoControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
};
#endif // COMICDOWNLOADINFOCONTROLLER_H

10
YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp
View File

@ -1,7 +1,5 @@
#include "comicfullinfocontroller_v2.h"
#include <QUrl>
#include "db_helper.h"
@ -15,11 +13,9 @@
#include <ctime>
using namespace std;
ComicFullinfoController_v2::ComicFullinfoController_v2() {}
void ComicFullinfoController_v2::service(HttpRequest& request, HttpResponse& response)
void ComicFullinfoController_v2::service(HttpRequest &request, HttpResponse &response)
{
response.setHeader("Content-Type", "application/json");
@ -30,8 +26,8 @@ void ComicFullinfoController_v2::service(HttpRequest& request, HttpResponse& res
serviceContent(libraryId, comicId, response);
response.setStatus(200,"OK");
response.write("",true);
response.setStatus(200, "OK");
response.write("", true);
}
void ComicFullinfoController_v2::serviceContent(const int &libraryId, const qulonglong &comicId, HttpResponse &response)

9
YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h
View File

@ -1,21 +1,18 @@
#ifndef COMICFULLINFOCONTROLLER_V2_H
#define COMICFULLINFOCONTROLLER_V2_H
#include "httprequest.h"
#include "httpresponse.h"
#include "httprequesthandler.h"
class ComicFullinfoController_v2 : public HttpRequestHandler {
class ComicFullinfoController_v2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ComicFullinfoController_v2)
public:
ComicFullinfoController_v2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int &library, const qulonglong &comicId, HttpResponse &response);

33
YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp
View File

@ -1,5 +1,5 @@
#include "covercontroller_v2.h"
#include "db_helper.h" //get libraries
#include "db_helper.h" //get libraries
#include "yacreader_libraries.h"
#include "yacreader_http_session.h"
@ -8,29 +8,26 @@
CoverControllerV2::CoverControllerV2() {}
void CoverControllerV2::service(HttpRequest& request, HttpResponse& response)
void CoverControllerV2::service(HttpRequest &request, HttpResponse &response)
{
response.setHeader("Content-Type", "image/jpeg");
response.setHeader("Content-Type", "image/jpeg");
YACReaderLibraries libraries = DBHelper::getLibraries();
YACReaderLibraries libraries = DBHelper::getLibraries();
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
QStringList pathElements = path.split('/');
QStringList pathElements = path.split('/');
QString libraryName = DBHelper::getLibraryName(pathElements.at(3).toInt());
QString fileName = pathElements.at(5);
QImage img(libraries.getPath(libraryName)+"/.yacreaderlibrary/covers/"+fileName);
if (!img.isNull()) {
QByteArray ba;
QBuffer buffer(&ba);
buffer.open(QIODevice::WriteOnly);
QImage img(libraries.getPath(libraryName) + "/.yacreaderlibrary/covers/" + fileName);
if (!img.isNull()) {
QByteArray ba;
QBuffer buffer(&ba);
buffer.open(QIODevice::WriteOnly);
img.save(&buffer, "JPG");
response.write(ba,true);
}
else
{
response.setStatus(404,"not found");
response.write("404 not found",true);
}
response.write(ba, true);
} else {
response.setStatus(404, "not found");
response.write("404 not found", true);
}
}

6
YACReaderLibrary/server/controllers/v2/covercontroller_v2.h
View File

@ -5,16 +5,16 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class CoverControllerV2 : public HttpRequestHandler {
class CoverControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(CoverControllerV2)
public:
/** Constructor */
CoverControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
};
#endif // COVERCONTROLLER_H

34
YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp
View File

@ -3,24 +3,22 @@
#include "template.h"
#include "../static.h"
ErrorControllerV2::ErrorControllerV2(int errorCode)
:error(errorCode)
{}
void ErrorControllerV2::service(HttpRequest& request, HttpResponse& response)
: error(errorCode)
{
Q_UNUSED(request)
switch(error)
{
case 300:
response.setStatus(300,"redirect");
response.write("<html> <head> <meta http-equiv=\"refresh\" content=\"0; URL=/\"> </head> <body> </body> </html>", true);
break;
case 404:
response.setStatus(404,"not found");
response.write("404 not found",true);
break;
}
}
void ErrorControllerV2::service(HttpRequest &request, HttpResponse &response)
{
Q_UNUSED(request)
switch (error) {
case 300:
response.setStatus(300, "redirect");
response.write("<html> <head> <meta http-equiv=\"refresh\" content=\"0; URL=/\"> </head> <body> </body> </html>", true);
break;
case 404:
response.setStatus(404, "not found");
response.write("404 not found", true);
break;
}
}

15
YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h
View File

@ -5,18 +5,19 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class ErrorControllerV2 : public HttpRequestHandler {
Q_OBJECT
class ErrorControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ErrorControllerV2)
public:
/** Constructor */
/** Constructor */
ErrorControllerV2(int errorCode);
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
/** Generates the response */
void service(HttpRequest &request, HttpResponse &response);
private:
int error;
int error;
};
#endif // ERRORCONTROLLER_H

13
YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp
View File

@ -17,7 +17,7 @@ void FavoritesControllerV2::service(HttpRequest &request, HttpResponse &response
serviceContent(libraryId, response);
response.write("",true);
response.write("", true);
}
void FavoritesControllerV2::serviceContent(const int library, HttpResponse &response)
@ -25,15 +25,12 @@ void FavoritesControllerV2::serviceContent(const int library, HttpResponse &resp
QList<ComicDB> comics = DBHelper::getFavorites(library);
QJsonArray items;
for(const ComicDB &comic : comics)
{
for (const ComicDB &comic : comics) {
items.append(YACReaderServerDataHelper::comicToJSON(library, comic));
}
QJsonDocument output(items);
response.write(output.toJson(QJsonDocument::Compact));
}

6
YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h
View File

@ -5,17 +5,17 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class FavoritesControllerV2 : public HttpRequestHandler {
class FavoritesControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(FavoritesControllerV2)
public:
FavoritesControllerV2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int library, HttpResponse &response);
};
#endif // FAVORITESCONTROLLER_H

37
YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp
View File

@ -16,17 +16,16 @@
#include <ctime>
using namespace std;
struct LibraryItemSorter
{
bool operator()(const LibraryItem * a,const LibraryItem * b) const
struct LibraryItemSorter {
bool operator()(const LibraryItem *a, const LibraryItem *b) const
{
return naturalSortLessThanCI(a->name,b->name);
return naturalSortLessThanCI(a->name, b->name);
}
};
FolderContentControllerV2::FolderContentControllerV2() {}
void FolderContentControllerV2::service(HttpRequest& request, HttpResponse& response)
void FolderContentControllerV2::service(HttpRequest &request, HttpResponse &response)
{
response.setHeader("Content-Type", "application/json");
@ -37,8 +36,8 @@ void FolderContentControllerV2::service(HttpRequest& request, HttpResponse& resp
serviceContent(libraryId, parentId, response);
response.setStatus(200,"OK");
response.write("",true);
response.setStatus(200, "OK");
response.write("", true);
}
void FolderContentControllerV2::serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response)
@ -46,27 +45,23 @@ void FolderContentControllerV2::serviceContent(const int &library, const qulongl
#ifdef QT_DEBUG
auto started = std::chrono::high_resolution_clock::now();
#endif
QList<LibraryItem *> folderContent = DBHelper::getFolderSubfoldersFromLibrary(library,folderId);
QList<LibraryItem *> folderComics = DBHelper::getFolderComicsFromLibrary(library,folderId);
QList<LibraryItem *> folderContent = DBHelper::getFolderSubfoldersFromLibrary(library, folderId);
QList<LibraryItem *> folderComics = DBHelper::getFolderComicsFromLibrary(library, folderId);
folderContent.append(folderComics);
qSort(folderContent.begin(),folderContent.end(),LibraryItemSorter());
qSort(folderContent.begin(), folderContent.end(), LibraryItemSorter());
folderComics.clear();
QJsonArray items;
ComicDB * currentComic;
Folder * currentFolder;
for(QList<LibraryItem *>::const_iterator itr = folderContent.constBegin();itr!=folderContent.constEnd();itr++)
{
if((*itr)->isDir())
{
ComicDB *currentComic;
Folder *currentFolder;
for (QList<LibraryItem *>::const_iterator itr = folderContent.constBegin(); itr != folderContent.constEnd(); itr++) {
if ((*itr)->isDir()) {
currentFolder = (Folder *)(*itr);
items.append(YACReaderServerDataHelper::folderToJSON(library, *currentFolder));
}
else
{
} else {
currentComic = (ComicDB *)(*itr);
items.append(YACReaderServerDataHelper::comicToJSON(library, *currentComic));
}
@ -77,8 +72,8 @@ void FolderContentControllerV2::serviceContent(const int &library, const qulongl
response.write(output.toJson(QJsonDocument::Compact));
#ifdef QT_DEBUG
auto done = std::chrono::high_resolution_clock::now();
QLOG_TRACE() << "num items = " << items.count();
QLOG_TRACE() << std::chrono::duration_cast<std::chrono::milliseconds>(done-started).count();
QLOG_TRACE() << std::chrono::duration_cast<std::chrono::milliseconds>(done - started).count();
#endif
}

11
YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h
View File

@ -5,15 +5,16 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class FolderContentControllerV2 : public HttpRequestHandler {
Q_OBJECT
class FolderContentControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(FolderContentControllerV2)
public:
/** Constructor */
/** Constructor */
FolderContentControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
/** Generates the response */
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response);

39
YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp
View File

@ -1,5 +1,5 @@
#include "folderinfocontroller_v2.h"
#include "db_helper.h" //get libraries
#include "db_helper.h" //get libraries
#include "folder.h"
#include "comic_db.h"
@ -7,47 +7,44 @@
#include "template.h"
#include "../static.h"
FolderInfoControllerV2::FolderInfoControllerV2() {}
void FolderInfoControllerV2::service(HttpRequest& request, HttpResponse& response)
void FolderInfoControllerV2::service(HttpRequest &request, HttpResponse &response)
{
response.setHeader("Content-Type", "text/plain; charset=utf-8");
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
QStringList pathElements = path.split('/');
QStringList pathElements = path.split('/');
int libraryId = pathElements.at(3).toInt();
QString libraryName = DBHelper::getLibraryName(libraryId);
QString libraryName = DBHelper::getLibraryName(libraryId);
qulonglong parentId = pathElements.at(5).toULongLong();
serviceComics(libraryId, parentId, response);
response.write("",true);
response.write("", true);
}
void FolderInfoControllerV2::serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response)
{
QList<LibraryItem *> folderContent = DBHelper::getFolderSubfoldersFromLibrary(library,folderId);
QList<LibraryItem *> folderComics = DBHelper::getFolderComicsFromLibrary(library,folderId);
QList<LibraryItem *> folderContent = DBHelper::getFolderSubfoldersFromLibrary(library, folderId);
QList<LibraryItem *> folderComics = DBHelper::getFolderComicsFromLibrary(library, folderId);
ComicDB * currentComic;
for(QList<LibraryItem *>::const_iterator itr = folderComics.constBegin();itr!=folderComics.constEnd();itr++)
{
ComicDB *currentComic;
for (QList<LibraryItem *>::const_iterator itr = folderComics.constBegin(); itr != folderComics.constEnd(); itr++) {
currentComic = (ComicDB *)(*itr);
response.write(QString("/v2/library/%1/comic/%2:%3:%4:%5:%6\r\n")
.arg(library)
.arg(currentComic->id)
.arg(currentComic->getFileName())
.arg(currentComic->getFileSize())
.arg(currentComic->info.read ? 1 : 0)
.arg(currentComic->info.hash)
.toUtf8());
.arg(library)
.arg(currentComic->id)
.arg(currentComic->getFileName())
.arg(currentComic->getFileSize())
.arg(currentComic->info.read ? 1 : 0)
.arg(currentComic->info.hash)
.toUtf8());
delete currentComic;
}
Folder * currentFolder;
for(QList<LibraryItem *>::const_iterator itr = folderContent.constBegin();itr!=folderContent.constEnd();itr++)
{
Folder *currentFolder;
for (QList<LibraryItem *>::const_iterator itr = folderContent.constBegin(); itr != folderContent.constEnd(); itr++) {
currentFolder = (Folder *)(*itr);
serviceComics(library, currentFolder->id, response);
delete currentFolder;

16
YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h
View File

@ -5,19 +5,19 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class FolderInfoControllerV2 : public HttpRequestHandler {
Q_OBJECT
Q_DISABLE_COPY(FolderInfoControllerV2)
class FolderInfoControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(FolderInfoControllerV2)
public:
/** Constructor */
/** Constructor */
FolderInfoControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
/** Generates the response */
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceComics(const int &library, const qulonglong & folderId, HttpResponse& response);
void serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response);
};
#endif // FOLDERINFOCONTROLLER_H

18
YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp
View File

@ -1,5 +1,5 @@
#include "librariescontroller_v2.h"
#include "db_helper.h" //get libraries
#include "db_helper.h" //get libraries
#include "yacreader_libraries.h"
#include "template.h"
@ -9,17 +9,17 @@
LibrariesControllerV2::LibrariesControllerV2() {}
void LibrariesControllerV2::service(HttpRequest& /* request */, HttpResponse& response)
void LibrariesControllerV2::service(HttpRequest & /* request */, HttpResponse &response)
{
response.setHeader("Content-Type", "application/json");
YACReaderLibraries libraries = DBHelper::getLibraries();
QList<QString> names = DBHelper::getLibrariesNames();
YACReaderLibraries libraries = DBHelper::getLibraries();
QList<QString> names = DBHelper::getLibrariesNames();
QJsonArray librariesJson;
int currentId = 0;
foreach (QString name,names) {
int currentId = 0;
foreach (QString name, names) {
currentId = libraries.getId(name);
QJsonObject library;
@ -27,10 +27,10 @@ void LibrariesControllerV2::service(HttpRequest& /* request */, HttpResponse& re
library["id"] = currentId;
librariesJson.append(library);
}
}
QJsonDocument output(librariesJson);
response.setStatus(200,"OK");
response.write(output.toJson(QJsonDocument::Compact),true);
response.setStatus(200, "OK");
response.write(output.toJson(QJsonDocument::Compact), true);
}

7
YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h
View File

@ -9,17 +9,16 @@
This controller displays a HTML form and dumps the submitted input.
*/
class LibrariesControllerV2 : public HttpRequestHandler {
class LibrariesControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(LibrariesControllerV2)
public:
/** Constructor */
LibrariesControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
};
#endif // LIBRARIESCONTROLLER_H

81
YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp
View File

@ -15,35 +15,32 @@
PageControllerV2::PageControllerV2() {}
void PageControllerV2::service(HttpRequest& request, HttpResponse& response)
void PageControllerV2::service(HttpRequest &request, HttpResponse &response)
{
QByteArray token = request.getHeader("x-request-id");
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(token);
if (ySession == nullptr) {
response.setStatus(424,"no session for this comic");
response.write("424 no session for this comic",true);
response.setStatus(424, "no session for this comic");
response.write("424 no session for this comic", true);
return;
}
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
bool remote = path.endsWith("remote");
QStringList pathElements = path.split('/');
QString libraryName = DBHelper::getLibraryName(pathElements.at(2).toInt());
qulonglong comicId = pathElements.at(5).toULongLong();
unsigned int page = pathElements.at(7).toUInt();
Comic * comicFile;
Comic *comicFile;
qulonglong currentComicId;
if(remote)
{
if (remote) {
QLOG_TRACE() << "se recupera comic remoto para servir páginas";
comicFile = ySession->getCurrentRemoteComic();
currentComicId = ySession->getCurrentRemoteComicId();
}
else
{
} else {
QLOG_TRACE() << "se recupera comic para servir páginas";
comicFile = ySession->getCurrentComic();
currentComicId = ySession->getCurrentComicId();
@ -51,61 +48,51 @@ void PageControllerV2::service(HttpRequest& request, HttpResponse& response)
if (comicFile->hasBeenAnErrorOpening()) {
//delete comicFile;
if(remote)
if (remote)
ySession->dismissCurrentRemoteComic();
else
ySession->dismissCurrentComic();
response.setStatus(404,"not found");
response.write("404 not found",true);
response.setStatus(404, "not found");
response.write("404 not found", true);
return;
}
if(currentComicId != 0 && !QPointer<Comic>(comicFile).isNull())
{
if (currentComicId != 0 && !QPointer<Comic>(comicFile).isNull()) {
if (comicFile->numPages() == 0) {
response.setStatus(412,"opening file");
response.write("412 opening file",true);
response.setStatus(412, "opening file");
response.write("412 opening file", true);
} else {
if(comicId == currentComicId && page < comicFile->numPages())
{
if(comicFile->pageIsLoaded(page))
{
if (comicId == currentComicId && page < comicFile->numPages()) {
if (comicFile->pageIsLoaded(page)) {
response.setHeader("Content-Type", "image/jpeg");
response.setHeader("Transfer-Encoding","chunked");
response.setHeader("Transfer-Encoding", "chunked");
QByteArray pageData = comicFile->getRawPage(page);
QDataStream data(pageData);
std::vector<char> buffer(100000);
while (!data.atEnd()) {
int len = data.readRawData(&buffer[0],buffer.size());
response.write(QByteArray(&buffer[0],len));
int len = data.readRawData(&buffer[0], buffer.size());
response.write(QByteArray(&buffer[0], len));
}
response.write(QByteArray(),true);
response.write(QByteArray(), true);
} else {
response.setStatus(412, "loading page");
response.write("412 loading page", true);
}
else
{
response.setStatus(412,"loading page");
response.write("412 loading page",true);
}
}
else
{
if(comicId != currentComicId)
{
} else {
if (comicId != currentComicId) {
//delete comicFile;
if(remote)
if (remote)
ySession->dismissCurrentRemoteComic();
else
ySession->dismissCurrentComic();
}
response.setStatus(404,"not found");
response.write("404 not found",true);
response.setStatus(404, "not found");
response.write("404 not found", true);
}
}
}
else
{
response.setStatus(404,"not found");
response.write("404 not found",true);
} else {
response.setStatus(404, "not found");
response.write("404 not found", true);
}
}

12
YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h
View File

@ -5,16 +5,16 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class PageControllerV2 : public HttpRequestHandler {
Q_OBJECT
class PageControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(PageControllerV2)
public:
/** Constructor */
/** Constructor */
PageControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
/** Generates the response */
void service(HttpRequest &request, HttpResponse &response);
};
#endif // PAGECONTROLLER_H

8
YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp
View File

@ -7,7 +7,6 @@
ReadingComicsControllerV2::ReadingComicsControllerV2()
{
}
void ReadingComicsControllerV2::service(HttpRequest &request, HttpResponse &response)
@ -20,8 +19,8 @@ void ReadingComicsControllerV2::service(HttpRequest &request, HttpResponse &resp
serviceContent(libraryId, response);
response.setStatus(200,"OK");
response.write("",true);
response.setStatus(200, "OK");
response.write("", true);
}
void ReadingComicsControllerV2::serviceContent(const int &library, HttpResponse &response)
@ -30,8 +29,7 @@ void ReadingComicsControllerV2::serviceContent(const int &library, HttpResponse
QJsonArray comics;
for(const ComicDB &comic : readingComics)
{
for (const ComicDB &comic : readingComics) {
comics.append(YACReaderServerDataHelper::comicToJSON(library, comic));
}

5
YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h
View File

@ -5,13 +5,14 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class ReadingComicsControllerV2 : public HttpRequestHandler {
class ReadingComicsControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ReadingComicsControllerV2)
public:
ReadingComicsControllerV2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int &library, HttpResponse &response);

6
YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp
View File

@ -7,7 +7,6 @@
ReadingListContentControllerV2::ReadingListContentControllerV2()
{
}
void ReadingListContentControllerV2::service(HttpRequest &request, HttpResponse &response)
@ -21,7 +20,7 @@ void ReadingListContentControllerV2::service(HttpRequest &request, HttpResponse
serviceContent(libraryId, readingListId, response);
response.write("",true);
response.write("", true);
}
void ReadingListContentControllerV2::serviceContent(const int &library, const qulonglong &readingListId, HttpResponse &response)
@ -30,8 +29,7 @@ void ReadingListContentControllerV2::serviceContent(const int &library, const qu
QJsonArray items;
for(const ComicDB &comic : comics)
{
for (const ComicDB &comic : comics) {
items.append(YACReaderServerDataHelper::comicToJSON(library, comic));
}

5
YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h
View File

@ -5,13 +5,14 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class ReadingListContentControllerV2 : public HttpRequestHandler {
class ReadingListContentControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ReadingListContentControllerV2)
public:
ReadingListContentControllerV2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int &library, const qulonglong &readingListId, HttpResponse &response);

21
YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp
View File

@ -8,7 +8,7 @@
#include "template.h"
#include "../static.h"
ReadingListInfoControllerV2::ReadingListInfoControllerV2(){}
ReadingListInfoControllerV2::ReadingListInfoControllerV2() {}
void ReadingListInfoControllerV2::service(HttpRequest &request, HttpResponse &response)
{
@ -22,22 +22,21 @@ void ReadingListInfoControllerV2::service(HttpRequest &request, HttpResponse &re
serviceComics(libraryId, listId, response);
response.write("",true);
response.write("", true);
}
void ReadingListInfoControllerV2::serviceComics(const int &library, const qulonglong &readingListId, HttpResponse &response)
{
QList<ComicDB> comics = DBHelper::getReadingListFullContent(library, readingListId);
for(const ComicDB &comic : comics)
{
for (const ComicDB &comic : comics) {
response.write(QString("/v2/library/%1/comic/%2:%3:%4:%5:%6\r\n")
.arg(library)
.arg(comic.id)
.arg(comic.getFileName())
.arg(comic.getFileSize())
.arg(comic.info.read ? 1 : 0)
.arg(comic.info.hash)
.toUtf8());
.arg(library)
.arg(comic.id)
.arg(comic.getFileName())
.arg(comic.getFileSize())
.arg(comic.info.read ? 1 : 0)
.arg(comic.info.hash)
.toUtf8());
}
}

11
YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h
View File

@ -5,18 +5,17 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class ReadingListInfoControllerV2 : public HttpRequestHandler {
class ReadingListInfoControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ReadingListInfoControllerV2)
Q_DISABLE_COPY(ReadingListInfoControllerV2)
public:
ReadingListInfoControllerV2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceComics(const int &library, const qulonglong & readingListId, HttpResponse& response);
void serviceComics(const int &library, const qulonglong &readingListId, HttpResponse &response);
};
#endif // READINGLISTINFOCONTROLLER_V2_H

8
YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp
View File

@ -4,11 +4,8 @@
#include "reading_list.h"
#include "yacreader_server_data_helper.h"
ReadingListsControllerV2::ReadingListsControllerV2()
{
}
void ReadingListsControllerV2::service(HttpRequest &request, HttpResponse &response)
@ -21,7 +18,7 @@ void ReadingListsControllerV2::service(HttpRequest &request, HttpResponse &respo
serviceContent(libraryId, response);
response.write("",true);
response.write("", true);
}
void ReadingListsControllerV2::serviceContent(const int library, HttpResponse &response)
@ -30,8 +27,7 @@ void ReadingListsControllerV2::serviceContent(const int library, HttpResponse &r
QJsonArray items;
for(QList<ReadingList>::const_iterator itr = readingLists.constBegin();itr!=readingLists.constEnd();itr++)
{
for (QList<ReadingList>::const_iterator itr = readingLists.constBegin(); itr != readingLists.constEnd(); itr++) {
items.append(YACReaderServerDataHelper::readingListToJSON(library, *itr));
}

5
YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h
View File

@ -5,13 +5,14 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class ReadingListsControllerV2 : public HttpRequestHandler {
class ReadingListsControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(ReadingListsControllerV2)
public:
ReadingListsControllerV2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int library, HttpResponse &response);

29
YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
View File

@ -8,7 +8,6 @@
SyncControllerV2::SyncControllerV2()
{
}
void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
@ -17,7 +16,7 @@ void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
QLOG_TRACE() << "POST DATA: " << postData;
if(postData.length()>0) {
if (postData.length() > 0) {
QList<QString> data = postData.split("\n");
qulonglong libraryId;
@ -26,14 +25,11 @@ void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
int currentRating;
unsigned long long lastTimeOpened;
QString hash;
foreach(QString comicInfo, data)
{
foreach (QString comicInfo, data) {
QList<QString> comicInfoProgress = comicInfo.split("\t");
if(comicInfoProgress.length() == 6)
{
if (comicInfoProgress.at(0) != "unknown")
{
if (comicInfoProgress.length() == 6) {
if (comicInfoProgress.at(0) != "unknown") {
libraryId = comicInfoProgress.at(0).toULongLong();
comicId = comicInfoProgress.at(1).toULongLong();
hash = comicInfoProgress.at(2);
@ -50,10 +46,8 @@ void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
lastTimeOpened = comicInfoProgress.at(5).toULong();
info.lastTimeOpened = lastTimeOpened;
DBHelper::updateFromRemoteClient(libraryId,info);
}
else
{
DBHelper::updateFromRemoteClient(libraryId, info);
} else {
hash = comicInfoProgress.at(2);
currentPage = comicInfoProgress.at(3).toInt();
@ -71,14 +65,11 @@ void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
}
}
}
}
else
{
response.setStatus(412,"No comic info received");
response.write("",true);
} else {
response.setStatus(412, "No comic info received");
response.write("", true);
return;
}
response.write("OK",true);
response.write("OK", true);
}

5
YACReaderLibrary/server/controllers/v2/synccontroller_v2.h
View File

@ -7,7 +7,8 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class SyncControllerV2 : public HttpRequestHandler {
class SyncControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(SyncControllerV2)
public:
@ -15,7 +16,7 @@ public:
SyncControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
};
#endif // SYNCCONTROLLER_H

14
YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp
View File

@ -9,7 +9,6 @@
TagContentControllerV2::TagContentControllerV2()
{
}
void TagContentControllerV2::service(HttpRequest &request, HttpResponse &response)
@ -23,21 +22,20 @@ void TagContentControllerV2::service(HttpRequest &request, HttpResponse &respons
serviceContent(libraryId, tagId, response);
response.write("",true);
response.write("", true);
}
void TagContentControllerV2::serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response)
{
QList<ComicDB> comics = DBHelper::getLabelComics(library, tagId);
QJsonArray items;
for(const ComicDB &comic : comics)
{
for (const ComicDB &comic : comics) {
items.append(YACReaderServerDataHelper::comicToJSON(library, comic));
}
QJsonDocument output(items);
response.write(output.toJson(QJsonDocument::Compact));
}

5
YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h
View File

@ -5,7 +5,8 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class TagContentControllerV2 : public HttpRequestHandler {
class TagContentControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(TagContentControllerV2)
public:
@ -13,7 +14,7 @@ public:
TagContentControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response);

19
YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp
View File

@ -22,22 +22,21 @@ void TagInfoControllerV2::service(HttpRequest &request, HttpResponse &response)
serviceComics(libraryId, listId, response);
response.write("",true);
response.write("", true);
}
void TagInfoControllerV2::serviceComics(const int &library, const qulonglong &tagId, HttpResponse &response)
{
QList<ComicDB> comics = DBHelper::getLabelComics(library, tagId);
for(const ComicDB &comic : comics)
{
for (const ComicDB &comic : comics) {
response.write(QString("/v2/library/%1/comic/%2:%3:%4:%5:%6\r\n")
.arg(library)
.arg(comic.id)
.arg(comic.getFileName())
.arg(comic.getFileSize())
.arg(comic.info.read ? 1 : 0)
.arg(comic.info.hash)
.toUtf8());
.arg(library)
.arg(comic.id)
.arg(comic.getFileName())
.arg(comic.getFileSize())
.arg(comic.info.read ? 1 : 0)
.arg(comic.info.hash)
.toUtf8());
}
}

9
YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h
View File

@ -5,16 +5,17 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class TagInfoControllerV2 : public HttpRequestHandler {
class TagInfoControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(TagInfoControllerV2)
Q_DISABLE_COPY(TagInfoControllerV2)
public:
TagInfoControllerV2();
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
private:
void serviceComics(const int &library, const qulonglong & tagId, HttpResponse& response);
void serviceComics(const int &library, const qulonglong &tagId, HttpResponse &response);
};
#endif // TAGINFOCONTROLLER_V2_H

8
YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp
View File

@ -13,7 +13,7 @@
TagsControllerV2::TagsControllerV2() {}
void TagsControllerV2::service(HttpRequest& request, HttpResponse& response)
void TagsControllerV2::service(HttpRequest &request, HttpResponse &response)
{
response.setHeader("Content-Type", "text/plain; charset=utf-8");
@ -25,12 +25,12 @@ void TagsControllerV2::service(HttpRequest& request, HttpResponse& response)
QJsonArray items;
for(QList<Label>::const_iterator itr = labels.constBegin();itr!=labels.constEnd();itr++)
{
for (QList<Label>::const_iterator itr = labels.constBegin(); itr != labels.constEnd(); itr++) {
items.append(YACReaderServerDataHelper::labelToJSON(libraryId, *itr));
}
QJsonDocument output(items);
response.write(output.toJson(QJsonDocument::Compact));;
response.write(output.toJson(QJsonDocument::Compact));
;
}

8
YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h
View File

@ -5,18 +5,16 @@
#include "httpresponse.h"
#include "httprequesthandler.h"
class TagsControllerV2 : public HttpRequestHandler {
class TagsControllerV2 : public HttpRequestHandler
{
Q_OBJECT
Q_DISABLE_COPY(TagsControllerV2)
public:
/** Constructor */
TagsControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
};
#endif // TAGSCONTROLLER_H

18
YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp
View File

@ -11,7 +11,7 @@
#include "QsLog.h"
UpdateComicControllerV2::UpdateComicControllerV2(){}
UpdateComicControllerV2::UpdateComicControllerV2() {}
void UpdateComicControllerV2::service(HttpRequest &request, HttpResponse &response)
{
@ -25,30 +25,28 @@ void UpdateComicControllerV2::service(HttpRequest &request, HttpResponse &respon
QLOG_TRACE() << "POST DATA: " << postData;
if(postData.length()>0) {
if (postData.length() > 0) {
QList<QString> data = postData.split("\n");
QString currentComicData = data.at(0);
int currentPage = currentComicData.split(":").at(1).toInt();
ComicInfo info;
info.currentPage = currentPage;
info.id = comicId;
DBHelper::updateProgress(libraryId,info);
DBHelper::updateProgress(libraryId, info);
if (data.length() > 1) {
if (data.at(1).isEmpty() == false) {
QString nextComicId = data.at(1);
ComicInfo info;
info.id = nextComicId.toULongLong();
DBHelper::setComicAsReading(libraryId,info);
DBHelper::setComicAsReading(libraryId, info);
}
}
}
else
{
response.setStatus(412,"No comic info received");
response.write("",true);
} else {
response.setStatus(412, "No comic info received");
response.write("", true);
return;
}
response.write("OK",true);
response.write("OK", true);
}

4
YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h
View File

@ -1,12 +1,10 @@
#ifndef UPDATECOMICCONTROLLER_V2_H
#define UPDATECOMICCONTROLLER_V2_H
#include "httprequest.h"
#include "httpresponse.h"
#include "httprequesthandler.h"
class UpdateComicControllerV2 : public HttpRequestHandler
{
Q_OBJECT
@ -16,7 +14,7 @@ public:
UpdateComicControllerV2();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
void service(HttpRequest &request, HttpResponse &response);
};
#endif // UPDATECOMICCONTROLLER_H