Merge

YACReaderLibrary/server/controllers/comiccontroller.cpp

@@ -2,6 +2,7 @@
 
 #include "db_helper.h"
 #include "yacreader_libraries.h"
+#include "yacreader_http_session.h"
 
 #include "template.h"
 #include "../static.h"
@@ -18,6 +19,7 @@ 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('/');
@@ -44,7 +46,7 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
     ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
 
     if(!remoteComic)
-        session.setDownloadedComic(comic.info.hash);
+        ySession->setDownloadedComic(comic.info.hash);
 
     Comic * comicFile = FactoryComic::newComic(libraries.getPath(libraryId)+comic.path);
 
@@ -70,19 +72,19 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
         if(remoteComic)
         {
             QLOG_TRACE() << "remote comic requested";
-            session.setCurrentRemoteComic(comic.id, comicFile);
+            ySession->setCurrentRemoteComic(comic.id, comicFile);
 
         }
         else
         {
             QLOG_TRACE() << "comic requested";
-            session.setCurrentComic(comic.id, comicFile);
+            ySession->setCurrentComic(comic.id, comicFile);
         }
 
-        response.setHeader("Content-Type", "plain/text; charset=utf-8");
+        response.setHeader("Content-Type", "text/plain; charset=utf-8");
 		//TODO this field is not used by the client!
-		response.writeText(QString("library:%1\r\n").arg(libraryName));
-        response.writeText(QString("libraryId:%1\r\n").arg(libraryId));
+        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);
@@ -99,9 +101,9 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
             if(found)
             {
                 if(i>0)
-                    response.writeText(QString("previousComic:%1\r\n").arg(siblings.at(i-1)->id));
+                    response.write(QString("previousComic:%1\r\n").arg(siblings.at(i-1)->id).toUtf8());
                 if(i<siblings.length()-1)
-                    response.writeText(QString("nextComic:%1\r\n").arg(siblings.at(i+1)->id));
+                    response.write(QString("nextComic:%1\r\n").arg(siblings.at(i+1)->id).toUtf8());
             }
             else
             {
@@ -109,7 +111,7 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
             }
             qDeleteAll(siblings);
         }
-        response.writeText(comic.toTXT(),true);
+        response.write(comic.toTXT().toUtf8(),true);
 	}
 	else
 	{

YACReaderLibrary/server/controllers/comicdownloadinfocontroller.cpp

@@ -10,7 +10,7 @@ ComicDownloadInfoController::ComicDownloadInfoController() {}
 
 void ComicDownloadInfoController::service(HttpRequest& request, HttpResponse& response)
 {
-    response.setHeader("Content-Type", "plain/text; charset=utf-8");
+    response.setHeader("Content-Type", "text/plain; charset=utf-8");
 
     QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
     QStringList pathElements = path.split('/');
@@ -21,6 +21,6 @@ void ComicDownloadInfoController::service(HttpRequest& request, HttpResponse& re
     ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
 
     //TODO: check if the comic wasn't found;
-    response.writeText(QString("fileName:%1\r\n").arg(comic.getFileName()));
-    response.writeText(QString("fileSize:%1\r\n").arg(comic.getFileSize()),true);
+    response.write(QString("fileName:%1\r\n").arg(comic.getFileName()).toUtf8());
+    response.write(QString("fileSize:%1\r\n").arg(comic.getFileSize()).toUtf8(),true);
 }

YACReaderLibrary/server/controllers/covercontroller.cpp

@@ -1,6 +1,7 @@
 #include "covercontroller.h"
 #include "db_helper.h"  //get libraries
 #include "yacreader_libraries.h"
+#include "yacreader_http_session.h"
 
 #include "template.h"
 #include "../static.h"
@@ -9,8 +10,8 @@ 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");
@@ -47,7 +48,7 @@ void CoverController::service(HttpRequest& request, HttpResponse& response)
 	if (!img.isNull()) {
 
         int width = 80, height = 120;
-        if(session.getDisplayType()=="@2x")
+        if(ySession->getDisplayType()=="@2x")
         {
 			width = 160;
             height = 240;
@@ -66,7 +67,7 @@ void CoverController::service(HttpRequest& request, HttpResponse& response)
 
         if(folderCover)
         {
-             if(session.getDisplayType()=="@2x")
+             if(ySession->getDisplayType()=="@2x")
                 p.drawImage(0,0,QImage(":/images/f_overlayed_retina.png"));
              else
                 p.drawImage(0,0,QImage(":/images/f_overlayed.png"));

YACReaderLibrary/server/controllers/favoritescontroller.cpp

@@ -0,0 +1,33 @@
+#include "favoritescontroller.h"
+
+#include "db_helper.h"
+#include "comic_db.h"
+
+#include "yacreader_server_data_helper.h"
+
+FavoritesController::FavoritesController() {}
+
+void FavoritesController::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();
+
+    serviceContent(libraryId, response);
+
+    response.write("",true);
+}
+
+void FavoritesController::serviceContent(const int library, HttpResponse &response)
+{
+    QList<ComicDB> tagComics = DBHelper::getFavorites(library);
+
+    for(const ComicDB &comic : tagComics)
+    {
+        response.write(YACReaderServerDataHelper::comicToYSFormat(library, comic).toUtf8());
+    }
+}
+
+

YACReaderLibrary/server/controllers/favoritescontroller.h

@@ -0,0 +1,21 @@
+#ifndef FAVORITESCONTROLLER_H
+#define FAVORITESCONTROLLER_H
+
+#include "httprequest.h"
+#include "httpresponse.h"
+#include "httprequesthandler.h"
+
+class FavoritesController : public HttpRequestHandler {
+    Q_OBJECT
+    Q_DISABLE_COPY(FavoritesController)
+public:
+    FavoritesController();
+
+    void service(HttpRequest& request, HttpResponse& response);
+
+private:
+    void serviceContent(const int library, HttpResponse &response);
+};
+
+
+#endif // FAVORITESCONTROLLER_H

YACReaderLibrary/server/controllers/foldercontentcontroller.cpp

@@ -0,0 +1,72 @@
+#include "foldercontentcontroller.h"
+
+#include <QUrl>
+
+#include "db_helper.h"
+#include "comic_db.h"
+#include "folder.h"
+
+#include "yacreader_server_data_helper.h"
+
+#include "qnaturalsorting.h"
+
+#include <ctime>
+using namespace std;
+
+struct LibraryItemSorter
+{
+    bool operator()(const LibraryItem * a,const LibraryItem * b) const
+    {
+        return naturalSortLessThanCI(a->name,b->name);
+    }
+};
+
+FolderContentController::FolderContentController() {}
+
+void FolderContentController::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();
+
+    serviceContent(libraryId, parentId, response);
+
+    response.write("",true);
+}
+
+void FolderContentController::serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response)
+{
+    //clock_t begin = clock();
+
+    QList<LibraryItem *> folderContent = DBHelper::getFolderSubfoldersFromLibrary(library,folderId);
+    QList<LibraryItem *> folderComics = DBHelper::getFolderComicsFromLibrary(library,folderId);
+
+    folderContent.append(folderComics);
+    qSort(folderContent.begin(),folderContent.end(),LibraryItemSorter());
+
+    folderComics.clear();
+
+    ComicDB * currentComic;
+    Folder * currentFolder;
+    for(QList<LibraryItem *>::const_iterator itr = folderContent.constBegin();itr!=folderContent.constEnd();itr++)
+    {
+        if((*itr)->isDir())
+        {
+            currentFolder = (Folder *)(*itr);
+            response.write(YACReaderServerDataHelper::folderToYSFormat(library, *currentFolder).toUtf8());
+        }
+        else
+        {
+            currentComic = (ComicDB *)(*itr);
+            response.write(YACReaderServerDataHelper::comicToYSFormat(library, *currentComic).toUtf8());
+        }
+    }
+
+    /*clock_t end = clock();
+    double msecs = double(end - begin);
+
+    response.write(QString("%1ms").arg(msecs).toUtf8());*/
+}

YACReaderLibrary/server/controllers/foldercontentcontroller.h

@@ -0,0 +1,22 @@
+#ifndef FOLDERCONTENTCONTROLLER_H
+#define FOLDERCONTENTCONTROLLER_H
+
+#include "httprequest.h"
+#include "httpresponse.h"
+#include "httprequesthandler.h"
+
+class FolderContentController : public HttpRequestHandler {
+	Q_OBJECT
+    Q_DISABLE_COPY(FolderContentController);
+public:
+	/** Constructor */
+    FolderContentController();
+
+	/** Generates the response */
+	void service(HttpRequest& request, HttpResponse& response);
+
+private:
+    void serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response);
+};
+
+#endif // FOLDERCONTENTCONTROLLER_H

YACReaderLibrary/server/controllers/foldercontroller.cpp

@@ -11,6 +11,8 @@
 
 #include "qnaturalsorting.h"
 
+#include "yacreader_http_session.h"
+
 #include "QsLog.h"
 
 struct LibraryItemSorter
@@ -26,6 +28,7 @@ FolderController::FolderController() {}
 void FolderController::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");
@@ -33,7 +36,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_"+session.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('/');
@@ -85,17 +88,17 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
 
     if(folderId == 1)
     {
-        session.clearNavigationPath();
-        session.pushNavigationItem(QPair<qulonglong,quint32>(folderId,page));
+        ySession->clearNavigationPath();
+        ySession->pushNavigationItem(QPair<qulonglong,quint32>(folderId,page));
         t.setVariable(QString("upurl"),"/");
     }
     else
     {
         if(fromUp)
-            session.popNavigationItem();
+            ySession->popNavigationItem();
         else //drill down or direct access
         {
-            QStack<QPair<qulonglong, quint32> > path = session.getNavigationPath();
+            QStack<QPair<qulonglong, quint32> > path = ySession->getNavigationPath();
             bool found=false;
             for(QStack<QPair<qulonglong, quint32> >::const_iterator itr = path.begin(); itr!=path.end(); itr++)
                 if(itr->first == folderId)
@@ -106,16 +109,16 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
 
             if(found)
             {
-                while(session.topNavigationItem().first != folderId)
-                    session.popNavigationItem();
+                while(ySession->topNavigationItem().first != folderId)
+                    ySession->popNavigationItem();
 
-                session.updateTopItem(QPair<qulonglong,quint32>(folderId,page));
+                ySession->updateTopItem(QPair<qulonglong,quint32>(folderId,page));
             }
             else
-                session.pushNavigationItem(QPair<qulonglong,quint32>(folderId,page));
+                ySession->pushNavigationItem(QPair<qulonglong,quint32>(folderId,page));
         }
 
-        QStack<QPair<qulonglong, quint32> > path = session.getNavigationPath();
+        QStack<QPair<qulonglong, quint32> > path = ySession->getNavigationPath();
         if(path.count()>1)
         {
             QPair<qulonglong, quint32> parentItem = path.at(path.count()-2);
@@ -146,7 +149,7 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
 	int numFoldersAtCurrentPage = qMax(0,qMin(numFolders - indexCurrentPage, elementsPerPage));
 
     //PATH
-    QStack<QPair<qulonglong,quint32> > foldersPath = session.getNavigationPath();
+    QStack<QPair<qulonglong,quint32> > foldersPath = ySession->getNavigationPath();
     t.setVariable(QString("library.name"),libraryName);
     t.setVariable(QString("library.url"),QString("/library/%1/folder/1").arg(libraryId));
     t.loop("path",foldersPath.count()-1);
@@ -167,11 +170,11 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
             {
                 t.setVariable(QString("element%1.class").arg(i),"folder");
 
-                QList<LibraryItem *> children = DBHelper::getFolderComicsFromLibrary(libraryId, item->id);
-                if(children.length()>0)
+                const Folder * folder = static_cast<Folder*>(item);
+
+                if(folder->getFirstChildHash().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));
+                    t.setVariable(QString("element%1.image.url").arg(i),QString("/library/%1/cover/%2.jpg?folderCover=true").arg(libraryId).arg(folder->getFirstChildHash()));
                 }
                 else
                     t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png");
@@ -195,9 +198,9 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
                 const ComicDB * comic = (ComicDB *)item;
                 t.setVariable(QString("element%1.browse").arg(i),"");
                 //t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/comic/"+QString("%1").arg(comic->id));
-                if(!session.isComicOnDevice(comic->info.hash) && !session.isComicDownloaded(comic->info.hash))
+                if(!ySession->isComicOnDevice(comic->info.hash) && !ySession->isComicDownloaded(comic->info.hash))
                     t.setVariable(QString("element%1.download").arg(i),QString("<a onclick=\"this.innerHTML='IMPORTING';this.className='importedButton';\" class =\"importButton\" href=\"%1\">IMPORT</a>").arg("/library/"+QString::number(libraryId)+"/comic/"+QString("%1").arg(comic->id)));
-                else if (session.isComicOnDevice(comic->info.hash))
+                else if (ySession->isComicOnDevice(comic->info.hash))
                     t.setVariable(QString("element%1.download").arg(i),QString("<div class=\"importedButton\">IMPORTED</div>"));
                 else
                     t.setVariable(QString("element%1.download").arg(i),QString("<div class=\"importedButton\">IMPORTING</div>"));
@@ -316,6 +319,5 @@ void FolderController::service(HttpRequest& request, HttpResponse& response)
 	t.setVariable("page",QString("%1").arg(page+1));
 	t.setVariable("pages",QString("%1").arg(numPages));
 
-    response.writeText(t, true);
-
+    response.write(t.toUtf8(), true);
 }

YACReaderLibrary/server/controllers/folderinfocontroller.cpp

@@ -12,7 +12,7 @@ FolderInfoController::FolderInfoController() {}
 
 void FolderInfoController::service(HttpRequest& request, HttpResponse& response)
 {
-    response.setHeader("Content-Type", "plain/text; charset=utf-8");
+    response.setHeader("Content-Type", "text/plain; charset=utf-8");
 
     QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
 	QStringList pathElements = path.split('/');
@@ -22,7 +22,7 @@ void FolderInfoController::service(HttpRequest& request, HttpResponse& response)
 
     serviceComics(libraryId, parentId, response);
 
-    response.writeText("",true);
+    response.write("",true);
 }
 
 void FolderInfoController::serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response)
@@ -34,7 +34,7 @@ void FolderInfoController::serviceComics(const int &library, const qulonglong &f
     for(QList<LibraryItem *>::const_iterator itr = folderComics.constBegin();itr!=folderComics.constEnd();itr++)
     {
         currentComic = (ComicDB *)(*itr);
-        response.writeText(QString("/library/%1/comic/%2:%3:%4\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize()));
+        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;
     }
 

YACReaderLibrary/server/controllers/librariescontroller.cpp

@@ -1,6 +1,7 @@
 #include "librariescontroller.h"
 #include "db_helper.h"  //get libraries
 #include "yacreader_libraries.h"
+#include "yacreader_http_session.h"
 
 #include "template.h"
 #include "../static.h"
@@ -12,13 +13,14 @@ 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");
 
-    session.clearNavigationPath();
+    ySession->clearNavigationPath();
 
-    Template t=Static::templateLoader->getTemplate("libraries_"+session.getDeviceType(),request.getHeader("Accept-Language"));
+    Template t=Static::templateLoader->getTemplate("libraries_"+ySession->getDeviceType(),request.getHeader("Accept-Language"));
 	t.enableWarnings();
 
 	YACReaderLibraries libraries = DBHelper::getLibraries();
@@ -36,5 +38,5 @@ void LibrariesController::service(HttpRequest& request, HttpResponse& response)
 	}
 
     response.setStatus(200,"OK");
-    response.writeText(t,true);
+    response.write(t.toUtf8(),true);
 }

YACReaderLibrary/server/controllers/pagecontroller.cpp

@@ -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);

YACReaderLibrary/server/controllers/readingcomicscontroller.cpp

@@ -0,0 +1,34 @@
+#include "readingcomicscontroller.h"
+
+#include "db_helper.h"
+#include "comic_db.h"
+
+#include "yacreader_server_data_helper.h"
+
+ReadingComicsController::ReadingComicsController()
+{
+
+}
+
+void ReadingComicsController::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();
+
+    serviceContent(libraryId, response);
+
+    response.write("",true);
+}
+
+void ReadingComicsController::serviceContent(const int &library, HttpResponse &response)
+{
+    QList<ComicDB> readingComics = DBHelper::getReading(library);
+
+    for(const ComicDB &comic : readingComics)
+    {
+        response.write(YACReaderServerDataHelper::comicToYSFormat(library, comic).toUtf8());
+    }
+}

YACReaderLibrary/server/controllers/readingcomicscontroller.h

@@ -0,0 +1,20 @@
+#ifndef READINGCOMICSCONTROLLER_H
+#define READINGCOMICSCONTROLLER_H
+
+#include "httprequest.h"
+#include "httpresponse.h"
+#include "httprequesthandler.h"
+
+class ReadingComicsController : public HttpRequestHandler {
+    Q_OBJECT
+    Q_DISABLE_COPY(ReadingComicsController)
+public:
+    ReadingComicsController();
+
+    void service(HttpRequest& request, HttpResponse& response);
+
+private:
+    void serviceContent(const int &library, HttpResponse &response);
+};
+
+#endif // READINGCOMICSCONTROLLER_H

YACReaderLibrary/server/controllers/readinglistscontroller.cpp

@@ -0,0 +1,24 @@
+#include "readinglistscontroller.h"
+
+ReadingListsController::ReadingListsController()
+{
+
+}
+
+void ReadingListsController::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();
+
+    serviceContent(libraryId, response);
+
+    response.write("",true);
+}
+
+void ReadingListsController::serviceContent(const int library, HttpResponse &response)
+{
+
+}

YACReaderLibrary/server/controllers/readinglistscontroller.h

@@ -0,0 +1,20 @@
+#ifndef READINGLISTSCONTROLLER_H
+#define READINGLISTSCONTROLLER_H
+
+#include "httprequest.h"
+#include "httpresponse.h"
+#include "httprequesthandler.h"
+
+class ReadingListsController : public HttpRequestHandler {
+    Q_OBJECT
+    Q_DISABLE_COPY(ReadingListsController)
+public:
+    ReadingListsController();
+
+    void service(HttpRequest& request, HttpResponse& response);
+
+private:
+    void serviceContent(const int library, HttpResponse &response);
+};
+
+#endif // READINGLISTSCONTROLLER_H

YACReaderLibrary/server/controllers/synccontroller.cpp

@@ -55,7 +55,7 @@ void SyncController::service(HttpRequest &request, HttpResponse &response)
     else
     {
         response.setStatus(412,"No comic info received");
-        response.writeText("",true);
+        response.write("",true);
         return;
     }
 

YACReaderLibrary/server/controllers/tagcontentcontroller.cpp

@@ -0,0 +1,37 @@
+#include "tagcontentcontroller.h"
+
+#include "db_helper.h"
+#include "comic_db.h"
+
+#include "yacreader_server_data_helper.h"
+
+#include <QUrl>
+
+TagContentController::TagContentController()
+{
+
+}
+
+void TagContentController::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();
+
+    serviceContent(libraryId, tagId, response);
+
+    response.write("",true);
+}
+
+void TagContentController::serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response)
+{
+    QList<ComicDB> tagComics = DBHelper::getLabelComics(library, tagId);
+
+    for(const ComicDB &comic : tagComics)
+    {
+        response.write(YACReaderServerDataHelper::comicToYSFormat(library, comic).toUtf8());
+    }
+}

YACReaderLibrary/server/controllers/tagcontentcontroller.h

@@ -0,0 +1,22 @@
+#ifndef TAGCONTENTCONTROLLER_H
+#define TAGCONTENTCONTROLLER_H
+
+#include "httprequest.h"
+#include "httpresponse.h"
+#include "httprequesthandler.h"
+
+class TagContentController : public HttpRequestHandler {
+    Q_OBJECT
+    Q_DISABLE_COPY(TagContentController);
+public:
+    /** Constructor */
+    TagContentController();
+
+    /** Generates the response */
+    void service(HttpRequest& request, HttpResponse& response);
+
+private:
+    void serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response);
+};
+
+#endif // TAGCONTENTCONTROLLER_H

YACReaderLibrary/server/controllers/tagscontroller.cpp

@@ -0,0 +1,30 @@
+#include "tagscontroller.h"
+
+#include "db_helper.h"
+#include "yacreader_libraries.h"
+
+#include "reading_list_item.h"
+#include "../static.h"
+#include "yacreader_global.h"
+
+#include "QsLog.h"
+
+TagsController::TagsController() {}
+
+void TagsController::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();
+
+    QList<LabelItem *> tags = DBHelper::getLabelItems(libraryId);
+
+    foreach(LabelItem * tag, tags)
+    {
+        response.write(QString("%1\t%2\t%3\r\n").arg(tag->getId()).arg(tag->name()).arg(labelColorToRGBString(tag->colorid())).toUtf8());
+    }
+
+    response.write("",true);
+}

YACReaderLibrary/server/controllers/tagscontroller.h

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

YACReaderLibrary/server/controllers/updatecomiccontroller.cpp

@@ -38,7 +38,7 @@ void UpdateComicController::service(HttpRequest &request, HttpResponse &response
     else
     {
         response.setStatus(412,"No comic info received");
-        response.writeText("",true);
+        response.write("",true);
         return;
     }
 

YACReaderLibrary/server/controllers/versioncontroller.cpp

@@ -0,0 +1,10 @@
+#include "versioncontroller.h"
+
+VersionController::VersionController() {}
+
+void VersionController::service(HttpRequest& request, HttpResponse& response)
+{
+    Q_UNUSED(request);
+
+    response.write(SERVER_VERSION_NUMBER,true);
+}

YACReaderLibrary/server/controllers/versioncontroller.h

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