diff --git a/src/localLibrary/locallibrarywidget.cpp b/src/localLibrary/locallibrarywidget.cpp index 5aac076..d6b9bdb 100644 --- a/src/localLibrary/locallibrarywidget.cpp +++ b/src/localLibrary/locallibrarywidget.cpp @@ -133,17 +133,18 @@ void localLibraryWidget::setupDatabase() { QStringList args; args << "env" << "icon_width_divider=" + QString::number(stdIconWidthDivider - 1.5) << "icon_height_divider=" + QString::number(stdIconHeightDivider - 1.5) << "./explore_local_library.sh" << booksList; - // Logs / steps needed to debug the database creation - //for(int i = 0; i < args.count(); i++) { - // log("arg for database: " + args[i], className); - //} + /* Logs/steps needed to debug the database creation + * for(int i = 0; i < args.count(); i++) { + * log("Arguments for database creation: '" + args[i] + "'", className); + * } + */ QProcess *proc = new QProcess(); proc->start(prog, args); proc->waitForFinished(-1); QJsonDocument jsonDocument = QJsonDocument::fromJson(readFile(global::localLibrary::rawDatabasePath).toUtf8()); - //log("All output of proc: " + proc->readAllStandardOutput(), className); - //log("All err of proc: " + proc->readAllStandardError(), className); + // log("stdout of process: " + proc->readAllStandardOutput(), className); + // log("stderr of process: " + proc->readAllStandardError(), className); QFile::remove(global::localLibrary::rawDatabasePath); proc->deleteLater(); @@ -475,10 +476,10 @@ void localLibraryWidget::setupBooksListToggle(int pageNumber) { void localLibraryWidget::setupBooksListFolders(int pageNumber) { log("Showing folders for page: " + QString::number(pageNumber), className); QStringList directoryList = QDir(pathForFolders).entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); - log("Full directory list is "+ directoryList.join(", ") + "'", className); + log("Full directory list is '" + directoryList.join(", ") + "'", className); - // Main path is set and its empty if(mainPathIsEmpty == true) { + // Main path is set and is empty ui->pageNumberLabel->setText("0 of 0"); ui->previousPageBtn->setEnabled(false); ui->nextPageBtn->setEnabled(false); @@ -497,7 +498,7 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) { } pageNumberAbove = pageNumberAbove - 1; } - log("Front directory is '" + directoryListFront.join(", ") + "'", className); + log("Front directory list is '" + directoryListFront.join(", ") + "'", className); int aboveRemove = pageNumber * buttonsNumber; if(directoryListBack.count() > aboveRemove) { @@ -507,7 +508,7 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) { } } } - log("Back directory list '" + directoryListBack.join(", ") + "'", className); + log("Back directory list is '" + directoryListBack.join(", ") + "'", className); QStringList directoryListPure; for(QString directory: directoryListFront) { @@ -515,7 +516,7 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) { directoryListPure.append(directory); } } - log("Final directory list '" + directoryListPure.join(", ") +"'", className); + log("Final directory list is '" + directoryListPure.join(", ") +"'", className); idList.clear(); int in = 1; @@ -563,7 +564,6 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) { QString coverPath = jsonObject["CoverPath"].toString(); QString bookID = jsonObject["BookID"].toString(); - // To be 100% sure, use QFile if(QFile(coverPath).exists()) { // Display book cover if found QPixmap pixmap(coverPath); @@ -794,9 +794,9 @@ void localLibraryWidget::checkIfMainPathIsEmpty() { if(folderFeatureEnabled == true) { // If the main path is empty, prevent it from freezing and using the CPU at 100% because of a while loop if(pathForFolders == "/mnt/onboard/onboard/") { - bool isDirEmpty = QDir(pathForFolders).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty(); - log("Main path is empty: " + QVariant(isDirEmpty).toString(), className); - if(isDirEmpty == true) { + bool isDirectoryEmpty = QDir(pathForFolders).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty(); + log("Main path is empty: " + QVariant(isDirectoryEmpty).toString(), className); + if(isDirectoryEmpty == true) { // To clean things out after a deletion cleanButtons(); booksListForPathIndex.clear(); @@ -858,13 +858,5 @@ void localLibraryWidget::cleanButtons() { if(bookBtnArray[i]->isHidden() == false) { bookBtnArray[i]->hide(); } - // I like it with those empty lines, like empty book shelves - /* - if(i < buttonsNumber) { - if(lineArray[i]->isHidden() == false) { - lineArray[i]->hide(); - } - } - */ } }