merged master

YACReaderLibrary/server/controllers/comiccontroller.cpp

@@ -79,7 +79,7 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
             session.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));

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('/');

YACReaderLibrary/server/controllers/foldercontentcontroller.cpp

@@ -0,0 +1,70 @@
+#include "foldercontentcontroller.h"
+
+#include <QUrl>
+
+#include "db_helper.h"
+#include "comic_db.h"
+#include "folder.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.writeText("",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.writeText(QString("f\t%1\t%2\t%3\t%4\t%5\r\n").arg(library).arg(currentFolder->id).arg(currentFolder->name).arg(currentFolder->getNumChildren()).arg(currentFolder->getFirstChildHash()));
+        }
+        else
+        {
+            currentComic = (ComicDB *)(*itr);
+            response.writeText(QString("c\t%1\t%2\t%3\t%4\t%5\r\n").arg(library).arg(currentComic->id).arg(currentComic->getFileName()).arg(currentComic->getFileSize()).arg(currentComic->info.hash));
+        }
+    }
+
+    clock_t end = clock();
+    double msecs = double(end - begin);
+
+    response.writeText(QString("%1ms").arg(msecs));
+}

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

@@ -167,11 +167,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");

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('/');

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.writeText(QString("%1\t%2\t%3\r\n").arg(tag->getId()).arg(tag->name()).arg(labelColorToRGBString(tag->colorid())));
+    }
+
+    response.writeText("",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/versioncontroller.cpp

@@ -0,0 +1,10 @@
+#include "versioncontroller.h"
+
+VersionController::VersionController() {}
+
+void VersionController::service(HttpRequest& request, HttpResponse& response)
+{
+    Q_UNUSED(request);
+
+    response.writeText(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