mirror of
https://github.com/YACReader/yacreader
synced 2025-06-03 17:18:23 -04:00
Separate v1 and v2 server api classes and execution path.
This commit is contained in:
Luis Ángel San Martín
parent
aca67f2b2a
commit
68db72078f
@ -1,62 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#include "dumpcontroller.h"
|
||||
#include <QVariant>
|
||||
#include <QDateTime>
|
||||
|
||||
DumpController::DumpController(){}
|
||||
|
||||
void DumpController::service(HttpRequest& request, HttpResponse& response) {
|
||||
|
||||
response.setHeader("Content-Type", "text/html; charset=ISO-8859-1");
|
||||
response.setCookie(HttpCookie("firstCookie","hello",600));
|
||||
response.setCookie(HttpCookie("secondCookie","world",600));
|
||||
|
||||
QByteArray body("<html><body>");
|
||||
body.append("<b>Request:</b>");
|
||||
body.append("<br>Method: ");
|
||||
body.append(request.getMethod());
|
||||
body.append("<br>Path: ");
|
||||
body.append(request.getPath());
|
||||
body.append("<br>Version: ");
|
||||
body.append(request.getVersion());
|
||||
|
||||
body.append("<p><b>Headers:</b>");
|
||||
QMapIterator<QByteArray,QByteArray> i(request.getHeaderMap());
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
body.append("<br>");
|
||||
body.append(i.key());
|
||||
body.append("=");
|
||||
body.append(i.value());
|
||||
}
|
||||
|
||||
body.append("<p><b>Parameters:</b>");
|
||||
i=QMapIterator<QByteArray,QByteArray>(request.getParameterMap());
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
body.append("<br>");
|
||||
body.append(i.key());
|
||||
body.append("=");
|
||||
body.append(i.value());
|
||||
}
|
||||
|
||||
body.append("<p><b>Cookies:</b>");
|
||||
i=QMapIterator<QByteArray,QByteArray>(request.getCookieMap());
|
||||
while (i.hasNext()) {
|
||||
i.next();
|
||||
body.append("<br>");
|
||||
body.append(i.key());
|
||||
body.append("=");
|
||||
body.append(i.value());
|
||||
}
|
||||
|
||||
body.append("<p><b>Body:</b><br>");
|
||||
body.append(request.getBody());
|
||||
|
||||
body.append("</body></html>");
|
||||
response.write(body,true);
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#ifndef DUMPCONTROLLER_H
|
||||
#define DUMPCONTROLLER_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
/**
|
||||
This controller dumps the received HTTP request in the response.
|
||||
*/
|
||||
|
||||
class DumpController : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(DumpController);
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
DumpController();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // DUMPCONTROLLER_H
|
||||
@ -1,38 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#include "fileuploadcontroller.h"
|
||||
|
||||
FileUploadController::FileUploadController() {}
|
||||
|
||||
void FileUploadController::service(HttpRequest& request, HttpResponse& response) {
|
||||
|
||||
if (request.getParameter("action")=="show") {
|
||||
response.setHeader("Content-Type", "image/jpeg");
|
||||
QTemporaryFile* file=request.getUploadedFile("file1");
|
||||
if (file) {
|
||||
while (!file->atEnd() && !file->error()) {
|
||||
QByteArray buffer=file->read(65536);
|
||||
response.write(buffer);
|
||||
}
|
||||
}
|
||||
else {
|
||||
response.write("upload failed");
|
||||
}
|
||||
}
|
||||
|
||||
else {
|
||||
response.setHeader("Content-Type", "text/html; charset=ISO-8859-1");
|
||||
response.write("<html><body>");
|
||||
response.write("Upload a JPEG image file<p>");
|
||||
response.write("<form method=\"post\" enctype=\"multipart/form-data\">");
|
||||
response.write(" <input type=\"hidden\" name=\"action\" value=\"show\">");
|
||||
response.write(" File: <input type=\"file\" name=\"file1\"><br>");
|
||||
response.write(" <input type=\"submit\">");
|
||||
response.write("</form>");
|
||||
response.write("</body></html>",true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#ifndef FILEUPLOADCONTROLLER_H
|
||||
#define FILEUPLOADCONTROLLER_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
/**
|
||||
This controller displays a HTML form for file upload and recieved the file.
|
||||
*/
|
||||
|
||||
|
||||
class FileUploadController : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(FileUploadController);
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
FileUploadController();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // FILEUPLOADCONTROLLER_H
|
||||
@ -1,64 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#include "formcontroller.h"
|
||||
#include <QStringList>
|
||||
|
||||
FormController::FormController() {}
|
||||
|
||||
void FormController::service(HttpRequest& request, HttpResponse& response) {
|
||||
|
||||
response.setHeader("Content-Type", "text/html; charset=utf-8");
|
||||
|
||||
QString data(request.getBody());
|
||||
|
||||
QStringList list = data.split("\n");
|
||||
|
||||
response.write("<html><body>");
|
||||
response.writeText("á é í ó ú ñ -> \\ /Device type: "+list.first());
|
||||
|
||||
//test background proccesing
|
||||
/*int i=0;
|
||||
int j=0;
|
||||
while(i<1000000000)
|
||||
{
|
||||
if(request.getBody().length()>1)
|
||||
j++;
|
||||
else
|
||||
i++;
|
||||
if(i%1000000 == 0)
|
||||
response.write("<p> lista </p>");
|
||||
}*/
|
||||
|
||||
response.write("<p> lista </p>");
|
||||
|
||||
response.write("<ul>");
|
||||
|
||||
for(int i=1;i<list.length();i++)
|
||||
{
|
||||
response.writeText("<li>"+list.at(i)+"</li>");
|
||||
}
|
||||
response.write("</ul></body></html>",true);
|
||||
|
||||
/*if (request.getParameter("action")=="show") {
|
||||
response.write("<html><body>");
|
||||
response.write("Name = ");
|
||||
response.write(request.getParameter("name"));
|
||||
response.write("<br>City = ");
|
||||
response.write(request.getParameter("city"));
|
||||
response.write("</body></html>",true);
|
||||
}
|
||||
else {
|
||||
response.write("<html><body>");
|
||||
response.write("<form method=\"post\">");
|
||||
response.write(" <input type=\"hidden\" name=\"action\" value=\"show\">");
|
||||
response.write(" Name: <input type=\"text\" name=\"name\"><br>");
|
||||
response.write(" City: <input type=\"text\" name=\"city\"><br>");
|
||||
response.write(" <input type=\"submit\">");
|
||||
response.write("</form>");
|
||||
response.write("</body></html>",true);
|
||||
}*/
|
||||
}
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#ifndef SESSIONCONTROLLER_H
|
||||
#define SESSIONCONTROLLER_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
/**
|
||||
This controller demonstrates how to use sessions.
|
||||
*/
|
||||
|
||||
class SessionController : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(SessionController);
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
SessionController();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // SESSIONCONTROLLER_H
|
||||
@ -1,31 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#include "templatecontroller.h"
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
TemplateController::TemplateController(){}
|
||||
|
||||
void TemplateController::service(HttpRequest& request, HttpResponse& response) {
|
||||
|
||||
response.setHeader("Content-Type", "text/html; charset=ISO-8859-1");
|
||||
|
||||
Template t=Static::templateLoader->getTemplate("demo",request.getHeader("Accept-Language"));
|
||||
t.enableWarnings();
|
||||
t.setVariable("path",request.getPath());
|
||||
QMap<QByteArray,QByteArray> headers=request.getHeaderMap();
|
||||
QMapIterator<QByteArray,QByteArray> iterator(headers);
|
||||
t.loop("header",headers.size());
|
||||
int i=0;
|
||||
while (iterator.hasNext()) {
|
||||
iterator.next();
|
||||
t.setVariable(QString("header%1.name").arg(i),QString(iterator.key()));
|
||||
t.setVariable(QString("header%1.value").arg(i),QString(iterator.value()));
|
||||
++i;
|
||||
}
|
||||
|
||||
response.write(t.toLatin1(),true);
|
||||
}
|
||||
@ -1,30 +0,0 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#ifndef TEMPLATECONTROLLER_H
|
||||
#define TEMPLATECONTROLLER_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
/**
|
||||
This controller generates a website using the template engine.
|
||||
It generates a Latin1 (ISO-8859-1) encoded website from a UTF-8 encoded template file.
|
||||
*/
|
||||
|
||||
class TemplateController : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(TemplateController);
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
TemplateController();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // TEMPLATECONTROLLER_H
|
||||
124
YACReaderLibrary/server/controllers/v1/comiccontroller.cpp
Normal file
124
YACReaderLibrary/server/controllers/v1/comiccontroller.cpp
Normal file
@ -0,0 +1,124 @@
|
||||
#include "comiccontroller.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "yacreader_libraries.h"
|
||||
#include "yacreader_http_session.h"
|
||||
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
#include "comic_db.h"
|
||||
#include "comic.h"
|
||||
|
||||
#include "QsLog.h"
|
||||
|
||||
#include <typeinfo>
|
||||
|
||||
ComicController::ComicController() {}
|
||||
|
||||
void ComicController::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
QStringList pathElements = path.split('/');
|
||||
qulonglong libraryId = pathElements.at(2).toLongLong();
|
||||
QString libraryName = DBHelper::getLibraryName(libraryId);
|
||||
qulonglong comicId = pathElements.at(4).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;
|
||||
// }
|
||||
//}
|
||||
|
||||
YACReaderLibraries libraries = DBHelper::getLibraries();
|
||||
|
||||
ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
|
||||
|
||||
if(!remoteComic)
|
||||
ySession->setDownloadedComic(comic.info.hash);
|
||||
|
||||
Comic * comicFile = FactoryComic::newComic(libraries.getPath(libraryId)+comic.path);
|
||||
|
||||
if(comicFile != NULL)
|
||||
{
|
||||
QThread * thread = NULL;
|
||||
|
||||
thread = new QThread();
|
||||
|
||||
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()));
|
||||
|
||||
comicFile->load(libraries.getPath(libraryId)+comic.path);
|
||||
|
||||
if(thread != NULL)
|
||||
thread->start();
|
||||
|
||||
if(remoteComic)
|
||||
{
|
||||
QLOG_TRACE() << "remote comic requested";
|
||||
ySession->setCurrentRemoteComic(comic.id, comicFile);
|
||||
|
||||
}
|
||||
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!
|
||||
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
|
||||
{
|
||||
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)
|
||||
{
|
||||
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
|
||||
{
|
||||
//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);
|
||||
|
||||
}
|
||||
89
YACReaderLibrary/server/controllers/v1/covercontroller.cpp
Normal file
89
YACReaderLibrary/server/controllers/v1/covercontroller.cpp
Normal file
@ -0,0 +1,89 @@
|
||||
#include "covercontroller.h"
|
||||
#include "db_helper.h" //get libraries
|
||||
#include "yacreader_libraries.h"
|
||||
#include "yacreader_http_session.h"
|
||||
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
CoverController::CoverController() {}
|
||||
|
||||
void CoverController::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
|
||||
response.setHeader("Content-Type", "image/jpeg");
|
||||
response.setHeader("Connection","close");
|
||||
//response.setHeader("Content-Type", "plain/text; charset=ISO-8859-1");
|
||||
|
||||
YACReaderLibraries libraries = DBHelper::getLibraries();
|
||||
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
QStringList pathElements = path.split('/');
|
||||
QString libraryName = DBHelper::getLibraryName(pathElements.at(2).toInt());
|
||||
QString fileName = pathElements.at(4);
|
||||
|
||||
bool folderCover = request.getParameter("folderCover").length()>0;
|
||||
|
||||
//response.writeText(path+"<br/>");
|
||||
//response.writeText(libraryName+"<br/>");
|
||||
//response.writeText(libraries.value(libraryName)+"/.yacreaderlibrary/covers/"+fileName+"<br/>");
|
||||
|
||||
//QFile file(libraries.value(libraryName)+"/.yacreaderlibrary/covers/"+fileName);
|
||||
//if (file.exists()) {
|
||||
// if (file.open(QIODevice::ReadOnly))
|
||||
// {
|
||||
// qDebug("StaticFileController: Open file %s",qPrintable(file.fileName()));
|
||||
// // Return the file content, do not store in cache
|
||||
// while (!file.atEnd() && !file.error()) {
|
||||
// response.write(file.read(131072));
|
||||
// }
|
||||
// }
|
||||
|
||||
// file.close();
|
||||
//}
|
||||
|
||||
QImage img(libraries.getPath(libraryName)+"/.yacreaderlibrary/covers/"+fileName);
|
||||
if (!img.isNull()) {
|
||||
|
||||
int width = 80, height = 120;
|
||||
if(ySession->getDisplayType()=="@2x")
|
||||
{
|
||||
width = 160;
|
||||
height = 240;
|
||||
}
|
||||
|
||||
if(float(img.width())/img.height() < 0.66666)
|
||||
img = img.scaledToWidth(width,Qt::SmoothTransformation);
|
||||
else
|
||||
img = img.scaledToHeight(height,Qt::SmoothTransformation);
|
||||
|
||||
QImage destImg(width,height,QImage::Format_RGB32);
|
||||
destImg.fill(Qt::black);
|
||||
QPainter p(&destImg);
|
||||
|
||||
p.drawImage((width-img.width())/2,(height-img.height())/2,img);
|
||||
|
||||
if(folderCover)
|
||||
{
|
||||
if(ySession->getDisplayType()=="@2x")
|
||||
p.drawImage(0,0,QImage(":/images/f_overlayed_retina.png"));
|
||||
else
|
||||
p.drawImage(0,0,QImage(":/images/f_overlayed.png"));
|
||||
}
|
||||
|
||||
QByteArray ba;
|
||||
QBuffer buffer(&ba);
|
||||
buffer.open(QIODevice::WriteOnly);
|
||||
destImg.save(&buffer, "JPG");
|
||||
response.write(ba,true);
|
||||
}
|
||||
//DONE else, hay que devolver un 404
|
||||
else
|
||||
{
|
||||
response.setStatus(404,"not found");
|
||||
response.write("404 not found",true);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
#include "foldercontroller.h"
|
||||
#include "controllers/errorcontroller.h"
|
||||
#include "controllers/v1/errorcontroller.h"
|
||||
|
||||
#include "yacreader_http_session.h"
|
||||
|
||||
#include "db_helper.h" //get libraries
|
||||
#include "comic_db.h"
|
||||
@ -12,8 +14,6 @@
|
||||
#include "qnaturalsorting.h"
|
||||
#include "yacreader_global.h"
|
||||
|
||||
#include "yacreader_http_session.h"
|
||||
|
||||
#include "QsLog.h"
|
||||
|
||||
struct LibraryItemSorter
|
||||
@ -42,7 +42,7 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
|
||||
//QString y = session.get("xxx").toString();
|
||||
//response.writeText(QString("session xxx : %1 <br/>").arg(y));
|
||||
|
||||
Template t = Static::templateLoader->getTemplate("folder_"+ySession->getDeviceType(),request.getHeader("Accept-Language"));
|
||||
Template t=Static::templateLoader->getTemplate("folder_"+ySession->getDeviceType(),request.getHeader("Accept-Language"));
|
||||
t.enableWarnings();
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
QStringList pathElements = path.split('/');
|
||||
@ -182,23 +182,14 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
|
||||
}
|
||||
else
|
||||
{
|
||||
const Folder * folder = static_cast<Folder*>(item);
|
||||
|
||||
if(folder->getFirstChildHash().length()>0)
|
||||
QList<LibraryItem *> children = DBHelper::getFolderComicsFromLibrary(libraryId, item->id);
|
||||
if(children.length()>0)
|
||||
{
|
||||
t.setVariable(QString("element%1.image.url").arg(i),QString("/library/%1/cover/%2.jpg?folderCover=true").arg(libraryId).arg(folder->getFirstChildHash()));
|
||||
const ComicDB * comic = static_cast<ComicDB*>(children.at(0));
|
||||
t.setVariable(QString("element%1.image.url").arg(i),QString("/library/%1/cover/%2.jpg?folderCover=true").arg(libraryId).arg(comic->info.hash));
|
||||
}
|
||||
else
|
||||
{
|
||||
QList<LibraryItem *> children = DBHelper::getFolderComicsFromLibrary(libraryId, item->id);
|
||||
if(children.length()>0)
|
||||
{
|
||||
const ComicDB * comic = static_cast<ComicDB*>(children.at(0));
|
||||
t.setVariable(QString("element%1.image.url").arg(i),QString("/library/%1/cover/%2.jpg?folderCover=true").arg(libraryId).arg(comic->info.hash));
|
||||
}
|
||||
else
|
||||
t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png");
|
||||
}
|
||||
t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png");
|
||||
}
|
||||
|
||||
t.setVariable(QString("element%1.browse").arg(i),QString("<a class =\"browseButton\" href=\"%1\">BROWSE</a>").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id)));
|
||||
@ -342,4 +333,5 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
|
||||
t.setVariable("pages",QString("%1").arg(numPages));
|
||||
|
||||
response.write(t.toUtf8(), true);
|
||||
|
||||
}
|
||||
@ -15,10 +15,10 @@ void FolderInfoController::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
QString libraryName = DBHelper::getLibraryName(libraryId);
|
||||
qulonglong parentId = pathElements.at(4).toULongLong();
|
||||
QStringList pathElements = path.split('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
QString libraryName = DBHelper::getLibraryName(libraryId);
|
||||
qulonglong parentId = pathElements.at(4).toULongLong();
|
||||
|
||||
serviceComics(libraryId, parentId, response);
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
#include "librariescontroller.h"
|
||||
#include "db_helper.h" //get libraries
|
||||
#include "yacreader_libraries.h"
|
||||
#include "yacreader_http_session.h"
|
||||
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
#include "QsLog.h"
|
||||
|
||||
LibrariesController::LibrariesController() {}
|
||||
|
||||
void LibrariesController::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
|
||||
response.setHeader("Content-Type", "text/html; charset=utf-8");
|
||||
response.setHeader("Connection","close");
|
||||
|
||||
ySession->clearNavigationPath();
|
||||
|
||||
Template t=Static::templateLoader->getTemplate("libraries_"+ySession->getDeviceType(),request.getHeader("Accept-Language"));
|
||||
t.enableWarnings();
|
||||
|
||||
YACReaderLibraries libraries = DBHelper::getLibraries();
|
||||
QList<QString> names = DBHelper::getLibrariesNames();
|
||||
|
||||
t.loop("library",names.length());
|
||||
|
||||
int currentId = 0;
|
||||
int i = 0;
|
||||
foreach (QString name,names) {
|
||||
currentId = libraries.getId(name);
|
||||
t.setVariable(QString("library%1.name").arg(i),QString::number(currentId));
|
||||
t.setVariable(QString("library%1.label").arg(i),name);
|
||||
i++;
|
||||
}
|
||||
|
||||
response.setStatus(200,"OK");
|
||||
response.write(t.toUtf8(),true);
|
||||
}
|
||||
99
YACReaderLibrary/server/controllers/v1/pagecontroller.cpp
Normal file
99
YACReaderLibrary/server/controllers/v1/pagecontroller.cpp
Normal file
@ -0,0 +1,99 @@
|
||||
#include "pagecontroller.h"
|
||||
|
||||
#include "../static.h"
|
||||
|
||||
#include "comic.h"
|
||||
#include "comiccontroller.h"
|
||||
#include "yacreader_http_session.h"
|
||||
|
||||
#include <QDataStream>
|
||||
#include <QPointer>
|
||||
|
||||
#include <QsLog.h>
|
||||
|
||||
#include "db_helper.h"
|
||||
|
||||
PageController::PageController() {}
|
||||
|
||||
void PageController::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
bool remote = path.endsWith("remote");
|
||||
|
||||
//QByteArray path2=request.getPath();
|
||||
//qDebug("PageController: request to -> %s ",path2.data());
|
||||
|
||||
QStringList pathElements = path.split('/');
|
||||
QString libraryName = DBHelper::getLibraryName(pathElements.at(2).toInt());
|
||||
qulonglong comicId = pathElements.at(4).toULongLong();
|
||||
unsigned int page = pathElements.at(6).toUInt();
|
||||
|
||||
//qDebug("lib name : %s",pathElements.at(2).data());
|
||||
|
||||
Comic * comicFile;
|
||||
qulonglong currentComicId;
|
||||
if(remote)
|
||||
{
|
||||
QLOG_TRACE() << "se recupera comic remoto para servir páginas";
|
||||
comicFile = ySession->getCurrentRemoteComic();
|
||||
currentComicId = ySession->getCurrentRemoteComicId();
|
||||
}
|
||||
else
|
||||
{
|
||||
QLOG_TRACE() << "se recupera comic para servir páginas";
|
||||
comicFile = ySession->getCurrentComic();
|
||||
currentComicId = ySession->getCurrentComicId();
|
||||
}
|
||||
|
||||
if(currentComicId != 0 && !QPointer<Comic>(comicFile).isNull())
|
||||
{
|
||||
if(comicId == currentComicId && page < comicFile->numPages())
|
||||
{
|
||||
if(comicFile->pageIsLoaded(page))
|
||||
{
|
||||
//qDebug("PageController: La página estaba cargada -> %s ",path.data());
|
||||
response.setHeader("Content-Type", "image/jpeg");
|
||||
response.setHeader("Transfer-Encoding","chunked");
|
||||
QByteArray pageData = comicFile->getRawPage(page);
|
||||
QDataStream data(pageData);
|
||||
char buffer[4096];
|
||||
while (!data.atEnd()) {
|
||||
int len = data.readRawData(buffer,4096);
|
||||
response.write(QByteArray(buffer,len));
|
||||
}
|
||||
//response.write(pageData,true);
|
||||
response.write(QByteArray(),true);
|
||||
}
|
||||
else
|
||||
{
|
||||
//qDebug("PageController: La página NO estaba cargada 404 -> %s ",path.data());
|
||||
response.setStatus(404,"not found"); //TODO qué mensaje enviar
|
||||
response.write("404 not found",true);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(comicId != currentComicId)
|
||||
{
|
||||
//delete comicFile;
|
||||
if(remote)
|
||||
ySession->dismissCurrentRemoteComic();
|
||||
else
|
||||
ySession->dismissCurrentComic();
|
||||
}
|
||||
response.setStatus(404,"not found"); //TODO qué mensaje enviar
|
||||
response.write("404 not found",true);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
response.setStatus(404,"not found");
|
||||
response.write("404 not found",true);
|
||||
}
|
||||
|
||||
//response.write(t.toLatin1(),true);
|
||||
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
class SyncController : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(SyncController);
|
||||
Q_DISABLE_COPY(SyncController)
|
||||
public:
|
||||
/** Constructor */
|
||||
SyncController();
|
||||
@ -1,4 +1,4 @@
|
||||
#include "comiccontroller.h"
|
||||
#include "comiccontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "yacreader_libraries.h"
|
||||
@ -14,18 +14,18 @@
|
||||
|
||||
#include <typeinfo>
|
||||
|
||||
ComicController::ComicController() {}
|
||||
ComicControllerV2::ComicControllerV2() {}
|
||||
|
||||
void ComicController::service(HttpRequest& request, HttpResponse& response)
|
||||
void ComicControllerV2::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
QStringList pathElements = path.split('/');
|
||||
qulonglong libraryId = pathElements.at(2).toLongLong();
|
||||
qulonglong libraryId = pathElements.at(3).toLongLong();
|
||||
QString libraryName = DBHelper::getLibraryName(libraryId);
|
||||
qulonglong comicId = pathElements.at(4).toULongLong();
|
||||
qulonglong comicId = pathElements.at(5).toULongLong();
|
||||
|
||||
bool remoteComic = path.endsWith("remote");
|
||||
|
||||
23
YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h
Normal file
23
YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h
Normal file
@ -0,0 +1,23 @@
|
||||
#ifndef COMICCONTROLLER_V2_H
|
||||
#define COMICCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
#include <QThread>
|
||||
class Comic;
|
||||
class QString;
|
||||
|
||||
class ComicControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(ComicControllerV2)
|
||||
public:
|
||||
/** Constructor */
|
||||
ComicControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // COMICCONTROLLER_H
|
||||
@ -0,0 +1,26 @@
|
||||
#include "comicdownloadinfocontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "yacreader_libraries.h"
|
||||
|
||||
#include "comic_db.h"
|
||||
|
||||
ComicDownloadInfoControllerV2::ComicDownloadInfoControllerV2() {}
|
||||
|
||||
|
||||
void ComicDownloadInfoControllerV2::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('/');
|
||||
|
||||
qulonglong libraryId = pathElements.at(3).toLongLong();
|
||||
qulonglong comicId = pathElements.at(5).toULongLong();
|
||||
|
||||
ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
|
||||
|
||||
//TODO: check if the comic wasn't found;
|
||||
response.write(QString("fileName:%1\r\n").arg(comic.getFileName()).toUtf8());
|
||||
response.write(QString("fileSize:%1\r\n").arg(comic.getFileSize()).toUtf8(),true);
|
||||
}
|
||||
@ -0,0 +1,19 @@
|
||||
#ifndef COMICDOWNLOADINFOCONTROLLER_V2_H
|
||||
#define COMICDOWNLOADINFOCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class ComicDownloadInfoControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(ComicDownloadInfoControllerV2)
|
||||
public:
|
||||
/** Constructor **/
|
||||
ComicDownloadInfoControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // COMICDOWNLOADINFOCONTROLLER_H
|
||||
@ -1,4 +1,4 @@
|
||||
#include "covercontroller.h"
|
||||
#include "covercontroller_v2.h"
|
||||
#include "db_helper.h" //get libraries
|
||||
#include "yacreader_libraries.h"
|
||||
#include "yacreader_http_session.h"
|
||||
@ -6,9 +6,9 @@
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
CoverController::CoverController() {}
|
||||
CoverControllerV2::CoverControllerV2() {}
|
||||
|
||||
void CoverController::service(HttpRequest& request, HttpResponse& response)
|
||||
void CoverControllerV2::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
@ -21,8 +21,8 @@ void CoverController::service(HttpRequest& request, HttpResponse& response)
|
||||
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
QStringList pathElements = path.split('/');
|
||||
QString libraryName = DBHelper::getLibraryName(pathElements.at(2).toInt());
|
||||
QString fileName = pathElements.at(4);
|
||||
QString libraryName = DBHelper::getLibraryName(pathElements.at(3).toInt());
|
||||
QString fileName = pathElements.at(5);
|
||||
|
||||
bool folderCover = request.getParameter("folderCover").length()>0;
|
||||
|
||||
20
YACReaderLibrary/server/controllers/v2/covercontroller_v2.h
Normal file
20
YACReaderLibrary/server/controllers/v2/covercontroller_v2.h
Normal file
@ -0,0 +1,20 @@
|
||||
#ifndef COVERCONTROLLER_V2_H
|
||||
#define COVERCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class CoverControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(CoverControllerV2)
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
CoverControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // COVERCONTROLLER_H
|
||||
@ -0,0 +1,26 @@
|
||||
#include "errorcontroller_v2.h"
|
||||
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
|
||||
ErrorControllerV2::ErrorControllerV2(int errorCode)
|
||||
:error(errorCode)
|
||||
{}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
22
YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h
Normal file
22
YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h
Normal file
@ -0,0 +1,22 @@
|
||||
#ifndef ERRORCONTROLLER_V2_H
|
||||
#define ERRORCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class ErrorControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(ErrorControllerV2)
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
ErrorControllerV2(int errorCode);
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
private:
|
||||
int error;
|
||||
};
|
||||
|
||||
#endif // ERRORCONTROLLER_H
|
||||
@ -1,26 +1,26 @@
|
||||
#include "favoritescontroller.h"
|
||||
#include "favoritescontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "comic_db.h"
|
||||
|
||||
#include "yacreader_server_data_helper.h"
|
||||
|
||||
FavoritesController::FavoritesController() {}
|
||||
FavoritesControllerV2::FavoritesControllerV2() {}
|
||||
|
||||
void FavoritesController::service(HttpRequest &request, HttpResponse &response)
|
||||
void FavoritesControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
|
||||
serviceContent(libraryId, response);
|
||||
|
||||
response.write("",true);
|
||||
}
|
||||
|
||||
void FavoritesController::serviceContent(const int library, HttpResponse &response)
|
||||
void FavoritesControllerV2::serviceContent(const int library, HttpResponse &response)
|
||||
{
|
||||
QList<ComicDB> tagComics = DBHelper::getFavorites(library);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
#ifndef FAVORITESCONTROLLER_H
|
||||
#define FAVORITESCONTROLLER_H
|
||||
#ifndef FAVORITESCONTROLLER_V2_H
|
||||
#define FAVORITESCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class FavoritesController : public HttpRequestHandler {
|
||||
class FavoritesControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(FavoritesController)
|
||||
Q_DISABLE_COPY(FavoritesControllerV2)
|
||||
public:
|
||||
FavoritesController();
|
||||
FavoritesControllerV2();
|
||||
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
#include "foldercontentcontroller.h"
|
||||
#include "foldercontentcontroller_v2.h"
|
||||
|
||||
#include <QUrl>
|
||||
|
||||
@ -21,23 +21,23 @@ struct LibraryItemSorter
|
||||
}
|
||||
};
|
||||
|
||||
FolderContentController::FolderContentController() {}
|
||||
FolderContentControllerV2::FolderContentControllerV2() {}
|
||||
|
||||
void FolderContentController::service(HttpRequest& request, HttpResponse& response)
|
||||
void FolderContentControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
qulonglong parentId = pathElements.at(4).toULongLong();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
qulonglong parentId = pathElements.at(5).toULongLong();
|
||||
|
||||
serviceContent(libraryId, parentId, response);
|
||||
|
||||
response.write("",true);
|
||||
}
|
||||
|
||||
void FolderContentController::serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response)
|
||||
void FolderContentControllerV2::serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response)
|
||||
{
|
||||
//clock_t begin = clock();
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
#ifndef FOLDERCONTENTCONTROLLER_H
|
||||
#define FOLDERCONTENTCONTROLLER_H
|
||||
#ifndef FOLDERCONTENTCONTROLLER_V2_H
|
||||
#define FOLDERCONTENTCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class FolderContentController : public HttpRequestHandler {
|
||||
class FolderContentControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(FolderContentController);
|
||||
Q_DISABLE_COPY(FolderContentControllerV2)
|
||||
public:
|
||||
/** Constructor */
|
||||
FolderContentController();
|
||||
FolderContentControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
@ -0,0 +1,48 @@
|
||||
#include "folderinfocontroller_v2.h"
|
||||
#include "db_helper.h" //get libraries
|
||||
|
||||
#include "folder.h"
|
||||
#include "comic_db.h"
|
||||
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
|
||||
FolderInfoControllerV2::FolderInfoControllerV2() {}
|
||||
|
||||
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('/');
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
QString libraryName = DBHelper::getLibraryName(libraryId);
|
||||
qulonglong parentId = pathElements.at(5).toULongLong();
|
||||
|
||||
serviceComics(libraryId, parentId, response);
|
||||
|
||||
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);
|
||||
|
||||
ComicDB * currentComic;
|
||||
for(QList<LibraryItem *>::const_iterator itr = folderComics.constBegin();itr!=folderComics.constEnd();itr++)
|
||||
{
|
||||
currentComic = (ComicDB *)(*itr);
|
||||
response.write(QString("/library/%1/comic/%2:%3:%4\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize()).toUtf8());
|
||||
delete currentComic;
|
||||
}
|
||||
|
||||
Folder * currentFolder;
|
||||
for(QList<LibraryItem *>::const_iterator itr = folderContent.constBegin();itr!=folderContent.constEnd();itr++)
|
||||
{
|
||||
currentFolder = (Folder *)(*itr);
|
||||
serviceComics(library, currentFolder->id, response);
|
||||
delete currentFolder;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,23 @@
|
||||
#ifndef FOLDERINFOCONTROLLER_V2_H
|
||||
#define FOLDERINFOCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class FolderInfoControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(FolderInfoControllerV2)
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
FolderInfoControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
|
||||
private:
|
||||
void serviceComics(const int &library, const qulonglong & folderId, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // FOLDERINFOCONTROLLER_H
|
||||
@ -1,4 +1,4 @@
|
||||
#include "librariescontroller.h"
|
||||
#include "librariescontroller_v2.h"
|
||||
#include "db_helper.h" //get libraries
|
||||
#include "yacreader_libraries.h"
|
||||
#include "yacreader_http_session.h"
|
||||
@ -8,9 +8,9 @@
|
||||
|
||||
#include "QsLog.h"
|
||||
|
||||
LibrariesController::LibrariesController() {}
|
||||
LibrariesControllerV2::LibrariesControllerV2() {}
|
||||
|
||||
void LibrariesController::service(HttpRequest& request, HttpResponse& response)
|
||||
void LibrariesControllerV2::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
@ -1,10 +1,5 @@
|
||||
/**
|
||||
@file
|
||||
@author Stefan Frings
|
||||
*/
|
||||
|
||||
#ifndef FORMCONTROLLER_H
|
||||
#define FORMCONTROLLER_H
|
||||
#ifndef LIBRARIESCONTROLLER_V2_H
|
||||
#define LIBRARIESCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
@ -15,16 +10,16 @@
|
||||
*/
|
||||
|
||||
|
||||
class FormController : public HttpRequestHandler {
|
||||
class LibrariesControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(FormController);
|
||||
Q_DISABLE_COPY(LibrariesControllerV2)
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
FormController();
|
||||
LibrariesControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // FORMCONTROLLER_H
|
||||
#endif // LIBRARIESCONTROLLER_H
|
||||
@ -1,4 +1,4 @@
|
||||
#include "pagecontroller.h"
|
||||
#include "pagecontroller_v2.h"
|
||||
|
||||
#include "../static.h"
|
||||
|
||||
@ -13,9 +13,9 @@
|
||||
|
||||
#include "db_helper.h"
|
||||
|
||||
PageController::PageController() {}
|
||||
PageControllerV2::PageControllerV2() {}
|
||||
|
||||
void PageController::service(HttpRequest& request, HttpResponse& response)
|
||||
void PageControllerV2::service(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId());
|
||||
@ -28,8 +28,8 @@ void PageController::service(HttpRequest& request, HttpResponse& response)
|
||||
|
||||
QStringList pathElements = path.split('/');
|
||||
QString libraryName = DBHelper::getLibraryName(pathElements.at(2).toInt());
|
||||
qulonglong comicId = pathElements.at(4).toULongLong();
|
||||
unsigned int page = pathElements.at(6).toUInt();
|
||||
qulonglong comicId = pathElements.at(5).toULongLong();
|
||||
unsigned int page = pathElements.at(7).toUInt();
|
||||
|
||||
//qDebug("lib name : %s",pathElements.at(2).data());
|
||||
|
||||
20
YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h
Normal file
20
YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h
Normal file
@ -0,0 +1,20 @@
|
||||
#ifndef PAGECONTROLLER_V2_H
|
||||
#define PAGECONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class PageControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(PageControllerV2)
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
PageControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // PAGECONTROLLER_H
|
||||
@ -1,29 +1,29 @@
|
||||
#include "readingcomicscontroller.h"
|
||||
#include "readingcomicscontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "comic_db.h"
|
||||
|
||||
#include "yacreader_server_data_helper.h"
|
||||
|
||||
ReadingComicsController::ReadingComicsController()
|
||||
ReadingComicsControllerV2::ReadingComicsControllerV2()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ReadingComicsController::service(HttpRequest &request, HttpResponse &response)
|
||||
void ReadingComicsControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
|
||||
serviceContent(libraryId, response);
|
||||
|
||||
response.write("",true);
|
||||
}
|
||||
|
||||
void ReadingComicsController::serviceContent(const int &library, HttpResponse &response)
|
||||
void ReadingComicsControllerV2::serviceContent(const int &library, HttpResponse &response)
|
||||
{
|
||||
QList<ComicDB> readingComics = DBHelper::getReading(library);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
#ifndef READINGCOMICSCONTROLLER_H
|
||||
#define READINGCOMICSCONTROLLER_H
|
||||
#ifndef READINGCOMICSCONTROLLER_V2_H
|
||||
#define READINGCOMICSCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class ReadingComicsController : public HttpRequestHandler {
|
||||
class ReadingComicsControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(ReadingComicsController)
|
||||
Q_DISABLE_COPY(ReadingComicsControllerV2)
|
||||
public:
|
||||
ReadingComicsController();
|
||||
ReadingComicsControllerV2();
|
||||
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
|
||||
@ -1,30 +1,30 @@
|
||||
#include "readinglistcontentcontroller.h"
|
||||
#include "readinglistcontentcontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "comic_db.h"
|
||||
|
||||
#include "yacreader_server_data_helper.h"
|
||||
|
||||
ReadingListContentController::ReadingListContentController()
|
||||
ReadingListContentControllerV2::ReadingListContentControllerV2()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ReadingListContentController::service(HttpRequest &request, HttpResponse &response)
|
||||
void ReadingListContentControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
qulonglong readingListId = pathElements.at(4).toULongLong();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
qulonglong readingListId = pathElements.at(5).toULongLong();
|
||||
|
||||
serviceContent(libraryId, readingListId, response);
|
||||
|
||||
response.write("",true);
|
||||
}
|
||||
|
||||
void ReadingListContentController::serviceContent(const int &library, const qulonglong &readingListId, HttpResponse &response)
|
||||
void ReadingListContentControllerV2::serviceContent(const int &library, const qulonglong &readingListId, HttpResponse &response)
|
||||
{
|
||||
QList<ComicDB> comics = DBHelper::getReadingListFullContent(library, readingListId);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
#ifndef READINGLISTCONTENTCONTROLLER_H
|
||||
#define READINGLISTCONTENTCONTROLLER_H
|
||||
#ifndef READINGLISTCONTENTCONTROLLER_V2_H
|
||||
#define READINGLISTCONTENTCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class ReadingListContentController : public HttpRequestHandler {
|
||||
class ReadingListContentControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(ReadingListContentController)
|
||||
Q_DISABLE_COPY(ReadingListContentControllerV2)
|
||||
public:
|
||||
ReadingListContentController();
|
||||
ReadingListContentControllerV2();
|
||||
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
#include "readinglistscontroller.h"
|
||||
#include "readinglistscontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "reading_list.h"
|
||||
|
||||
ReadingListsController::ReadingListsController()
|
||||
ReadingListsControllerV2::ReadingListsControllerV2()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ReadingListsController::service(HttpRequest &request, HttpResponse &response)
|
||||
void ReadingListsControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
|
||||
serviceContent(libraryId, response);
|
||||
|
||||
response.write("",true);
|
||||
}
|
||||
|
||||
void ReadingListsController::serviceContent(const int library, HttpResponse &response)
|
||||
void ReadingListsControllerV2::serviceContent(const int library, HttpResponse &response)
|
||||
{
|
||||
QList<ReadingList> readingLists = DBHelper::getReadingLists(library);
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
#ifndef READINGLISTSCONTROLLER_H
|
||||
#define READINGLISTSCONTROLLER_H
|
||||
#ifndef READINGLISTSCONTROLLER_V2_H
|
||||
#define READINGLISTSCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class ReadingListsController : public HttpRequestHandler {
|
||||
class ReadingListsControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(ReadingListsController)
|
||||
Q_DISABLE_COPY(ReadingListsControllerV2)
|
||||
public:
|
||||
ReadingListsController();
|
||||
ReadingListsControllerV2();
|
||||
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
|
||||
64
YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
Normal file
64
YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
Normal file
@ -0,0 +1,64 @@
|
||||
#include "synccontroller_v2.h"
|
||||
|
||||
#include "QsLog.h"
|
||||
#include <QUrl>
|
||||
|
||||
#include "comic_db.h"
|
||||
#include "db_helper.h"
|
||||
|
||||
SyncControllerV2::SyncControllerV2()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
|
||||
{
|
||||
QString postData = QString::fromUtf8(request.getBody());
|
||||
|
||||
QLOG_TRACE() << "POST DATA: " << postData;
|
||||
|
||||
if(postData.length()>0) {
|
||||
QList<QString> data = postData.split("\n");
|
||||
|
||||
qulonglong libraryId;
|
||||
qulonglong comicId;
|
||||
int currentPage;
|
||||
int currentRating;
|
||||
QString hash;
|
||||
foreach(QString comicInfo, data)
|
||||
{
|
||||
QList<QString> comicInfoProgress = comicInfo.split("\t");
|
||||
|
||||
if(comicInfoProgress.length() == 4 || comicInfoProgress.length() == 5)
|
||||
{
|
||||
libraryId = comicInfoProgress.at(0).toULongLong();
|
||||
comicId = comicInfoProgress.at(1).toULongLong();
|
||||
hash = comicInfoProgress.at(2);
|
||||
currentPage = comicInfoProgress.at(3).toInt();
|
||||
|
||||
ComicInfo info;
|
||||
info.currentPage = currentPage;
|
||||
info.hash = hash; //TODO remove the hash check and add UUIDs for libraries
|
||||
info.id = comicId;
|
||||
|
||||
//Client 2.1+ version
|
||||
if(comicInfoProgress.length() > 4)
|
||||
{
|
||||
currentRating = comicInfoProgress.at(4).toInt();
|
||||
info.rating = currentRating;
|
||||
}
|
||||
|
||||
DBHelper::updateFromRemoteClient(libraryId,info);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
response.setStatus(412,"No comic info received");
|
||||
response.write("",true);
|
||||
return;
|
||||
}
|
||||
|
||||
response.write("OK",true);
|
||||
}
|
||||
|
||||
21
YACReaderLibrary/server/controllers/v2/synccontroller_v2.h
Normal file
21
YACReaderLibrary/server/controllers/v2/synccontroller_v2.h
Normal file
@ -0,0 +1,21 @@
|
||||
#ifndef SYNCCONTROLLER_V2_H
|
||||
#define SYNCCONTROLLER_V2_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class SyncControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(SyncControllerV2)
|
||||
public:
|
||||
/** Constructor */
|
||||
SyncControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // SYNCCONTROLLER_H
|
||||
@ -1,4 +1,4 @@
|
||||
#include "tagcontentcontroller.h"
|
||||
#include "tagcontentcontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "comic_db.h"
|
||||
@ -7,26 +7,26 @@
|
||||
|
||||
#include <QUrl>
|
||||
|
||||
TagContentController::TagContentController()
|
||||
TagContentControllerV2::TagContentControllerV2()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void TagContentController::service(HttpRequest &request, HttpResponse &response)
|
||||
void TagContentControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
qulonglong tagId = pathElements.at(4).toULongLong();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
qulonglong tagId = pathElements.at(5).toULongLong();
|
||||
|
||||
serviceContent(libraryId, tagId, response);
|
||||
|
||||
response.write("",true);
|
||||
}
|
||||
|
||||
void TagContentController::serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response)
|
||||
void TagContentControllerV2::serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response)
|
||||
{
|
||||
QList<ComicDB> tagComics = DBHelper::getLabelComics(library, tagId);
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
#ifndef TAGCONTENTCONTROLLER_H
|
||||
#define TAGCONTENTCONTROLLER_H
|
||||
#ifndef TAGCONTENTCONTROLLER_V2_H
|
||||
#define TAGCONTENTCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
class TagContentController : public HttpRequestHandler {
|
||||
class TagContentControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(TagContentController);
|
||||
Q_DISABLE_COPY(TagContentControllerV2)
|
||||
public:
|
||||
/** Constructor */
|
||||
TagContentController();
|
||||
TagContentControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
@ -1,4 +1,4 @@
|
||||
#include "tagscontroller.h"
|
||||
#include "tagscontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "yacreader_libraries.h"
|
||||
@ -9,15 +9,15 @@
|
||||
|
||||
#include "QsLog.h"
|
||||
|
||||
TagsController::TagsController() {}
|
||||
TagsControllerV2::TagsControllerV2() {}
|
||||
|
||||
void TagsController::service(HttpRequest& request, HttpResponse& response)
|
||||
void TagsControllerV2::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('/');
|
||||
int libraryId = pathElements.at(2).toInt();
|
||||
int libraryId = pathElements.at(3).toInt();
|
||||
|
||||
QList<Label> tags = DBHelper::getLabels(libraryId);
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef TAGSCONTROLLER_H
|
||||
#define TAGSCONTROLLER_H
|
||||
#ifndef TAGSCONTROLLER_V2_H
|
||||
#define TAGSCONTROLLER_V2_H
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
|
||||
|
||||
class TagsController : public HttpRequestHandler {
|
||||
class TagsControllerV2 : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(TagsController)
|
||||
Q_DISABLE_COPY(TagsControllerV2)
|
||||
public:
|
||||
|
||||
/** Constructor */
|
||||
TagsController();
|
||||
TagsControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
@ -0,0 +1,46 @@
|
||||
#include "updatecomiccontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "yacreader_libraries.h"
|
||||
|
||||
#include "template.h"
|
||||
#include "../static.h"
|
||||
|
||||
#include "comic_db.h"
|
||||
#include "comic.h"
|
||||
|
||||
#include "QsLog.h"
|
||||
|
||||
UpdateComicControllerV2::UpdateComicControllerV2(){}
|
||||
|
||||
void UpdateComicControllerV2::service(HttpRequest &request, HttpResponse &response)
|
||||
{
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
|
||||
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
|
||||
QStringList pathElements = path.split('/');
|
||||
qulonglong libraryId = pathElements.at(3).toULongLong();
|
||||
QString libraryName = DBHelper::getLibraryName(libraryId);
|
||||
qulonglong comicId = pathElements.at(5).toULongLong();
|
||||
|
||||
QString postData = QString::fromUtf8(request.getBody());
|
||||
|
||||
QLOG_TRACE() << "POST DATA: " << postData;
|
||||
|
||||
if(postData.length()>0) {
|
||||
QList<QString> data = postData.split("\n");
|
||||
int currentPage = data.at(0).split(":").at(1).toInt();
|
||||
ComicInfo info;
|
||||
info.currentPage = currentPage;
|
||||
info.id = comicId;
|
||||
DBHelper::updateProgress(libraryId,info);
|
||||
}
|
||||
else
|
||||
{
|
||||
response.setStatus(412,"No comic info received");
|
||||
response.write("",true);
|
||||
return;
|
||||
}
|
||||
|
||||
response.write("OK",true);
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
#ifndef UPDATECOMICCONTROLLER_V2_H
|
||||
#define UPDATECOMICCONTROLLER_V2_H
|
||||
|
||||
|
||||
#include "httprequest.h"
|
||||
#include "httpresponse.h"
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
|
||||
class UpdateComicControllerV2 : public HttpRequestHandler
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(UpdateComicControllerV2)
|
||||
|
||||
public:
|
||||
UpdateComicControllerV2();
|
||||
|
||||
/** Generates the response */
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // UPDATECOMICCONTROLLER_H
|
||||
@ -6,30 +6,36 @@
|
||||
#include "requestmapper.h"
|
||||
#include "static.h"
|
||||
#include "staticfilecontroller.h"
|
||||
#include "controllers/dumpcontroller.h"
|
||||
#include "controllers/templatecontroller.h"
|
||||
#include "controllers/formcontroller.h"
|
||||
#include "controllers/fileuploadcontroller.h"
|
||||
#include "controllers/sessioncontroller.h"
|
||||
|
||||
#include "controllers/librariescontroller.h"
|
||||
#include "controllers/foldercontroller.h"
|
||||
#include "controllers/covercontroller.h"
|
||||
#include "controllers/comiccontroller.h"
|
||||
#include "controllers/folderinfocontroller.h"
|
||||
#include "controllers/pagecontroller.h"
|
||||
#include "controllers/updatecomiccontroller.h"
|
||||
#include "controllers/errorcontroller.h"
|
||||
#include "controllers/comicdownloadinfocontroller.h"
|
||||
#include "controllers/synccontroller.h"
|
||||
#include "controllers/versioncontroller.h"
|
||||
#include "controllers/foldercontentcontroller.h"
|
||||
#include "controllers/tagscontroller.h"
|
||||
#include "controllers/tagcontentcontroller.h"
|
||||
#include "controllers/favoritescontroller.h"
|
||||
#include "controllers/readingcomicscontroller.h"
|
||||
#include "controllers/readinglistscontroller.h"
|
||||
#include "controllers/readinglistcontentcontroller.h"
|
||||
|
||||
#include "controllers/v1/librariescontroller.h"
|
||||
#include "controllers/v1/foldercontroller.h"
|
||||
#include "controllers/v1/covercontroller.h"
|
||||
#include "controllers/v1/comiccontroller.h"
|
||||
#include "controllers/v1/folderinfocontroller.h"
|
||||
#include "controllers/v1/pagecontroller.h"
|
||||
#include "controllers/v1/updatecomiccontroller.h"
|
||||
#include "controllers/v1/errorcontroller.h"
|
||||
#include "controllers/v1/comicdownloadinfocontroller.h"
|
||||
#include "controllers/v1/synccontroller.h"
|
||||
|
||||
#include "controllers/v2/librariescontroller_v2.h"
|
||||
#include "controllers/v2/covercontroller_v2.h"
|
||||
#include "controllers/v2/comiccontroller_v2.h"
|
||||
#include "controllers/v2/folderinfocontroller_v2.h"
|
||||
#include "controllers/v2/pagecontroller_v2.h"
|
||||
#include "controllers/v2/updatecomiccontroller_v2.h"
|
||||
#include "controllers/v2/errorcontroller_v2.h"
|
||||
#include "controllers/v2/comicdownloadinfocontroller_v2.h"
|
||||
#include "controllers/v2/synccontroller_v2.h"
|
||||
#include "controllers/v2/foldercontentcontroller_v2.h"
|
||||
#include "controllers/v2/tagscontroller_v2.h"
|
||||
#include "controllers/v2/tagcontentcontroller_v2.h"
|
||||
#include "controllers/v2/favoritescontroller_v2.h"
|
||||
#include "controllers/v2/readingcomicscontroller_v2.h"
|
||||
#include "controllers/v2/readinglistscontroller_v2.h"
|
||||
#include "controllers/v2/readinglistcontentcontroller_v2.h"
|
||||
|
||||
#include "db_helper.h"
|
||||
#include "yacreader_libraries.h"
|
||||
@ -111,6 +117,20 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
|
||||
QByteArray path=request.getPath();
|
||||
qDebug("RequestMapper: path=%s",path.data());
|
||||
|
||||
if (path.startsWith("/v2"))
|
||||
{
|
||||
serviceV2(request, response);
|
||||
}
|
||||
else
|
||||
{
|
||||
serviceV1(request, response);
|
||||
}
|
||||
}
|
||||
|
||||
void RequestMapper::serviceV1(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
QByteArray path=request.getPath();
|
||||
|
||||
QRegExp folder("/library/.+/folder/[0-9]+/?");//get comic content
|
||||
QRegExp folderInfo("/library/.+/folder/[0-9]+/info/?"); //get folder info
|
||||
QRegExp comicDownloadInfo("/library/.+/comic/[0-9]+/?"); //get comic info (basic/download info)
|
||||
@ -121,14 +141,6 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
|
||||
QRegExp cover("/library/.+/cover/[0-9a-f]+.jpg"); //get comic cover (navigation)
|
||||
QRegExp comicPage("/library/.+/comic/[0-9]+/page/[0-9]+/?"); //get comic page
|
||||
QRegExp comicPageRemote("/library/.+/comic/[0-9]+/page/[0-9]+/remote?"); //get comic page (remote reading)
|
||||
QRegExp serverVersion("/version/?");
|
||||
QRegExp folderContent("/library/.+/folder/[0-9]+/content/?");
|
||||
QRegExp favs("/library/.+/favs/?");
|
||||
QRegExp reading("/library/.+/reading/?");
|
||||
QRegExp tags("/library/.+/tags/?");
|
||||
QRegExp tagContent("/library/.+/tag/[0-9]+/content/?");
|
||||
QRegExp readingLists("/library/.+/reading_lists/?");
|
||||
QRegExp readingListContent("/library/.+/reading_list/[0-9]+/content/?");
|
||||
|
||||
QRegExp sync("/sync");
|
||||
|
||||
@ -146,14 +158,8 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
|
||||
}
|
||||
else
|
||||
{
|
||||
if(serverVersion.exactMatch(path))
|
||||
{
|
||||
VersionController().service(request, response);
|
||||
}
|
||||
else if(sync.exactMatch(path))
|
||||
{
|
||||
if(sync.exactMatch(path))
|
||||
SyncController().service(request, response);
|
||||
}
|
||||
else
|
||||
{
|
||||
//se comprueba que la sesión sea la correcta con el fin de evitar accesos no autorizados
|
||||
@ -191,34 +197,6 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
|
||||
{
|
||||
UpdateComicController().service(request, response);
|
||||
}
|
||||
else if(folderContent.exactMatch(path))
|
||||
{
|
||||
FolderContentController().service(request, response);
|
||||
}
|
||||
else if(tags.exactMatch(path))
|
||||
{
|
||||
TagsController().service(request, response);
|
||||
}
|
||||
else if(tagContent.exactMatch(path))
|
||||
{
|
||||
TagContentController().service(request, response);
|
||||
}
|
||||
else if(favs.exactMatch(path))
|
||||
{
|
||||
FavoritesController().service(request, response);
|
||||
}
|
||||
else if(reading.exactMatch(path))
|
||||
{
|
||||
ReadingComicsController().service(request, response);
|
||||
}
|
||||
else if(readingLists.exactMatch(path))
|
||||
{
|
||||
ReadingListsController().service(request, response);
|
||||
}
|
||||
else if(readingListContent.exactMatch(path))
|
||||
{
|
||||
ReadingListContentController().service(request, response);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -233,3 +211,124 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void RequestMapper::serviceV2(HttpRequest& request, HttpResponse& response)
|
||||
{
|
||||
QByteArray path=request.getPath();
|
||||
|
||||
QRegExp folderInfo("/v2/library/.+/folder/[0-9]+/info/?"); //get folder info
|
||||
QRegExp comicDownloadInfo("/v2/library/.+/comic/[0-9]+/?"); //get comic info (basic/download info)
|
||||
QRegExp comicFullInfo("/v2/library/.+/comic/[0-9]+/info/?"); //get comic info (full info)
|
||||
QRegExp comicOpen("/v2/library/.+/comic/[0-9]+/remote/?"); //the server will open for reading the comic
|
||||
QRegExp comicUpdate("/v2/library/.+/comic/[0-9]+/update/?"); //get comic info
|
||||
QRegExp comicClose("/v2/library/.+/comic/[0-9]+/close/?"); //the server will close the comic and free memory
|
||||
QRegExp cover("/v2/library/.+/cover/[0-9a-f]+.jpg"); //get comic cover (navigation)
|
||||
QRegExp comicPage("/v2/library/.+/comic/[0-9]+/page/[0-9]+/?"); //get comic page
|
||||
QRegExp comicPageRemote("/v2/library/.+/comic/[0-9]+/page/[0-9]+/remote?"); //get comic page (remote reading)
|
||||
QRegExp serverVersion("/v2/version/?");
|
||||
QRegExp folderContent("/v2/library/.+/folder/[0-9]+/content/?");
|
||||
QRegExp favs("/v2/library/.+/favs/?");
|
||||
QRegExp reading("/v2/library/.+/reading/?");
|
||||
QRegExp tags("/v2/library/.+/tags/?");
|
||||
QRegExp tagContent("/v2/library/.+/tag/[0-9]+/content/?");
|
||||
QRegExp readingLists("/v2/library/.+/reading_lists/?");
|
||||
QRegExp readingListContent("/v2/library/.+/reading_list/[0-9]+/content/?");
|
||||
|
||||
QRegExp sync("/v2/sync");
|
||||
|
||||
QRegExp library("/v2/library/([0-9]+)/.+"); //permite verificar que la biblioteca solicitada existe
|
||||
|
||||
path = QUrl::fromPercentEncoding(path).toUtf8();
|
||||
|
||||
if(!sync.exactMatch(path)) //no session is needed for syncback info, until security will be added
|
||||
loadSession(request, response);
|
||||
|
||||
//primera petición, se ha hecho un post, se sirven las bibliotecas si la seguridad mediante login no está habilitada
|
||||
if(path == "/v2/libraries") //Don't send data to the server using '/' !!!!
|
||||
{
|
||||
LibrariesControllerV2().service(request, response);
|
||||
}
|
||||
else
|
||||
{
|
||||
if(serverVersion.exactMatch(path))
|
||||
{
|
||||
VersionController().service(request, response);
|
||||
}
|
||||
else if(sync.exactMatch(path))
|
||||
{
|
||||
SyncControllerV2().service(request, response);
|
||||
}
|
||||
else
|
||||
{
|
||||
//se comprueba que la sesión sea la correcta con el fin de evitar accesos no autorizados
|
||||
HttpSession session=Static::sessionStore->getSession(request,response,false);
|
||||
if(!session.isNull() && session.contains("ySession"))
|
||||
{
|
||||
if(library.indexIn(path)!=-1 && DBHelper::getLibraries().contains(library.cap(1).toInt()) )
|
||||
{
|
||||
if (folderInfo.exactMatch(path))
|
||||
{
|
||||
FolderInfoControllerV2().service(request, response);
|
||||
}
|
||||
else if(cover.exactMatch(path))
|
||||
{
|
||||
CoverControllerV2().service(request, response);
|
||||
}
|
||||
else if(comicDownloadInfo.exactMatch(path))
|
||||
{
|
||||
ComicDownloadInfoControllerV2().service(request, response);
|
||||
}
|
||||
else if(comicFullInfo.exactMatch(path) || comicOpen.exactMatch(path))//start download or start remote reading
|
||||
{
|
||||
ComicControllerV2().service(request, response);
|
||||
}
|
||||
else if(comicPage.exactMatch(path) || comicPageRemote.exactMatch(path))
|
||||
{
|
||||
PageControllerV2().service(request,response);
|
||||
}
|
||||
else if(comicUpdate.exactMatch(path))
|
||||
{
|
||||
UpdateComicControllerV2().service(request, response);
|
||||
}
|
||||
else if(folderContent.exactMatch(path))
|
||||
{
|
||||
FolderContentControllerV2().service(request, response);
|
||||
}
|
||||
else if(tags.exactMatch(path))
|
||||
{
|
||||
TagsControllerV2().service(request, response);
|
||||
}
|
||||
else if(tagContent.exactMatch(path))
|
||||
{
|
||||
TagContentControllerV2().service(request, response);
|
||||
}
|
||||
else if(favs.exactMatch(path))
|
||||
{
|
||||
FavoritesControllerV2().service(request, response);
|
||||
}
|
||||
else if(reading.exactMatch(path))
|
||||
{
|
||||
ReadingComicsControllerV2().service(request, response);
|
||||
}
|
||||
else if(readingLists.exactMatch(path))
|
||||
{
|
||||
ReadingListsControllerV2().service(request, response);
|
||||
}
|
||||
else if(readingListContent.exactMatch(path))
|
||||
{
|
||||
ReadingListContentControllerV2().service(request, response);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//response.writeText(library.cap(1));
|
||||
Static::staticFileController->service(request, response);
|
||||
}
|
||||
}
|
||||
else //acceso no autorizado, redirección
|
||||
{
|
||||
ErrorControllerV2(300).service(request,response);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,30 +8,20 @@
|
||||
|
||||
#include "httprequesthandler.h"
|
||||
|
||||
/**
|
||||
The request mapper dispatches incoming HTTP requests to controller classes
|
||||
depending on the requested path.
|
||||
*/
|
||||
|
||||
|
||||
class RequestMapper : public HttpRequestHandler {
|
||||
Q_OBJECT
|
||||
Q_DISABLE_COPY(RequestMapper)
|
||||
public:
|
||||
|
||||
/**
|
||||
Constructor.
|
||||
@param parent Parent object
|
||||
*/
|
||||
RequestMapper(QObject* parent=0);
|
||||
|
||||
/**
|
||||
Dispatch a request to a controller.
|
||||
@param request The received HTTP request
|
||||
@param response Must be used to return the response
|
||||
*/
|
||||
void service(HttpRequest& request, HttpResponse& response);
|
||||
void loadSession(HttpRequest & request, HttpResponse& response);
|
||||
|
||||
private:
|
||||
void serviceV1(HttpRequest& request, HttpResponse& response);
|
||||
void serviceV2(HttpRequest& request, HttpResponse& response);
|
||||
};
|
||||
|
||||
#endif // REQUESTMAPPER_H
|
||||
|
||||
@ -1,64 +1,92 @@
|
||||
INCLUDEPATH += $$PWD
|
||||
DEPENDPATH += $$PWD
|
||||
|
||||
HEADERS += \
|
||||
$$PWD/static.h \
|
||||
$$PWD/startup.h \
|
||||
$$PWD/requestmapper.h \
|
||||
$$PWD/controllers/comiccontroller.h \
|
||||
$$PWD/controllers/errorcontroller.h \
|
||||
$$PWD/controllers/foldercontroller.h \
|
||||
$$PWD/controllers/folderinfocontroller.h \
|
||||
$$PWD/controllers/librariescontroller.h \
|
||||
$$PWD/controllers/pagecontroller.h \
|
||||
$$PWD/controllers/sessionmanager.h \
|
||||
$$PWD/controllers/covercontroller.h \
|
||||
$$PWD/controllers/updatecomiccontroller.h \
|
||||
$$PWD/controllers/comicdownloadinfocontroller.h \
|
||||
$$PWD/controllers/synccontroller.h \
|
||||
#v2
|
||||
$$PWD/controllers/versioncontroller.h \
|
||||
$$PWD/controllers/foldercontentcontroller.h \
|
||||
$$PWD/controllers/tagscontroller.h \
|
||||
$$PWD/yacreader_http_session.h \
|
||||
$$PWD/yacreader_http_session_store.h \
|
||||
$$PWD/controllers/tagcontentcontroller.h \
|
||||
$$PWD/yacreader_server_data_helper.h \
|
||||
$$PWD/controllers/favoritescontroller.h \
|
||||
$$PWD/controllers/readingcomicscontroller.h \
|
||||
$$PWD/controllers/readinglistscontroller.h \
|
||||
$$PWD/controllers/readinglistcontentcontroller.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/static.cpp \
|
||||
$$PWD/startup.cpp \
|
||||
$$PWD/requestmapper.cpp \
|
||||
$$PWD/controllers/comiccontroller.cpp \
|
||||
$$PWD/controllers/errorcontroller.cpp \
|
||||
$$PWD/controllers/foldercontroller.cpp \
|
||||
$$PWD/controllers/folderinfocontroller.cpp \
|
||||
$$PWD/controllers/librariescontroller.cpp \
|
||||
$$PWD/controllers/pagecontroller.cpp \
|
||||
$$PWD/controllers/sessionmanager.cpp \
|
||||
$$PWD/controllers/covercontroller.cpp \
|
||||
$$PWD/controllers/updatecomiccontroller.cpp \
|
||||
$$PWD/controllers/comicdownloadinfocontroller.cpp \
|
||||
$$PWD/controllers/synccontroller.cpp \
|
||||
#v2
|
||||
$$PWD/controllers/versioncontroller.cpp \
|
||||
$$PWD/controllers/foldercontentcontroller.cpp \
|
||||
$$PWD/controllers/tagscontroller.cpp \
|
||||
$$PWD/yacreader_http_session.cpp \
|
||||
$$PWD/yacreader_http_session_store.cpp \
|
||||
$$PWD/controllers/tagcontentcontroller.cpp \
|
||||
$$PWD/yacreader_server_data_helper.cpp \
|
||||
$$PWD/controllers/favoritescontroller.cpp \
|
||||
$$PWD/controllers/readingcomicscontroller.cpp \
|
||||
$$PWD/controllers/readinglistscontroller.cpp \
|
||||
$$PWD/controllers/readinglistcontentcontroller.cpp
|
||||
|
||||
include(lib/logging/logging.pri)
|
||||
include(lib/httpserver/httpserver.pri)
|
||||
include(lib/templateengine/templateengine.pri)
|
||||
|
||||
DEFINES += SERVER_VERSION_NUMBER=\\\"2.0\\\"
|
||||
INCLUDEPATH += $$PWD
|
||||
INCLUDEPATH += $$PWD/controllers
|
||||
INCLUDEPATH += $$PWD/controllers/v1
|
||||
INCLUDEPATH += $$PWD/controllers/v2
|
||||
DEPENDPATH += $$PWD
|
||||
DEPENDPATH += $$PWD/controllers
|
||||
DEPENDPATH += $$PWD/controllers/v1
|
||||
DEPENDPATH += $$PWD/controllers/v2
|
||||
|
||||
|
||||
HEADERS += \
|
||||
$$PWD/static.h \
|
||||
$$PWD/startup.h \
|
||||
$$PWD/requestmapper.h \
|
||||
$$PWD/yacreader_http_session.h \
|
||||
$$PWD/yacreader_http_session_store.h \
|
||||
$$PWD/yacreader_server_data_helper.h \
|
||||
$$PWD/controllers/versioncontroller.h \
|
||||
#v1
|
||||
$$PWD/controllers/v1/comiccontroller.h \
|
||||
$$PWD/controllers/v1/errorcontroller.h \
|
||||
$$PWD/controllers/v1/foldercontroller.h \
|
||||
$$PWD/controllers/v1/folderinfocontroller.h \
|
||||
$$PWD/controllers/v1/librariescontroller.h \
|
||||
$$PWD/controllers/v1/pagecontroller.h \
|
||||
$$PWD/controllers/v1/covercontroller.h \
|
||||
$$PWD/controllers/v1/updatecomiccontroller.h \
|
||||
$$PWD/controllers/v1/comicdownloadinfocontroller.h \
|
||||
$$PWD/controllers/v1/synccontroller.h \
|
||||
#v2
|
||||
$$PWD/controllers/v2/comiccontroller_v2.h \
|
||||
$$PWD/controllers/v2/errorcontroller_v2.h \
|
||||
$$PWD/controllers/v2/folderinfocontroller_v2.h \
|
||||
$$PWD/controllers/v2/librariescontroller_v2.h \
|
||||
$$PWD/controllers/v2/pagecontroller_v2.h \
|
||||
$$PWD/controllers/v2/covercontroller_v2.h \
|
||||
$$PWD/controllers/v2/updatecomiccontroller_v2.h \
|
||||
$$PWD/controllers/v2/comicdownloadinfocontroller_v2.h \
|
||||
$$PWD/controllers/v2/synccontroller_v2.h \
|
||||
$$PWD/controllers/v2/foldercontentcontroller_v2.h \
|
||||
$$PWD/controllers/v2/tagscontroller_v2.h \
|
||||
$$PWD/controllers/v2/tagcontentcontroller_v2.h \
|
||||
$$PWD/controllers/v2/favoritescontroller_v2.h \
|
||||
$$PWD/controllers/v2/readingcomicscontroller_v2.h \
|
||||
$$PWD/controllers/v2/readinglistscontroller_v2.h \
|
||||
$$PWD/controllers/v2/readinglistcontentcontroller_v2.h
|
||||
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/static.cpp \
|
||||
$$PWD/startup.cpp \
|
||||
$$PWD/requestmapper.cpp \
|
||||
$$PWD/yacreader_http_session.cpp \
|
||||
$$PWD/yacreader_http_session_store.cpp \
|
||||
$$PWD/yacreader_server_data_helper.cpp \
|
||||
$$PWD/controllers/versioncontroller.cpp \
|
||||
#v1
|
||||
$$PWD/controllers/v1/comiccontroller.cpp \
|
||||
$$PWD/controllers/v1/errorcontroller.cpp \
|
||||
$$PWD/controllers/v1/foldercontroller.cpp \
|
||||
$$PWD/controllers/v1/folderinfocontroller.cpp \
|
||||
$$PWD/controllers/v1/librariescontroller.cpp \
|
||||
$$PWD/controllers/v1/pagecontroller.cpp \
|
||||
$$PWD/controllers/v1/covercontroller.cpp \
|
||||
$$PWD/controllers/v1/updatecomiccontroller.cpp \
|
||||
$$PWD/controllers/v1/comicdownloadinfocontroller.cpp \
|
||||
$$PWD/controllers/v1/synccontroller.cpp \
|
||||
#v2
|
||||
$$PWD/controllers/v2/comiccontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/errorcontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/folderinfocontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/librariescontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/pagecontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/covercontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/updatecomiccontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/comicdownloadinfocontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/synccontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/foldercontentcontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/tagscontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/tagcontentcontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/favoritescontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/readingcomicscontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/readinglistscontroller_v2.cpp \
|
||||
$$PWD/controllers/v2/readinglistcontentcontroller_v2.cpp
|
||||
|
||||
|
||||
include(lib/logging/logging.pri)
|
||||
include(lib/httpserver/httpserver.pri)
|
||||
include(lib/templateengine/templateengine.pri)
|
||||
|
||||
|
||||
DEFINES += SERVER_VERSION_NUMBER=\\\"2.0\\\"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user