michael/quill
1
0
Fork 0
mirror of https://github.com/Quill-OS/quill.git synced 2024-12-26 23:57:22 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #40 from Szybet/master

Browse source 
Minor library fixes
This commit is contained in:
Nicolas Mailloux 2022-12-25 19:28:15 -05:00 committed by GitHub
commit 1527a8e579
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/localLibrary/locallibrarywidget.cpp
View file

@ -132,10 +132,18 @@ void localLibraryWidget::setupDatabase() {
QString prog("busybox-initrd"); QString prog("busybox-initrd");
QStringList args; 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; 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);
//}
QProcess *proc = new QProcess(); QProcess *proc = new QProcess();
proc->start(prog, args); proc->start(prog, args);
proc->waitForFinished(-1); proc->waitForFinished(-1);
QJsonDocument jsonDocument = QJsonDocument::fromJson(readFile(global::localLibrary::rawDatabasePath).toUtf8()); 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);
QFile::remove(global::localLibrary::rawDatabasePath); QFile::remove(global::localLibrary::rawDatabasePath);
proc->deleteLater(); proc->deleteLater();
@ -467,10 +475,10 @@ void localLibraryWidget::setupBooksListToggle(int pageNumber) {
void localLibraryWidget::setupBooksListFolders(int pageNumber) { void localLibraryWidget::setupBooksListFolders(int pageNumber) {
log("Showing folders for page: " + QString::number(pageNumber), className); log("Showing folders for page: " + QString::number(pageNumber), className);
QStringList directoryList = QDir(pathForFolders).entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name); 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) { if(mainPathIsEmpty == true) {
// Main path is set and is empty
ui->pageNumberLabel->setText("0 <i>of</i> 0"); ui->pageNumberLabel->setText("0 <i>of</i> 0");
ui->previousPageBtn->setEnabled(false); ui->previousPageBtn->setEnabled(false);
ui->nextPageBtn->setEnabled(false); ui->nextPageBtn->setEnabled(false);
@ -489,7 +497,7 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) {
} }
pageNumberAbove = pageNumberAbove - 1; pageNumberAbove = pageNumberAbove - 1;
} }
log("Front directory list is '" + directoryListFront.join(", ") + "'", className); log("Front directory is '" + directoryListFront.join(", ") + "'", className);
int aboveRemove = pageNumber * buttonsNumber; int aboveRemove = pageNumber * buttonsNumber;
if(directoryListBack.count() > aboveRemove) { if(directoryListBack.count() > aboveRemove) {
@ -499,7 +507,7 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) {
} }
} }
} }
log("Back directory list is '" + directoryListBack.join(", ") + "'", className); log("Back directory list '" + directoryListBack.join(", ") + "'", className);
QStringList directoryListPure; QStringList directoryListPure;
for(QString directory: directoryListFront) { for(QString directory: directoryListFront) {
@ -507,7 +515,7 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) {
directoryListPure.append(directory); directoryListPure.append(directory);
} }
} }
log("Final directory list is '" + directoryListPure.join(", ") + "'", className); log("Final directory list '" + directoryListPure.join(", ") +"'", className);
idList.clear(); idList.clear();
int in = 1; int in = 1;
@ -555,7 +563,8 @@ void localLibraryWidget::setupBooksListFolders(int pageNumber) {
QString coverPath = jsonObject["CoverPath"].toString(); QString coverPath = jsonObject["CoverPath"].toString();
QString bookID = jsonObject["BookID"].toString(); QString bookID = jsonObject["BookID"].toString();
if(!coverPath.isEmpty()) { // To be 100% sure, use QFile
if(QFile(coverPath).exists()) {
// Display book cover if found // Display book cover if found
QPixmap pixmap(coverPath); QPixmap pixmap(coverPath);
bookIconArray[in]->setPixmap(pixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio)); bookIconArray[in]->setPixmap(pixmap.scaled(stdIconWidth, stdIconHeight, Qt::KeepAspectRatio));
@ -785,10 +794,10 @@ void localLibraryWidget::checkIfMainPathIsEmpty() {
if(folderFeatureEnabled == true) { 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 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/") { if(pathForFolders == "/mnt/onboard/onboard/") {
bool isDirectoryEmpty = QDir(pathForFolders).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty(); bool isDirEmpty = QDir(pathForFolders).entryList(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot).isEmpty();
if(isDirectoryEmpty == true) { log("Main path is empty: " + QVariant(isDirEmpty).toString(), className);
if(isDirEmpty == true) {
// To clean things out after a deletion // To clean things out after a deletion
log("Main path is empty", className);
cleanButtons(); cleanButtons();
booksListForPathIndex.clear(); booksListForPathIndex.clear();
directoryListCount = 0; directoryListCount = 0;
@ -849,11 +858,13 @@ void localLibraryWidget::cleanButtons() {
if(bookBtnArray[i]->isHidden() == false) { if(bookBtnArray[i]->isHidden() == false) {
bookBtnArray[i]->hide(); bookBtnArray[i]->hide();
} }
// I like it with those empty lines, like empty book shelves
/*
if(i < buttonsNumber) { if(i < buttonsNumber) {
if(lineArray[i]->isHidden() == false) { if(lineArray[i]->isHidden() == false) {
lineArray[i]->hide(); lineArray[i]->hide();
} }
} }
*/
} }
} }