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

Local library: Allow opening books which have spaces in filenames

Browse source 
This commit also fixes a segmentation fault that would be caused when deleting libraryWidget (Gutenberg) that first appeared in 4a104522f5.

TODO: Handle what happens when there are no books in the library
TODO: Re-generate database upon exiting USBMS session or books download (libraryWidget)
TODO: Adjust various icon width/height variables depending on the device
This commit is contained in:
Nicolas Mailloux 2022-06-27 02:40:34 -04:00
parent 9faa465cce
commit 8708246065
3 changed files with 46 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
locallibrarywidget.cpp
View file

@ -20,24 +20,24 @@ localLibraryWidget::localLibraryWidget(QWidget *parent) :
ui->pageNumberLabel->setFont(QFont("Source Serif Pro")); ui->pageNumberLabel->setFont(QFont("Source Serif Pro"));
ui->verticalLayout->setSpacing(4); ui->verticalLayout->setSpacing(4);
if(global::deviceID == "n705\n" or global::deviceID == "n905\n") { if(global::deviceID == "n705\n") {
buttonsNumber = 4; buttonsNumber = 3;
} }
else if(global::deviceID == "n613\n" or global::deviceID == "n236\n" or global::deviceID == "n306\n") { else if(global::deviceID == "n873\n") {
buttonsNumber = 5;
}
else if(global::deviceID == "n437\n" or global::deviceID == "n873\n") {
buttonsNumber = 5; buttonsNumber = 5;
} }
else { else {
buttonsNumber = 4; buttonsNumber = 4;
} }
if(global::deviceID == "n873\n") { if(global::deviceID == "n705\n") {
bookTitleTruncateThreshold = 50; bookTitleTruncateThreshold = 30;
}
else if(global::deviceID == "n873\n") {
bookTitleTruncateThreshold = 45;
} }
else { else {
bookTitleTruncateThreshold = 40; bookTitleTruncateThreshold = 35;
} }
bookIconArray.resize(buttonsNumber); bookIconArray.resize(buttonsNumber);
@ -49,8 +49,36 @@ localLibraryWidget::localLibraryWidget(QWidget *parent) :
sW = QGuiApplication::screens()[0]->size().width(); sW = QGuiApplication::screens()[0]->size().width();
sH = QGuiApplication::screens()[0]->size().height(); sH = QGuiApplication::screens()[0]->size().height();
stdIconWidth = sW / 9.5; if(global::deviceID == "n705\n" or global::deviceID == "n905\n" or global::deviceID == "kt\n") {
stdIconHeight = sH / 9.5; stdIconWidthDivider = 9.5;
stdIconHeightDivider = 9.5;
stdIconWidth = sW / stdIconWidthDivider;
stdIconHeight = sH / stdIconHeightDivider;
}
else if(global::deviceID == "n613\n" or global::deviceID == "n236\n" or global::deviceID == "n306\n") {
stdIconWidthDivider = 8.5;
stdIconHeightDivider = 8.5;
stdIconWidth = sW / stdIconWidthDivider;
stdIconWidth = sH / stdIconHeightDivider;
}
else if(global::deviceID == "n437\n") {
stdIconWidthDivider = 7.5;
stdIconHeightDivider = 7.5;
stdIconWidth = sW / stdIconWidthDivider;
stdIconHeight = sH / stdIconHeightDivider;
}
else if(global::deviceID == "n873\n") {
stdIconWidthDivider = 7.5;
stdIconHeightDivider = 7.5;
stdIconWidth = sW / stdIconWidthDivider;
stdIconHeight = sH / stdIconHeightDivider;
}
else {
stdIconWidthDivider = 9.5;
stdIconHeightDivider = 9.5;
stdIconWidth = sW / stdIconWidthDivider;
stdIconHeight = sH / stdIconHeightDivider;
}
for(int i = 1; i <= buttonsNumber; i++) { for(int i = 1; i <= buttonsNumber; i++) {
// Horizontal layout that will contain the book button and its icon // Horizontal layout that will contain the book button and its icon
@ -91,6 +119,7 @@ localLibraryWidget::~localLibraryWidget()
} }
void localLibraryWidget::setupDatabase() { void localLibraryWidget::setupDatabase() {
QString localLibraryDatabasePathRaw = "/inkbox/LocalLibrary.db.raw";
QString localLibraryDatabasePath = "/mnt/onboard/onboard/.inkbox/LocalLibrary.db"; QString localLibraryDatabasePath = "/mnt/onboard/onboard/.inkbox/LocalLibrary.db";
setDefaultWorkDir(); setDefaultWorkDir();
if(!QFile::exists(localLibraryDatabasePath)) { if(!QFile::exists(localLibraryDatabasePath)) {
@ -111,11 +140,12 @@ void localLibraryWidget::setupDatabase() {
QString prog("busybox-initrd"); QString prog("busybox-initrd");
QStringList args; QStringList args;
args << "sh" << "explore_local_library.sh" << booksList; args << "env" << "icon_width_divider=" + QString::number(stdIconWidthDivider) << "icon_height_divider=" + QString::number(stdIconHeightDivider) << "./explore_local_library.sh" << booksList;
QProcess *proc = new QProcess(); QProcess *proc = new QProcess();
proc->start(prog, args); proc->start(prog, args);
proc->waitForFinished(); proc->waitForFinished();
QJsonDocument jsonDocument = QJsonDocument::fromJson(proc->readAllStandardOutput()); QJsonDocument jsonDocument = QJsonDocument::fromJson(readFile(localLibraryDatabasePathRaw).toUtf8());
QFile::remove(localLibraryDatabasePathRaw);
proc->deleteLater(); proc->deleteLater();
// Write database in compressed form, encoded in Base64 format // Write database in compressed form, encoded in Base64 format

2
locallibrarywidget.h
View file

@ -23,6 +23,8 @@ public:
int buttonsNumber; int buttonsNumber;
int sW; int sW;
int sH; int sH;
float stdIconWidthDivider;
float stdIconHeightDivider;
int stdIconWidth; int stdIconWidth;
int stdIconHeight; int stdIconHeight;
QJsonDocument databaseJsonDocument; QJsonDocument databaseJsonDocument;

2
mainwindow.cpp
View file

@ -934,7 +934,7 @@ void MainWindow::on_libraryButton_clicked()
ui->libraryButton->setIcon(QIcon(":/resources/online-library-inverted.png")); ui->libraryButton->setIcon(QIcon(":/resources/online-library-inverted.png"));
// Create widget // Create widget
libraryWidget * libraryWidgetWindow = new libraryWidget(); libraryWidgetWindow = new libraryWidget();
connect(libraryWidgetWindow, SIGNAL(destroyed(QObject*)), SLOT(resetFullWindow())); connect(libraryWidgetWindow, SIGNAL(destroyed(QObject*)), SLOT(resetFullWindow()));
libraryWidgetWindow->setAttribute(Qt::WA_DeleteOnClose); libraryWidgetWindow->setAttribute(Qt::WA_DeleteOnClose);
ui->stackedWidget->insertWidget(3, libraryWidgetWindow); ui->stackedWidget->insertWidget(3, libraryWidgetWindow);