diff --git a/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp b/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp index 0ba2ff78..4c791f3a 100644 --- a/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/v1/foldercontroller.cpp @@ -30,8 +30,6 @@ 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 settings->beginGroup("libraryConfig"); - bool showlessInfoPerFolder = settings->value(REMOTE_BROWSE_PERFORMANCE_WORKAROUND, false).toBool(); - HttpSession session = Static::sessionStore->getSession(request, response, false); YACReaderHttpSession *ySession = Static::yacreaderSessionStore->getYACReaderSessionHttpSession(session.getId()); @@ -170,16 +168,12 @@ void FolderController::service(HttpRequest &request, HttpResponse &response) if (item->isDir()) { t.setVariable(QString("element%1.class").arg(i), "folder"); - if (showlessInfoPerFolder) { + QList children = DBHelper::getFolderComicsFromLibrary(libraryId, item->id); + if (children.length() > 0) { + const ComicDB *comic = static_cast(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)); + } else t.setVariable(QString("element%1.image.url").arg(i), "/images/f.png"); - } else { - QList children = DBHelper::getFolderComicsFromLibrary(libraryId, item->id); - if (children.length() > 0) { - const ComicDB *comic = static_cast(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)); - } else - t.setVariable(QString("element%1.image.url").arg(i), "/images/f.png"); - } t.setVariable(QString("element%1.browse").arg(i), QString("BROWSE").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id))); t.setVariable(QString("element%1.cover.browse").arg(i), QString("").arg(QString("/library/%1/folder/%2").arg(libraryId).arg(item->id))); diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp index 4a11b4be..4c7fdbcb 100644 --- a/YACReaderLibrary/server_config_dialog.cpp +++ b/YACReaderLibrary/server_config_dialog.cpp @@ -85,11 +85,6 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent) check->setText(tr("enable the server")); check->setStyleSheet("QCheckBox {color:#262626; font-size:13px; font-family: Arial;}"); - performanceWorkaroundCheck = new QCheckBox(this); - performanceWorkaroundCheck->move(332, 354); - performanceWorkaroundCheck->setText(tr("display less information about folders in the browser\nto improve the performance")); - performanceWorkaroundCheck->setStyleSheet("QCheckBox {color:#262626; font-size:13px; font-family: Arial;}"); - // set black background QPalette palette; QImage image(":/images/serverConfigBackground.png"); @@ -113,12 +108,9 @@ ServerConfigDialog::ServerConfigDialog(QWidget *parent) check->setChecked(false); } - performanceWorkaroundCheck->setChecked(settings->value(REMOTE_BROWSE_PERFORMANCE_WORKAROUND, false).toBool()); - settings->endGroup(); connect(check, &QCheckBox::stateChanged, this, &ServerConfigDialog::enableServer); - connect(performanceWorkaroundCheck, &QCheckBox::stateChanged, this, &ServerConfigDialog::enableperformanceWorkaround); } void ServerConfigDialog::enableServer(int status) @@ -144,19 +136,6 @@ void ServerConfigDialog::enableServer(int status) settings->endGroup(); } -void ServerConfigDialog::enableperformanceWorkaround(int status) -{ - 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"); - - if (status == Qt::Checked) { - settings->setValue(REMOTE_BROWSE_PERFORMANCE_WORKAROUND, true); - } else { - settings->setValue(REMOTE_BROWSE_PERFORMANCE_WORKAROUND, false); - } - settings->endGroup(); -} - void ServerConfigDialog::generateQR() { ip->clear(); diff --git a/YACReaderLibrary/server_config_dialog.h b/YACReaderLibrary/server_config_dialog.h index 8ab8dd83..34e51c76 100644 --- a/YACReaderLibrary/server_config_dialog.h +++ b/YACReaderLibrary/server_config_dialog.h @@ -19,7 +19,6 @@ private: QLineEdit *port; QCheckBox *check; - QCheckBox *performanceWorkaroundCheck; QPushButton *close; QPushButton *accept; @@ -30,7 +29,6 @@ public slots: void generateQR(const QString &serverAddress); void regenerateQR(const QString &ip); void enableServer(int status); - void enableperformanceWorkaround(int status); void updatePort(); signals: void portChanged(QString port); diff --git a/common/yacreader_global.h b/common/yacreader_global.h index 5dd34d3b..43a72a13 100644 --- a/common/yacreader_global.h +++ b/common/yacreader_global.h @@ -8,7 +8,6 @@ #define VERSION "9.12.0" -#define REMOTE_BROWSE_PERFORMANCE_WORKAROUND "REMOTE_BROWSE_PERFORMANCE_WORKAROUND" #define IMPORT_COMIC_INFO_XML_METADATA "IMPORT_COMIC_INFO_XML_METADATA" #define NUM_DAYS_BETWEEN_VERSION_CHECKS "NUM_DAYS_BETWEEN_VERSION_CHECKS"