From 1b344d70e58fba47c973b72b474300793e565fd9 Mon Sep 17 00:00:00 2001 From: Felix Kauselmann Date: Thu, 30 Jul 2020 12:33:13 +0200 Subject: [PATCH] Update server code integration for QtWebApp 1.7.11 - Adapt server code for QtWebapp namespace 'stefanfrings' - Implement custom modifications needed by v1 controller via template engine - Unify iphone and ipad templates --- .../server/controllers/v1/comiccontroller.cpp | 4 + .../server/controllers/v1/comiccontroller.h | 4 +- .../v1/comicdownloadinfocontroller.cpp | 3 + .../v1/comicdownloadinfocontroller.h | 4 +- .../server/controllers/v1/covercontroller.cpp | 4 + .../server/controllers/v1/covercontroller.h | 4 +- .../server/controllers/v1/errorcontroller.cpp | 5 +- .../server/controllers/v1/errorcontroller.h | 4 +- .../controllers/v1/foldercontroller.cpp | 13 +- .../server/controllers/v1/foldercontroller.h | 4 +- .../controllers/v1/folderinfocontroller.cpp | 3 + .../controllers/v1/folderinfocontroller.h | 6 +- .../controllers/v1/librariescontroller.cpp | 11 +- .../controllers/v1/librariescontroller.h | 4 +- .../server/controllers/v1/pagecontroller.cpp | 4 + .../server/controllers/v1/pagecontroller.h | 4 +- .../controllers/v1/sessioncontroller.cpp | 3 + .../server/controllers/v1/synccontroller.cpp | 3 + .../server/controllers/v1/synccontroller.h | 4 +- .../controllers/v1/updatecomiccontroller.cpp | 4 + .../controllers/v1/updatecomiccontroller.h | 4 +- .../controllers/v2/comiccontroller_v2.cpp | 3 + .../controllers/v2/comiccontroller_v2.h | 4 +- .../v2/comicdownloadinfocontroller_v2.cpp | 3 + .../v2/comicdownloadinfocontroller_v2.h | 4 +- .../v2/comicfullinfocontroller_v2.cpp | 3 + .../v2/comicfullinfocontroller_v2.h | 6 +- .../controllers/v2/covercontroller_v2.cpp | 3 + .../controllers/v2/covercontroller_v2.h | 4 +- .../controllers/v2/errorcontroller_v2.cpp | 3 + .../controllers/v2/errorcontroller_v2.h | 4 +- .../controllers/v2/favoritescontroller_v2.cpp | 3 + .../controllers/v2/favoritescontroller_v2.h | 6 +- .../v2/foldercontentcontroller_v2.cpp | 3 + .../v2/foldercontentcontroller_v2.h | 6 +- .../v2/folderinfocontroller_v2.cpp | 3 + .../controllers/v2/folderinfocontroller_v2.h | 6 +- .../controllers/v2/librariescontroller_v2.cpp | 3 + .../controllers/v2/librariescontroller_v2.h | 4 +- .../controllers/v2/pagecontroller_v2.cpp | 3 + .../server/controllers/v2/pagecontroller_v2.h | 4 +- .../v2/readingcomicscontroller_v2.cpp | 3 + .../v2/readingcomicscontroller_v2.h | 6 +- .../v2/readinglistcontentcontroller_v2.cpp | 3 + .../v2/readinglistcontentcontroller_v2.h | 6 +- .../v2/readinglistinfocontroller_v2.cpp | 3 + .../v2/readinglistinfocontroller_v2.h | 6 +- .../v2/readinglistscontroller_v2.cpp | 3 + .../v2/readinglistscontroller_v2.h | 6 +- .../controllers/v2/synccontroller_v2.cpp | 3 + .../server/controllers/v2/synccontroller_v2.h | 4 +- .../v2/tagcontentcontroller_v2.cpp | 3 + .../controllers/v2/tagcontentcontroller_v2.h | 6 +- .../controllers/v2/taginfocontroller_v2.cpp | 3 + .../controllers/v2/taginfocontroller_v2.h | 6 +- .../controllers/v2/tagscontroller_v2.cpp | 3 + .../server/controllers/v2/tagscontroller_v2.h | 4 +- .../v2/updatecomiccontroller_v2.cpp | 3 + .../controllers/v2/updatecomiccontroller_v2.h | 4 +- .../server/controllers/versioncontroller.cpp | 3 + .../server/controllers/versioncontroller.h | 4 +- YACReaderLibrary/server/requestmapper.cpp | 5 + YACReaderLibrary/server/requestmapper.h | 12 +- YACReaderLibrary/server/startup.cpp | 13 ++ YACReaderLibrary/server/startup.h | 5 +- YACReaderLibrary/server/static.cpp | 5 + YACReaderLibrary/server/static.h | 6 +- .../server/yacreader_http_session_store.cpp | 2 + .../server/yacreader_http_session_store.h | 6 +- .../templates/{folder_ipad.tpl => folder.tpl} | 28 +++-- release/server/templates/folder_iphone.tpl | 114 ------------------ .../{libraries_ipad.tpl => libraries.tpl} | 14 +-- release/server/templates/libraries_iphone.tpl | 27 ----- 73 files changed, 249 insertions(+), 247 deletions(-) rename release/server/templates/{folder_ipad.tpl => folder.tpl} (75%) delete mode 100644 release/server/templates/folder_iphone.tpl rename release/server/templates/{libraries_ipad.tpl => libraries.tpl} (76%) delete mode 100644 release/server/templates/libraries_iphone.tpl diff --git a/YACReaderLibrary/server/controllers/v1/comiccontroller.cpp b/YACReaderLibrary/server/controllers/v1/comiccontroller.cpp index 403bd8a7..91d6e1e4 100644 --- a/YACReaderLibrary/server/controllers/v1/comiccontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/comiccontroller.cpp @@ -14,6 +14,10 @@ #include +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; + ComicController::ComicController() { } void ComicController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/comiccontroller.h b/YACReaderLibrary/server/controllers/v1/comiccontroller.h index b7769670..1dbaffeb 100644 --- a/YACReaderLibrary/server/controllers/v1/comiccontroller.h +++ b/YACReaderLibrary/server/controllers/v1/comiccontroller.h @@ -9,7 +9,7 @@ class Comic; class QString; -class ComicController : public HttpRequestHandler +class ComicController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ComicController); @@ -19,7 +19,7 @@ public: ComicController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // COMICCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.cpp b/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.cpp index 3d399ee5..73ee31cd 100644 --- a/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.cpp @@ -5,6 +5,9 @@ #include "comic_db.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ComicDownloadInfoController::ComicDownloadInfoController() { } void ComicDownloadInfoController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.h b/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.h index a9e8f1aa..742c782c 100644 --- a/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.h +++ b/YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ComicDownloadInfoController : public HttpRequestHandler +class ComicDownloadInfoController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ComicDownloadInfoController); @@ -15,7 +15,7 @@ public: ComicDownloadInfoController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // COMICDOWNLOADINFOCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/covercontroller.cpp b/YACReaderLibrary/server/controllers/v1/covercontroller.cpp index 40730a1e..b3fdafca 100644 --- a/YACReaderLibrary/server/controllers/v1/covercontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/covercontroller.cpp @@ -6,6 +6,10 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; + CoverController::CoverController() { } void CoverController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/covercontroller.h b/YACReaderLibrary/server/controllers/v1/covercontroller.h index 7ec9eed5..bf0e9c33 100644 --- a/YACReaderLibrary/server/controllers/v1/covercontroller.h +++ b/YACReaderLibrary/server/controllers/v1/covercontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class CoverController : public HttpRequestHandler +class CoverController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(CoverController); @@ -15,7 +15,7 @@ public: CoverController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // COVERCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/errorcontroller.cpp b/YACReaderLibrary/server/controllers/v1/errorcontroller.cpp index bc8ca8c5..887f263a 100644 --- a/YACReaderLibrary/server/controllers/v1/errorcontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/errorcontroller.cpp @@ -3,6 +3,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ErrorController::ErrorController(int errorCode) : error(errorCode) { @@ -21,4 +24,4 @@ void ErrorController::service(HttpRequest &request, HttpResponse &response) response.write("404 not found", true); break; } -} \ No newline at end of file +} diff --git a/YACReaderLibrary/server/controllers/v1/errorcontroller.h b/YACReaderLibrary/server/controllers/v1/errorcontroller.h index 6e5d9b8c..bcd745fd 100644 --- a/YACReaderLibrary/server/controllers/v1/errorcontroller.h +++ b/YACReaderLibrary/server/controllers/v1/errorcontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ErrorController : public HttpRequestHandler +class ErrorController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ErrorController); @@ -15,7 +15,7 @@ public: ErrorController(int errorCode); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: int error; diff --git a/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp b/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp index 617da0d2..8da40c95 100644 --- a/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp @@ -16,6 +16,11 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; +using stefanfrings::Template; + struct LibraryItemSorter { bool operator()(const LibraryItem *a, const LibraryItem *b) const { @@ -41,8 +46,14 @@ void FolderController::service(HttpRequest &request, HttpResponse &response) //QString y = session.get("xxx").toString(); //response.writeText(QString("session xxx : %1
").arg(y)); - Template t = Static::templateLoader->getTemplate("folder_" + ySession->getDeviceType(), request.getHeader("Accept-Language")); + Template t = Static::templateLoader->getTemplate("folder", request.getHeader("Accept-Language")); t.enableWarnings(); + + // set device type for templates + t.setVariable("device", ySession->getDeviceType()); + t.setVariable("display", ySession->getDisplayType()); + t.setCondition("device.ipad", ySession->getDeviceType() == "ipad"); + QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8(); QStringList pathElements = path.split('/'); int libraryId = pathElements.at(2).toInt(); diff --git a/YACReaderLibrary/server/controllers/v1/foldercontroller.h b/YACReaderLibrary/server/controllers/v1/foldercontroller.h index c9b2033a..f468366d 100644 --- a/YACReaderLibrary/server/controllers/v1/foldercontroller.h +++ b/YACReaderLibrary/server/controllers/v1/foldercontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class FolderController : public HttpRequestHandler +class FolderController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(FolderController); @@ -15,7 +15,7 @@ public: FolderController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // FOLDERCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/folderinfocontroller.cpp b/YACReaderLibrary/server/controllers/v1/folderinfocontroller.cpp index c9f55d45..55801810 100644 --- a/YACReaderLibrary/server/controllers/v1/folderinfocontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/folderinfocontroller.cpp @@ -7,6 +7,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + FolderInfoController::FolderInfoController() { } void FolderInfoController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/folderinfocontroller.h b/YACReaderLibrary/server/controllers/v1/folderinfocontroller.h index d4703cbd..f52cd50f 100644 --- a/YACReaderLibrary/server/controllers/v1/folderinfocontroller.h +++ b/YACReaderLibrary/server/controllers/v1/folderinfocontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class FolderInfoController : public HttpRequestHandler +class FolderInfoController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(FolderInfoController); @@ -15,10 +15,10 @@ public: FolderInfoController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response); + void serviceComics(const int &library, const qulonglong &folderId, stefanfrings::HttpResponse &response); }; #endif // FOLDERINFOCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/librariescontroller.cpp b/YACReaderLibrary/server/controllers/v1/librariescontroller.cpp index 325721d2..32ad96e8 100644 --- a/YACReaderLibrary/server/controllers/v1/librariescontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/librariescontroller.cpp @@ -8,6 +8,11 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; +using stefanfrings::Template; + LibrariesController::LibrariesController() { } void LibrariesController::service(HttpRequest &request, HttpResponse &response) @@ -20,9 +25,13 @@ void LibrariesController::service(HttpRequest &request, HttpResponse &response) ySession->clearNavigationPath(); - Template t = Static::templateLoader->getTemplate("libraries_" + ySession->getDeviceType(), request.getHeader("Accept-Language")); + Template t = Static::templateLoader->getTemplate("libraries", request.getHeader("Accept-Language")); t.enableWarnings(); + // set device type and display + t.setVariable("device", ySession->getDeviceType()); + t.setVariable("display", ySession->getDisplayType()); + YACReaderLibraries libraries = DBHelper::getLibraries(); QList names = DBHelper::getLibrariesNames(); diff --git a/YACReaderLibrary/server/controllers/v1/librariescontroller.h b/YACReaderLibrary/server/controllers/v1/librariescontroller.h index 31dc760f..26a60b05 100644 --- a/YACReaderLibrary/server/controllers/v1/librariescontroller.h +++ b/YACReaderLibrary/server/controllers/v1/librariescontroller.h @@ -9,7 +9,7 @@ This controller displays a HTML form and dumps the submitted input. */ -class LibrariesController : public HttpRequestHandler +class LibrariesController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(LibrariesController); @@ -19,7 +19,7 @@ public: LibrariesController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // LIBRARIESCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/pagecontroller.cpp b/YACReaderLibrary/server/controllers/v1/pagecontroller.cpp index 7af50ac7..5d0cfe57 100644 --- a/YACReaderLibrary/server/controllers/v1/pagecontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/pagecontroller.cpp @@ -13,6 +13,10 @@ #include "db_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; + PageController::PageController() { } void PageController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/pagecontroller.h b/YACReaderLibrary/server/controllers/v1/pagecontroller.h index edee14bc..fdd48541 100644 --- a/YACReaderLibrary/server/controllers/v1/pagecontroller.h +++ b/YACReaderLibrary/server/controllers/v1/pagecontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class PageController : public HttpRequestHandler +class PageController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(PageController); @@ -15,7 +15,7 @@ public: PageController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // PAGECONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/sessioncontroller.cpp b/YACReaderLibrary/server/controllers/v1/sessioncontroller.cpp index d10a6c96..3381046f 100644 --- a/YACReaderLibrary/server/controllers/v1/sessioncontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/sessioncontroller.cpp @@ -8,6 +8,9 @@ #include #include +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + SessionController::SessionController() { } void SessionController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/synccontroller.cpp b/YACReaderLibrary/server/controllers/v1/synccontroller.cpp index 5ed03c68..55ff4f51 100644 --- a/YACReaderLibrary/server/controllers/v1/synccontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/synccontroller.cpp @@ -6,6 +6,9 @@ #include "comic_db.h" #include "db_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + SyncController::SyncController() { } diff --git a/YACReaderLibrary/server/controllers/v1/synccontroller.h b/YACReaderLibrary/server/controllers/v1/synccontroller.h index d10fa9f0..1780429e 100644 --- a/YACReaderLibrary/server/controllers/v1/synccontroller.h +++ b/YACReaderLibrary/server/controllers/v1/synccontroller.h @@ -7,7 +7,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class SyncController : public HttpRequestHandler +class SyncController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(SyncController) @@ -16,7 +16,7 @@ public: SyncController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // SYNCCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.cpp b/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.cpp index c1b58e63..ffc14e8f 100644 --- a/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.cpp @@ -11,6 +11,10 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; + UpdateComicController::UpdateComicController() { } void UpdateComicController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.h b/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.h index df9866ca..2dcf4c59 100644 --- a/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.h +++ b/YACReaderLibrary/server/controllers/v1/updatecomiccontroller.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class UpdateComicController : public HttpRequestHandler +class UpdateComicController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(UpdateComicController); @@ -14,7 +14,7 @@ public: UpdateComicController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // UPDATECOMICCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp index ab4ac0cb..273d275d 100644 --- a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp @@ -14,6 +14,9 @@ #include +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ComicControllerV2::ComicControllerV2() { } void ComicControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h index ab062afe..f1a189b9 100644 --- a/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/comiccontroller_v2.h @@ -9,7 +9,7 @@ class Comic; class QString; -class ComicControllerV2 : public HttpRequestHandler +class ComicControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ComicControllerV2) @@ -18,7 +18,7 @@ public: ComicControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // COMICCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp index 1df22041..fc458305 100644 --- a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp @@ -5,6 +5,9 @@ #include "comic_db.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ComicDownloadInfoControllerV2::ComicDownloadInfoControllerV2() { } void ComicDownloadInfoControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h index fc5d254c..a40f214d 100644 --- a/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ComicDownloadInfoControllerV2 : public HttpRequestHandler +class ComicDownloadInfoControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ComicDownloadInfoControllerV2) @@ -14,7 +14,7 @@ public: ComicDownloadInfoControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // COMICDOWNLOADINFOCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp index edd7fee6..344d3a95 100644 --- a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.cpp @@ -11,6 +11,9 @@ #include "qnaturalsorting.h" #include + +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; using namespace std; ComicFullinfoController_v2::ComicFullinfoController_v2() { } diff --git a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h index de58acff..031232ee 100644 --- a/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/comicfullinfocontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ComicFullinfoController_v2 : public HttpRequestHandler +class ComicFullinfoController_v2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ComicFullinfoController_v2) public: ComicFullinfoController_v2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int &library, const qulonglong &comicId, HttpResponse &response); + void serviceContent(const int &library, const qulonglong &comicId, stefanfrings::HttpResponse &response); }; #endif // COMICFULLINFOCONTROLLER_V2_H diff --git a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp index be0cbe57..c0f210a8 100644 --- a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.cpp @@ -6,6 +6,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + CoverControllerV2::CoverControllerV2() { } void CoverControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h index 1518fb3a..7dc7d726 100644 --- a/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/covercontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class CoverControllerV2 : public HttpRequestHandler +class CoverControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(CoverControllerV2) @@ -14,7 +14,7 @@ public: CoverControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // COVERCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp index a6013a9b..cedbbc30 100644 --- a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.cpp @@ -3,6 +3,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ErrorControllerV2::ErrorControllerV2(int errorCode) : error(errorCode) { diff --git a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h index a87f818f..3b64416f 100644 --- a/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/errorcontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ErrorControllerV2 : public HttpRequestHandler +class ErrorControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ErrorControllerV2) @@ -14,7 +14,7 @@ public: ErrorControllerV2(int errorCode); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: int error; diff --git a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp index 9b434e85..7717ee84 100644 --- a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.cpp @@ -5,6 +5,9 @@ #include "yacreader_server_data_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + FavoritesControllerV2::FavoritesControllerV2() { } void FavoritesControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h index 10991c20..5ab08463 100644 --- a/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/favoritescontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class FavoritesControllerV2 : public HttpRequestHandler +class FavoritesControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(FavoritesControllerV2) public: FavoritesControllerV2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int library, HttpResponse &response); + void serviceContent(const int library, stefanfrings::HttpResponse &response); }; #endif // FAVORITESCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp index 7bb33896..bda1c46b 100644 --- a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.cpp @@ -14,6 +14,9 @@ #include #include + +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; using namespace std; struct LibraryItemSorter { diff --git a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h index e3f31cc6..b856fe7f 100644 --- a/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/foldercontentcontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class FolderContentControllerV2 : public HttpRequestHandler +class FolderContentControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(FolderContentControllerV2) @@ -14,10 +14,10 @@ public: FolderContentControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int &library, const qulonglong &folderId, HttpResponse &response); + void serviceContent(const int &library, const qulonglong &folderId, stefanfrings::HttpResponse &response); }; #endif // FOLDERCONTENTCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp index 0342cfa8..77801673 100644 --- a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.cpp @@ -7,6 +7,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + FolderInfoControllerV2::FolderInfoControllerV2() { } void FolderInfoControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h index 7727105c..321fc424 100644 --- a/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/folderinfocontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class FolderInfoControllerV2 : public HttpRequestHandler +class FolderInfoControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(FolderInfoControllerV2) @@ -14,10 +14,10 @@ public: FolderInfoControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceComics(const int &library, const qulonglong &folderId, HttpResponse &response); + void serviceComics(const int &library, const qulonglong &folderId, stefanfrings::HttpResponse &response); }; #endif // FOLDERINFOCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp index 12595710..ca5c84f9 100644 --- a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.cpp @@ -7,6 +7,9 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + LibrariesControllerV2::LibrariesControllerV2() { } void LibrariesControllerV2::service(HttpRequest & /* request */, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h index 858ae645..521492c4 100644 --- a/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/librariescontroller_v2.h @@ -9,7 +9,7 @@ This controller displays a HTML form and dumps the submitted input. */ -class LibrariesControllerV2 : public HttpRequestHandler +class LibrariesControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(LibrariesControllerV2) @@ -18,7 +18,7 @@ public: LibrariesControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // LIBRARIESCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp index 0ae4c87b..9366624e 100644 --- a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp @@ -13,6 +13,9 @@ #include "db_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + PageControllerV2::PageControllerV2() { } void PageControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h index c688f690..4bd71ce6 100644 --- a/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/pagecontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class PageControllerV2 : public HttpRequestHandler +class PageControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(PageControllerV2) @@ -14,7 +14,7 @@ public: PageControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // PAGECONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp index 22642f81..6db58772 100644 --- a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.cpp @@ -5,6 +5,9 @@ #include "yacreader_server_data_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ReadingComicsControllerV2::ReadingComicsControllerV2() { } diff --git a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h index f3a2a5bc..51c96061 100644 --- a/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/readingcomicscontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ReadingComicsControllerV2 : public HttpRequestHandler +class ReadingComicsControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ReadingComicsControllerV2) public: ReadingComicsControllerV2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int &library, HttpResponse &response); + void serviceContent(const int &library, stefanfrings::HttpResponse &response); }; #endif // READINGCOMICSCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp index c3265d74..4a502883 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.cpp @@ -5,6 +5,9 @@ #include "yacreader_server_data_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ReadingListContentControllerV2::ReadingListContentControllerV2() { } diff --git a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h index 270360a3..bdf482e1 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/readinglistcontentcontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ReadingListContentControllerV2 : public HttpRequestHandler +class ReadingListContentControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ReadingListContentControllerV2) public: ReadingListContentControllerV2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int &library, const qulonglong &readingListId, HttpResponse &response); + void serviceContent(const int &library, const qulonglong &readingListId, stefanfrings::HttpResponse &response); }; #endif // READINGLISTCONTENTCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp index d358acc5..f95cf498 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.cpp @@ -8,6 +8,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ReadingListInfoControllerV2::ReadingListInfoControllerV2() { } void ReadingListInfoControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h index 399cc34f..32f42b26 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/readinglistinfocontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ReadingListInfoControllerV2 : public HttpRequestHandler +class ReadingListInfoControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ReadingListInfoControllerV2) public: ReadingListInfoControllerV2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceComics(const int &library, const qulonglong &readingListId, HttpResponse &response); + void serviceComics(const int &library, const qulonglong &readingListId, stefanfrings::HttpResponse &response); }; #endif // READINGLISTINFOCONTROLLER_V2_H diff --git a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp index 645e5c88..a791c121 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.cpp @@ -4,6 +4,9 @@ #include "reading_list.h" #include "yacreader_server_data_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + ReadingListsControllerV2::ReadingListsControllerV2() { } diff --git a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h index 1c336d9f..d319982d 100644 --- a/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/readinglistscontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class ReadingListsControllerV2 : public HttpRequestHandler +class ReadingListsControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(ReadingListsControllerV2) public: ReadingListsControllerV2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int library, HttpResponse &response); + void serviceContent(const int library, stefanfrings::HttpResponse &response); }; #endif // READINGLISTSCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp index 1b8ced6e..8883a8ce 100644 --- a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp @@ -6,6 +6,9 @@ #include "comic_db.h" #include "db_helper.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + SyncControllerV2::SyncControllerV2() { } diff --git a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h index 08aff598..ca7358c7 100644 --- a/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/synccontroller_v2.h @@ -7,7 +7,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class SyncControllerV2 : public HttpRequestHandler +class SyncControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(SyncControllerV2) @@ -16,7 +16,7 @@ public: SyncControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // SYNCCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp index e4efa9a5..0aa353ec 100644 --- a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.cpp @@ -7,6 +7,9 @@ #include +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + TagContentControllerV2::TagContentControllerV2() { } diff --git a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h index 391c97c0..9d140479 100644 --- a/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/tagcontentcontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class TagContentControllerV2 : public HttpRequestHandler +class TagContentControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(TagContentControllerV2) @@ -14,10 +14,10 @@ public: TagContentControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceContent(const int &library, const qulonglong &tagId, HttpResponse &response); + void serviceContent(const int &library, const qulonglong &tagId, stefanfrings::HttpResponse &response); }; #endif // TAGCONTENTCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp index 7187bd8e..3d87235f 100644 --- a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.cpp @@ -8,6 +8,9 @@ #include "template.h" #include "../static.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + TagInfoControllerV2::TagInfoControllerV2() { } void TagInfoControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h index 92bed920..78232c92 100644 --- a/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/taginfocontroller_v2.h @@ -5,17 +5,17 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class TagInfoControllerV2 : public HttpRequestHandler +class TagInfoControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(TagInfoControllerV2) public: TagInfoControllerV2(); - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; private: - void serviceComics(const int &library, const qulonglong &tagId, HttpResponse &response); + void serviceComics(const int &library, const qulonglong &tagId, stefanfrings::HttpResponse &response); }; #endif // TAGINFOCONTROLLER_V2_H diff --git a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp index 205916d5..954f1d03 100644 --- a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.cpp @@ -11,6 +11,9 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + TagsControllerV2::TagsControllerV2() { } void TagsControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h index 86bd2c54..4748f82d 100644 --- a/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/tagscontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class TagsControllerV2 : public HttpRequestHandler +class TagsControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(TagsControllerV2) @@ -14,7 +14,7 @@ public: TagsControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // TAGSCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp index 266bb5b1..2773608e 100644 --- a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp +++ b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.cpp @@ -11,6 +11,9 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + UpdateComicControllerV2::UpdateComicControllerV2() { } void UpdateComicControllerV2::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h index 9bdea250..57e72437 100644 --- a/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h +++ b/YACReaderLibrary/server/controllers/v2/updatecomiccontroller_v2.h @@ -5,7 +5,7 @@ #include "httpresponse.h" #include "httprequesthandler.h" -class UpdateComicControllerV2 : public HttpRequestHandler +class UpdateComicControllerV2 : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(UpdateComicControllerV2) @@ -14,7 +14,7 @@ public: UpdateComicControllerV2(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // UPDATECOMICCONTROLLER_H diff --git a/YACReaderLibrary/server/controllers/versioncontroller.cpp b/YACReaderLibrary/server/controllers/versioncontroller.cpp index 47eedd2c..c4cbdd5d 100644 --- a/YACReaderLibrary/server/controllers/versioncontroller.cpp +++ b/YACReaderLibrary/server/controllers/versioncontroller.cpp @@ -1,5 +1,8 @@ #include "versioncontroller.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + VersionController::VersionController() { } void VersionController::service(HttpRequest &request, HttpResponse &response) diff --git a/YACReaderLibrary/server/controllers/versioncontroller.h b/YACReaderLibrary/server/controllers/versioncontroller.h index fdc4ae09..9824ed34 100644 --- a/YACReaderLibrary/server/controllers/versioncontroller.h +++ b/YACReaderLibrary/server/controllers/versioncontroller.h @@ -7,7 +7,7 @@ #include -class VersionController : public HttpRequestHandler +class VersionController : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(VersionController); @@ -17,7 +17,7 @@ public: VersionController(); /** Generates the response */ - void service(HttpRequest &request, HttpResponse &response) override; + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; }; #endif // VERSIONCONTROLLER_H diff --git a/YACReaderLibrary/server/requestmapper.cpp b/YACReaderLibrary/server/requestmapper.cpp index 3a024cb5..e4c6a421 100644 --- a/YACReaderLibrary/server/requestmapper.cpp +++ b/YACReaderLibrary/server/requestmapper.cpp @@ -47,6 +47,11 @@ #include "QsLog.h" +using stefanfrings::HttpRequest; +using stefanfrings::HttpRequestHandler; +using stefanfrings::HttpResponse; +using stefanfrings::HttpSession; + QMutex RequestMapper::mutex; RequestMapper::RequestMapper(QObject *parent) diff --git a/YACReaderLibrary/server/requestmapper.h b/YACReaderLibrary/server/requestmapper.h index 20ba7238..ba786f07 100644 --- a/YACReaderLibrary/server/requestmapper.h +++ b/YACReaderLibrary/server/requestmapper.h @@ -9,20 +9,20 @@ #include "httprequesthandler.h" #include -class RequestMapper : public HttpRequestHandler +class RequestMapper : public stefanfrings::HttpRequestHandler { Q_OBJECT Q_DISABLE_COPY(RequestMapper) public: RequestMapper(QObject *parent = nullptr); - void service(HttpRequest &request, HttpResponse &response) override; - void loadSessionV1(HttpRequest &request, HttpResponse &response); - void loadSessionV2(HttpRequest &request, HttpResponse &response); + void service(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response) override; + void loadSessionV1(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response); + void loadSessionV2(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response); private: - void serviceV1(HttpRequest &request, HttpResponse &response); - void serviceV2(HttpRequest &request, HttpResponse &response); + void serviceV1(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response); + void serviceV2(stefanfrings::HttpRequest &request, stefanfrings::HttpResponse &response); static QMutex mutex; }; diff --git a/YACReaderLibrary/server/startup.cpp b/YACReaderLibrary/server/startup.cpp index b7033471..be42e3e2 100644 --- a/YACReaderLibrary/server/startup.cpp +++ b/YACReaderLibrary/server/startup.cpp @@ -24,6 +24,14 @@ /** Short description of this application */ #define DESCRIPTION "Comic reader and organizer" +using stefanfrings::HttpListener; +using stefanfrings::HttpRequest; +using stefanfrings::HttpResponse; + +using stefanfrings::HttpSessionStore; +using stefanfrings::StaticFileController; +using stefanfrings::TemplateCache; + void Startup::start() { // Initialize the core application @@ -126,6 +134,11 @@ void Startup::start() listener = new HttpListener(listenerSettings, new RequestMapper(app), app); + // if the requested port is busy, use random port + if (!listener->isListening()) { + listener->QTcpServer::listen(QHostAddress::Any, 0); + } + qDebug("ServiceHelper: Service has started"); } diff --git a/YACReaderLibrary/server/startup.h b/YACReaderLibrary/server/startup.h index ae84873c..e8dfc7cc 100644 --- a/YACReaderLibrary/server/startup.h +++ b/YACReaderLibrary/server/startup.h @@ -8,7 +8,10 @@ #include +namespace stefanfrings { class HttpListener; +} + /** Helper class to install and run the application as a windows service. @@ -17,7 +20,7 @@ class Startup { private: //QTcpServer - HttpListener *listener; + stefanfrings::HttpListener *listener; public: /** Constructor */ diff --git a/YACReaderLibrary/server/static.cpp b/YACReaderLibrary/server/static.cpp index 47138d14..56db03fc 100644 --- a/YACReaderLibrary/server/static.cpp +++ b/YACReaderLibrary/server/static.cpp @@ -9,6 +9,11 @@ #include #include +using stefanfrings::HttpResponse; +using stefanfrings::HttpSessionStore; +using stefanfrings::StaticFileController; +using stefanfrings::TemplateLoader; + QString Static::configDir = nullptr; TemplateLoader *Static::templateLoader = nullptr; diff --git a/YACReaderLibrary/server/static.h b/YACReaderLibrary/server/static.h index 52fc1624..5c2296f5 100644 --- a/YACReaderLibrary/server/static.h +++ b/YACReaderLibrary/server/static.h @@ -47,15 +47,15 @@ public: static QString getConfigDir(); /** Cache for template files */ - static TemplateLoader *templateLoader; + static stefanfrings::TemplateLoader *templateLoader; /** Storage for session cookies */ - static HttpSessionStore *sessionStore; + static stefanfrings::HttpSessionStore *sessionStore; static YACReaderHttpSessionStore *yacreaderSessionStore; /** Controller for static files */ - static StaticFileController *staticFileController; + static stefanfrings::StaticFileController *staticFileController; private: /** Directory of the main config file */ diff --git a/YACReaderLibrary/server/yacreader_http_session_store.cpp b/YACReaderLibrary/server/yacreader_http_session_store.cpp index 9cdebeae..4b21809a 100644 --- a/YACReaderLibrary/server/yacreader_http_session_store.cpp +++ b/YACReaderLibrary/server/yacreader_http_session_store.cpp @@ -4,6 +4,8 @@ #include "httpsessionstore.h" +using stefanfrings::HttpSessionStore; + YACReaderHttpSessionStore::YACReaderHttpSessionStore(HttpSessionStore *sessionStore, QObject *parent) : QObject(parent), sessionStore(sessionStore) { diff --git a/YACReaderLibrary/server/yacreader_http_session_store.h b/YACReaderLibrary/server/yacreader_http_session_store.h index e0bc3458..fe3e7e42 100644 --- a/YACReaderLibrary/server/yacreader_http_session_store.h +++ b/YACReaderLibrary/server/yacreader_http_session_store.h @@ -4,14 +4,16 @@ #include #include +namespace stefanfrings { class HttpSessionStore; +} class YACReaderHttpSession; class YACReaderHttpSessionStore : public QObject { Q_OBJECT public: - explicit YACReaderHttpSessionStore(HttpSessionStore *sessionStore, QObject *parent = nullptr); + explicit YACReaderHttpSessionStore(stefanfrings::HttpSessionStore *sessionStore, QObject *parent = nullptr); void addYACReaderHttpSession(const QByteArray &httpSessionId, YACReaderHttpSession *yacreaderHttpSession); YACReaderHttpSession *getYACReaderSessionHttpSession(const QByteArray &httpSessionId); @@ -22,7 +24,7 @@ public slots: private: QMap sessions; - HttpSessionStore *sessionStore; + stefanfrings::HttpSessionStore *sessionStore; QTimer cleanupTimer; QMutex mutex; diff --git a/release/server/templates/folder_ipad.tpl b/release/server/templates/folder.tpl similarity index 75% rename from release/server/templates/folder_ipad.tpl rename to release/server/templates/folder.tpl index c3041993..cb13a164 100644 --- a/release/server/templates/folder_ipad.tpl +++ b/release/server/templates/folder.tpl @@ -3,8 +3,8 @@ - - Folder + + Folder
@@ -15,15 +15,17 @@
+ {if device.ipad}

{folder.name}

+ {end device.ipad}
- Libraries {library.name} {loop path} {path.name} {end path} + Libraries {library.name} {loop path} {path.name} {end path}
{if pageIndex} - + {loop index} @@ -52,13 +54,13 @@
  • {element.cover.browse} {element.cover.browse.end} -
    -
    -

    {element.name}

    +
    +
    +

    {element.name}

    -
    {element.pages} {element.size} +
    {element.pages} {element.size}
    -
    {element.download} {element.read} {element.browse} +
    {element.download} {element.read} {element.browse}
    {element.status} @@ -75,7 +77,7 @@
      - {loop index} + {loop index}
    • {index.indexname}
      • @@ -94,7 +96,7 @@ - {loop page}
    • {page.number}
      • {end page} + {loop page}
    • {page.number}
      • {end page} @@ -107,7 +109,7 @@ diff --git a/release/server/templates/folder_iphone.tpl b/release/server/templates/folder_iphone.tpl deleted file mode 100644 index adc6954d..00000000 --- a/release/server/templates/folder_iphone.tpl +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - Folder - - -
      -
      - -
      -
      {if pageIndex} {end pageIndex} up
      - - -
      -
      - -
      - Libraries {loop path} {path.name} {end path} -
      -
      - {if pageIndex} - - - {end pageIndex} - - {if alphaIndex} - - - {end alphaIndex} - -
      -
      - - -
      -
        - {loop element} -
      • -
        - {element.cover.browse} {element.cover.browse.end} -
        -
        -

        {element.name}

        -
        -
        {element.pages} {element.size} -
        -
        {element.download} {element.read} {element.browse} -
        -
        - {element.status} -
        • - {end element} -
      -
       
      -
      -
      - - {if index} -
      - {if alphaIndex} - -
      - -
       
      -
      - - {end alphaIndex} - - - {if pageIndex} - -
      - -
       
      -
      - {end pageIndex} -
      - {end index} - - - - - diff --git a/release/server/templates/libraries_ipad.tpl b/release/server/templates/libraries.tpl similarity index 76% rename from release/server/templates/libraries_ipad.tpl rename to release/server/templates/libraries.tpl index 00f0ec95..0de6f4d9 100644 --- a/release/server/templates/libraries_ipad.tpl +++ b/release/server/templates/libraries.tpl @@ -1,21 +1,21 @@ - + - - Libraries + + Libraries

      Libraries

      -

        +
          {loop library}
        • -
          +
          {library.label}
          -
          +
           
           
          • @@ -24,4 +24,4 @@

      - \ No newline at end of file + diff --git a/release/server/templates/libraries_iphone.tpl b/release/server/templates/libraries_iphone.tpl deleted file mode 100644 index 00f0ec95..00000000 --- a/release/server/templates/libraries_iphone.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - Libraries - - -
      -

      Libraries

      -

      -

        - {loop library} -
      • -
        -
        {library.label}
        -
        -   -
         
        -
        • - {end library} -
      -

      -
      - - \ No newline at end of file