mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 04:54:29 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Luis Ángel San Martín
2017-08-26 16:54:10 +02:00
parent 8b20014cc8
commit f149f314e0
105 changed files with 4145 additions and 2089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
YACReaderLibrary/server/controllers/pagecontroller.cpp
View File

@ -4,6 +4,8 @@
#include "comic.h"
#include "comiccontroller.h"
#include "yacreader_http_session.h"
#include <QDataStream>
#include <QPointer>
@ -16,6 +18,7 @@ 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");
@ -35,14 +38,14 @@ void PageController::service(HttpRequest& request, HttpResponse& response)
if(remote)
{
QLOG_TRACE() << "se recupera comic remoto para servir páginas";
comicFile = session.getCurrentRemoteComic();
currentComicId = session.getCurrentRemoteComicId();
comicFile = ySession->getCurrentRemoteComic();
currentComicId = ySession->getCurrentRemoteComicId();
}
else
{
QLOG_TRACE() << "se recupera comic para servir páginas";
comicFile = session.getCurrentComic();
currentComicId = session.getCurrentComicId();
comicFile = ySession->getCurrentComic();
currentComicId = ySession->getCurrentComicId();
}
if(currentComicId != 0 && !QPointer<Comic>(comicFile).isNull())
@ -77,9 +80,9 @@ void PageController::service(HttpRequest& request, HttpResponse& response)
{
//delete comicFile;
if(remote)
session.dismissCurrentRemoteComic();
ySession->dismissCurrentRemoteComic();
else
session.dismissCurrentComic();
ySession->dismissCurrentComic();
}
response.setStatus(404,"not found"); //TODO qué mensaje enviar
response.write("404 not found",true);