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

clang-format

Browse Source
This commit is contained in:
Luis Ángel San Martín
2021-10-18 21:56:52 +02:00
parent 78e0c522d2
commit 5aa02a19bb
190 changed files with 2286 additions and 2286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
YACReaderLibrary/server/controllers/v1/comiccontroller.cpp
View File

@ -33,8 +33,8 @@ void ComicController::service(HttpRequest &request, HttpResponse &response)
bool remoteComic = path.endsWith("remote");
//TODO
//if(pathElements.size() == 6)
// TODO
// if(pathElements.size() == 6)
//{
// QString action = pathElements.at(5);
// if(!action.isEmpty() && (action == "close"))
@ -43,7 +43,7 @@ void ComicController::service(HttpRequest &request, HttpResponse &response)
// response.write("",true);
// return;
// }
//}
// }
YACReaderLibraries libraries = DBHelper::getLibraries();
@ -82,10 +82,10 @@ void ComicController::service(HttpRequest &request, HttpResponse &response)
}
response.setHeader("Content-Type", "text/plain; charset=utf-8");
//TODO this field is not used by the client!
// TODO this field is not used by the client!
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
if (remoteComic) // send previous and next comics id
{
QList<LibraryItem *> siblings = DBHelper::getFolderComicsFromLibrary(libraryId, comic.parentId, true);
bool found = false;
@ -102,15 +102,15 @@ void ComicController::service(HttpRequest &request, HttpResponse &response)
if (i < siblings.length() - 1)
response.write(QString("nextComic:%1\r\n").arg(siblings.at(i + 1)->id).toUtf8());
} else {
//ERROR
// ERROR
}
qDeleteAll(siblings);
}
response.write(comic.toTXT().toUtf8(), true);
} else {
//delete comicFile;
// delete comicFile;
response.setStatus(404, "not found");
response.write("404 not found", true);
}
//response.write(t.toLatin1(),true);
// response.write(t.toLatin1(),true);
}

2
YACReaderLibrary/server/controllers/v1/comicdownloadinfocontroller.cpp
View File

@ -22,7 +22,7 @@ void ComicDownloadInfoController::service(HttpRequest &request, HttpResponse &re
ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
//TODO: check if the comic wasn't found;
// TODO: check if the comic wasn't found;
response.write(QString("fileName:%1\r\n").arg(comic.getFileName()).toUtf8());
response.write(QString("fileSize:%1\r\n").arg(comic.getFileSize()).toUtf8(), true);
}

14
YACReaderLibrary/server/controllers/v1/covercontroller.cpp
View File

@ -19,7 +19,7 @@ void CoverController::service(HttpRequest &request, HttpResponse &response)
response.setHeader("Content-Type", "image/jpeg");
response.setHeader("Connection", "close");
//response.setHeader("Content-Type", "plain/text; charset=ISO-8859-1");
// response.setHeader("Content-Type", "plain/text; charset=ISO-8859-1");
YACReaderLibraries libraries = DBHelper::getLibraries();
@ -30,12 +30,12 @@ void CoverController::service(HttpRequest &request, HttpResponse &response)
bool folderCover = request.getParameter("folderCover").length() > 0;
//response.writeText(path+"<br/>");
//response.writeText(libraryName+"<br/>");
//response.writeText(libraries.value(libraryName)+"/.yacreaderlibrary/covers/"+fileName+"<br/>");
// response.writeText(path+"<br/>");
// response.writeText(libraryName+"<br/>");
// response.writeText(libraries.value(libraryName)+"/.yacreaderlibrary/covers/"+fileName+"<br/>");
//QFile file(libraries.value(libraryName)+"/.yacreaderlibrary/covers/"+fileName);
//if (file.exists()) {
// QFile file(libraries.value(libraryName)+"/.yacreaderlibrary/covers/"+fileName);
// if (file.exists()) {
// if (file.open(QIODevice::ReadOnly))
// {
// qDebug("StaticFileController: Open file %s",qPrintable(file.fileName()));
@ -81,7 +81,7 @@ void CoverController::service(HttpRequest &request, HttpResponse &response)
destImg.save(&buffer, "JPG");
response.write(ba, true);
}
//DONE else, hay que devolver un 404
// DONE else, hay que devolver un 404
else {
response.setStatus(404, "not found");
response.write("404 not found", true);

38
YACReaderLibrary/server/controllers/v1/foldercontroller.cpp
View File

@ -27,7 +27,7 @@ FolderController::FolderController() { }
void FolderController::service(HttpRequest &request, HttpResponse &response)
{
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); //TODO unificar la creación del fichero de config con el servidor
QSettings *settings = new QSettings(YACReader::getSettingsPath() + "/YACReaderLibrary.ini", QSettings::IniFormat); // TODO unificar la creación del fichero de config con el servidor
settings->beginGroup("libraryConfig");
bool showlessInfoPerFolder = settings->value(REMOTE_BROWSE_PERFORMANCE_WORKAROUND, false).toBool();
@ -38,8 +38,8 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
response.setHeader("Content-Type", "text/html; charset=utf-8");
response.setHeader("Connection", "close");
//QString y = session.get("xxx").toString();
//response.writeText(QString("session xxx : %1 <br/>").arg(y));
// QString y = session.get("xxx").toString();
// response.writeText(QString("session xxx : %1 <br/>").arg(y));
Template t = Static::templateLoader->getTemplate("folder", request.getHeader("Accept-Language"));
t.enableWarnings();
@ -70,14 +70,14 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
QList<LibraryItem *> folderContent = DBHelper::getFolderSubfoldersFromLibrary(libraryId, folderId);
QList<LibraryItem *> folderComics = DBHelper::getFolderComicsFromLibrary(libraryId, folderId);
//response.writeText(libraryName);
// response.writeText(libraryName);
folderContent.append(folderComics);
std::sort(folderContent.begin(), folderContent.end(), LibraryItemSorter());
folderComics.clear();
//qulonglong backId = DBHelper::getParentFromComicFolderId(libraryName,folderId);
// qulonglong backId = DBHelper::getParentFromComicFolderId(libraryName,folderId);
int page = 0;
QByteArray p = request.getParameter("page");
@ -85,8 +85,8 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
page = p.toInt();
// /comicIdi/pagei/comicIdj/pagej/....../comicIdn/pagen
//QString currentPath = session.get("currentPath").toString();
//QStringList pathSize = currentPath.split("/").last().toInt;
// QString currentPath = session.get("currentPath").toString();
// QStringList pathSize = currentPath.split("/").last().toInt;
bool fromUp = false;
@ -94,7 +94,7 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
if (map.contains("up"))
fromUp = true;
//int upPage = 0;
// int upPage = 0;
if (folderId == 1) {
ySession->clearNavigationPath();
@ -103,7 +103,7 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
} else {
if (fromUp)
ySession->popNavigationItem();
else //drill down or direct access
else // drill down or direct access
{
QStack<QPair<qulonglong, quint32>> path = ySession->getNavigationPath();
bool found = false;
@ -135,13 +135,13 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
int elementsPerPage = 24;
int numFolders = folderContent.length();
//int numComics = folderComics.length();
// int numComics = folderComics.length();
int totalLength = folderContent.length() + folderComics.length();
// int numFolderPages = numFolders / elementsPerPage + ((numFolders%elementsPerPage)>0?1:0);
int numPages = totalLength / elementsPerPage + ((totalLength % elementsPerPage) > 0 ? 1 : 0);
//response.writeText(QString("Number of pages : %1 <br/>").arg(numPages));
// response.writeText(QString("Number of pages : %1 <br/>").arg(numPages));
if (page < 0)
page = 0;
@ -151,7 +151,7 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
int indexCurrentPage = page * elementsPerPage;
int numFoldersAtCurrentPage = qMax(0, qMin(numFolders - indexCurrentPage, elementsPerPage));
//PATH
// PATH
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));
@ -184,8 +184,8 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
t.setVariable(QString("element%1.browse").arg(i), QString("<a class =\"browseButton\" href=\"%1\">BROWSE</a>").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id)));
t.setVariable(QString("element%1.cover.browse").arg(i), QString("<a href=\"%1\">").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id)));
t.setVariable(QString("element%1.cover.browse.end").arg(i), "</a>");
//t.setVariable(QString("element%1.url").arg(i),"/library/"+libraryName+"/folder/"+QString("%1").arg(folderContent.at(i + (page*10))->id));
//t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id));
// t.setVariable(QString("element%1.url").arg(i),"/library/"+libraryName+"/folder/"+QString("%1").arg(folderContent.at(i + (page*10))->id));
// t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id));
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) + "/folder/" + QString("%1/info").arg(folderContent.at(i + (page * elementsPerPage))->id)));
t.setVariable(QString("element%1.read").arg(i), "");
@ -197,7 +197,7 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
t.setVariable(QString("element%1.class").arg(i), "cover");
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));
// t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/comic/"+QString("%1").arg(comic->id));
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 (ySession->isComicOnDevice(comic->info.hash))
@ -205,7 +205,7 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
else
t.setVariable(QString("element%1.download").arg(i), QString("<div class=\"importedButton\">IMPORTING</div>"));
//t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png");
// t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png");
t.setVariable(QString("element%1.read").arg(i), QString("<a class =\"readButton\" href=\"%1\">READ</a>").arg("/library/" + QString::number(libraryId) + "/comic/" + QString("%1").arg(comic->id) + "/remote"));
@ -242,12 +242,12 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
int xyz = 1;
for (QList<LibraryItem *>::const_iterator itr = folderContent.constBegin(); itr != folderContent.constEnd(); itr++) {
firstChar = QString((*itr)->name[0]).toUpper();
firstChar = firstChar.normalized(QString::NormalizationForm_D).at(0); //TODO _D or _KD??
firstChar = firstChar.normalized(QString::NormalizationForm_D).at(0); // TODO _D or _KD??
bool ok;
/*int dec = */ firstChar.toInt(&ok, 10);
if (ok)
firstChar = "#";
//response.writeText(QString("%1 - %2 <br />").arg((*itr)->name).arg(xyz));
// response.writeText(QString("%1 - %2 <br />").arg((*itr)->name).arg(xyz));
if (indexCount.contains(firstChar))
indexCount.insert(firstChar, indexCount.value(firstChar) + 1);
else
@ -266,7 +266,7 @@ void FolderController::service(HttpRequest &request, HttpResponse &response)
int count = 0;
int indexPage = 0;
for (QList<QString>::const_iterator itr = index.constBegin(); itr != index.constEnd(); itr++) {
//response.writeText(QString("%1 - %2 <br />").arg(*itr).arg(count));
// response.writeText(QString("%1 - %2 <br />").arg(*itr).arg(count));
t.setVariable(QString("index%1.indexname").arg(i), *itr);
t.setVariable(QString("index%1.url").arg(i), QString("/library/%1/folder/%2?page=%3").arg(libraryId).arg(folderId).arg(indexPage));
i++;

20
YACReaderLibrary/server/controllers/v1/pagecontroller.cpp
View File

@ -25,14 +25,14 @@ void PageController::service(HttpRequest &request, HttpResponse &response)
QString path = QUrl::fromPercentEncoding(request.getPath()).toUtf8();
bool remote = path.endsWith("remote");
//QByteArray path2=request.getPath();
//qDebug("PageController: request to -> %s ",path2.data());
// QByteArray path2=request.getPath();
// qDebug("PageController: request to -> %s ",path2.data());
QStringList pathElements = path.split('/');
qulonglong comicId = pathElements.at(4).toULongLong();
unsigned int page = pathElements.at(6).toUInt();
//qDebug("lib name : %s",pathElements.at(2).data());
// qDebug("lib name : %s",pathElements.at(2).data());
Comic *comicFile;
qulonglong currentComicId;
@ -49,7 +49,7 @@ void PageController::service(HttpRequest &request, HttpResponse &response)
if (currentComicId != 0 && !QPointer<Comic>(comicFile).isNull()) {
if (comicId == currentComicId && page < comicFile->numPages()) {
if (comicFile->pageIsLoaded(page)) {
//qDebug("PageController: La página estaba cargada -> %s ",path.data());
// qDebug("PageController: La página estaba cargada -> %s ",path.data());
response.setHeader("Content-Type", "image/jpeg");
response.setHeader("Transfer-Encoding", "chunked");
QByteArray pageData = comicFile->getRawPage(page);
@ -59,22 +59,22 @@ void PageController::service(HttpRequest &request, HttpResponse &response)
int len = data.readRawData(buffer, 4096);
response.write(QByteArray(buffer, len));
}
//response.write(pageData,true);
// response.write(pageData,true);
response.write(QByteArray(), true);
} else {
//qDebug("PageController: La página NO estaba cargada 404 -> %s ",path.data());
response.setStatus(404, "not found"); //TODO qué mensaje enviar
// qDebug("PageController: La página NO estaba cargada 404 -> %s ",path.data());
response.setStatus(404, "not found"); // TODO qué mensaje enviar
response.write("404 not found", true);
}
} else {
if (comicId != currentComicId) {
//delete comicFile;
// delete comicFile;
if (remote)
ySession->dismissCurrentRemoteComic();
else
ySession->dismissCurrentComic();
}
response.setStatus(404, "not found"); //TODO qué mensaje enviar
response.setStatus(404, "not found"); // TODO qué mensaje enviar
response.write("404 not found", true);
}
} else {
@ -82,5 +82,5 @@ void PageController::service(HttpRequest &request, HttpResponse &response)
response.write("404 not found", true);
}
//response.write(t.toLatin1(),true);
// response.write(t.toLatin1(),true);
}

4
YACReaderLibrary/server/controllers/v1/synccontroller.cpp
View File

@ -38,10 +38,10 @@ void SyncController::service(HttpRequest &request, HttpResponse &response)
ComicInfo info;
info.currentPage = currentPage;
info.hash = hash; //TODO remove the hash check and add UUIDs for libraries
info.hash = hash; // TODO remove the hash check and add UUIDs for libraries
info.id = comicId;
//Client 2.1+ version
// Client 2.1+ version
if (comicInfoProgress.length() > 4) {
currentRating = comicInfoProgress.at(4).toInt();
info.rating = currentRating;

16
YACReaderLibrary/server/controllers/v2/comiccontroller_v2.cpp
View File

@ -41,8 +41,8 @@ void ComicControllerV2::service(HttpRequest &request, HttpResponse &response)
bool remoteComic = path.endsWith("remote");
//TODO
//if(pathElements.size() == 6)
// TODO
// if(pathElements.size() == 6)
//{
// QString action = pathElements.at(5);
// if(!action.isEmpty() && (action == "close"))
@ -51,7 +51,7 @@ void ComicControllerV2::service(HttpRequest &request, HttpResponse &response)
// response.write("",true);
// return;
// }
//}
// }
YACReaderLibraries libraries = DBHelper::getLibraries();
@ -87,10 +87,10 @@ void ComicControllerV2::service(HttpRequest &request, HttpResponse &response)
}
response.setHeader("Content-Type", "text/plain; charset=utf-8");
//TODO this field is not used by the client!
// TODO this field is not used by the client!
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
if (remoteComic) // send previous and next comics id
{
QList<LibraryItem *> siblings = DBHelper::getFolderComicsFromLibrary(libraryId, comic.parentId, false);
@ -116,15 +116,15 @@ void ComicControllerV2::service(HttpRequest &request, HttpResponse &response)
response.write(QString("nextComicHash:%1\r\n").arg(nextComic->info.hash).toUtf8());
}
} else {
//ERROR
// ERROR
}
qDeleteAll(siblings);
}
response.write(comic.toTXT().toUtf8(), true);
} else {
//delete comicFile;
// delete comicFile;
response.setStatus(404, "not found");
response.write("404 not found", true);
}
//response.write(t.toLatin1(),true);
// response.write(t.toLatin1(),true);
}

8
YACReaderLibrary/server/controllers/v2/comiccontrollerinreadinglist_v2.cpp
View File

@ -68,7 +68,7 @@ void ComicControllerInReadingListV2::service(HttpRequest &request, HttpResponse
ySession->setCurrentRemoteComic(comic.id, comicFile);
response.setHeader("Content-Type", "text/plain; charset=utf-8");
//TODO this field is not used by the client!
// TODO this field is not used by the client!
response.write(QString("library:%1\r\n").arg(libraryName).toUtf8());
response.write(QString("libraryId:%1\r\n").arg(libraryId).toUtf8());
@ -94,14 +94,14 @@ void ComicControllerInReadingListV2::service(HttpRequest &request, HttpResponse
response.write(QString("nextComicHash:%1\r\n").arg(nextComic.info.hash).toUtf8());
}
} else {
//ERROR
// ERROR
}
response.write(comic.toTXT().toUtf8(), true);
} else {
//delete comicFile;
// delete comicFile;
response.setStatus(404, "not found");
response.write("404 not found", true);
}
//response.write(t.toLatin1(),true);
// response.write(t.toLatin1(),true);
}

2
YACReaderLibrary/server/controllers/v2/comicdownloadinfocontroller_v2.cpp
View File

@ -22,7 +22,7 @@ void ComicDownloadInfoControllerV2::service(HttpRequest &request, HttpResponse &
ComicDB comic = DBHelper::getComicInfo(libraryId, comicId);
//TODO: check if the comic wasn't found;
// TODO: check if the comic wasn't found;
response.write(QString("fileName:%1\r\n").arg(comic.getFileName()).toUtf8());
response.write(QString("fileSize:%1\r\n").arg(comic.getFileSize()).toUtf8());
response.write(QString("libraryId:%1\r\n").arg(libraryId).toUtf8());

4
YACReaderLibrary/server/controllers/v2/pagecontroller_v2.cpp
View File

@ -53,7 +53,7 @@ void PageControllerV2::service(HttpRequest &request, HttpResponse &response)
}
if (comicFile->hasBeenAnErrorOpening()) {
//delete comicFile;
// delete comicFile;
if (remote)
ySession->dismissCurrentRemoteComic();
else
@ -87,7 +87,7 @@ void PageControllerV2::service(HttpRequest &request, HttpResponse &response)
}
} else {
if (comicId != currentComicId) {
//delete comicFile;
// delete comicFile;
if (remote)
ySession->dismissCurrentRemoteComic();
else

4
YACReaderLibrary/server/controllers/v2/synccontroller_v2.cpp
View File

@ -45,7 +45,7 @@ void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
ComicInfo info;
info.currentPage = currentPage;
info.hash = hash; //TODO remove the hash check and add UUIDs for libraries
info.hash = hash; // TODO remove the hash check and add UUIDs for libraries
info.id = comicId;
currentRating = comicInfoProgress.at(4).toInt();
@ -95,7 +95,7 @@ void SyncControllerV2::service(HttpRequest &request, HttpResponse &response)
response.write(output.toJson(QJsonDocument::Compact), true);
//TODO does it make sense to send these back? The source is not YACReaderLibrary...
// TODO does it make sense to send these back? The source is not YACReaderLibrary...
DBHelper::updateFromRemoteClientWithHash(comicsWithNoLibrary);
} else {