controlador de p?ginas

corregido bug relacionado con los datos de sesi?n (delete comic)
This commit is contained in:
Luis Ángel San Martín
2012-09-09 14:30:17 +02:00
parent b0cfaaf13c
commit a39cc616f6
9 changed files with 83 additions and 10 deletions

View File

@ -41,7 +41,7 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
}
else
{
delete comicFile;
//delete comicFile;
response.setStatus(404,"not found");
response.write("404 not found",true);
}

View File

@ -0,0 +1,39 @@
#include "pagecontroller.h"
#include "../static.h"
#include "comic.h"
PageController::PageController() {}
void PageController::service(HttpRequest& request, HttpResponse& response)
{
HttpSession session=Static::sessionStore->getSession(request,response);
QStringList pathElements = ((QString)request.getPath()).split('/');
QString libraryName = pathElements.at(2);
qulonglong comicId = pathElements.at(4).toULongLong();
quint16 page = pathElements.at(6).toUInt();
Comic * comicFile = session.getCurrentComic();
if((comicFile != 0) && comicId == session.getCurrentComicId())
{
response.setHeader("Content-Type", "image/page");
QByteArray pageData = comicFile->getRawPage(page);
response.write(pageData);
}
else
{
delete comicFile;
response.setStatus(404,"not found");
response.write("404 not found",true);
}
//response.write(t.toLatin1(),true);
}

View File

@ -0,0 +1,20 @@
#ifndef PAGECONTROLLER_H
#define PAGECONTROLLER_H
#include "httprequest.h"
#include "httpresponse.h"
#include "httprequesthandler.h"
class PageController : public HttpRequestHandler {
Q_OBJECT
Q_DISABLE_COPY(PageController);
public:
/** Constructor */
PageController();
/** Generates the response */
void service(HttpRequest& request, HttpResponse& response);
};
#endif // PAGECONTROLLER_H

View File

@ -12,6 +12,7 @@
HttpSession::HttpSession(bool canStore) {
if (canStore) {
dataPtr=new HttpSessionData();
dataPtr->yacreaderSessionData.comic = 0;
dataPtr->refCount=1;
dataPtr->lastAccess=QDateTime::currentMSecsSinceEpoch();
dataPtr->id=QUuid::createUuid().toString().toAscii();

View File

@ -17,6 +17,7 @@
#include "controllers/covercontroller.h"
#include "controllers/comiccontroller.h"
#include "controllers/folderinfocontroller.h"
#include "controllers/pagecontroller.h"
RequestMapper::RequestMapper(QObject* parent)
:HttpRequestHandler(parent) {}
@ -50,7 +51,7 @@ void RequestMapper::service(HttpRequest& request, HttpResponse& response) {
}
else if(path.contains("page"))
{
PageController().service(request,response);
}
else
{

View File

@ -53,7 +53,8 @@ QString Static::getConfigDir() {
foreach (QString dir, searchList) {
qWarning("%s/%s not found",qPrintable(dir),qPrintable(configFileName));
}
qFatal("Cannot find config file %s",qPrintable(configFileName));
qWarning("Cannot find config file %s",qPrintable(configFileName)); //TODO establecer los valores por defecto
return 0;
}