From a3b79646fe6984b0f2203ed9819ba03b0a4db978 Mon Sep 17 00:00:00 2001 From: Arno Date: Tue, 29 Apr 2025 11:27:51 +0200 Subject: Display Genres in ArchiveBrowser This takes quite a toll on the startup time, because it executes an extra Query for each item in the archive, but I hope it's worth it. The final goal being to filter the archive by genres, so uninteresting moves can be moved easier. --- archivebrowsermodel.cpp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'archivebrowsermodel.cpp') diff --git a/archivebrowsermodel.cpp b/archivebrowsermodel.cpp index c6e7d08..da8e316 100644 --- a/archivebrowsermodel.cpp +++ b/archivebrowsermodel.cpp @@ -13,7 +13,7 @@ #include "smglobals.h" #include "helper.h" -ArchiveBrowserModel::ArchiveBrowserModel(const QStringList &headers, QObject *parent) : SmTreeModel(headers, parent), mNumFields(9) { +ArchiveBrowserModel::ArchiveBrowserModel(const QStringList &headers, QObject *parent) : SmTreeModel(headers, parent), mNumFields(10) { mDb = QSqlDatabase::database("treedb"); readConfig(); populate(); @@ -52,6 +52,9 @@ QVariant ArchiveBrowserModel::data(const QModelIndex &index, int role) const { if(role == SelectedRole){ return item->data(Selected); } + if(role == GenreRole){ + return item->data(Genres); + } if(role == Qt::ForegroundRole){ if(col == TotalSize){ qint64 s = item->data(TotalSize).toLongLong(); @@ -162,6 +165,8 @@ void ArchiveBrowserModel::populate(){ mAvailableQualities.clear(); QSqlQuery localFilesQ(mDb); localFilesQ.prepare("SELECT tfilename, bisize, sifiletype, siquality, ifiles_id, cmd5sum FROM files WHERE iseriespart_id = :sid ORDER BY sifiletype"); + QSqlQuery localGenresQ(mDb); + localGenresQ.prepare("SELECT seriesparts_genremap.igenres_id, genres.tgenrename FROM seriesparts_genremap, genres WHERE iseriesparts_id = :sid AND seriesparts_genremap.igenres_id = genres.igenres_id ORDER BY genres.tgenrename ASC"); QSqlQuery localQ = QSqlQuery("SELECT DISTINCT(series.iseries_id), tseries_name, seriesparts.iseriespart, seriesparts.tsubtitle, seriesparts.iseriesparts_id FROM series LEFT JOIN seriesparts ON series.iseries_id = seriesparts.iseries_id LEFT JOIN files ON seriesparts.iseriesparts_id = files.iseriespart_id WHERE files.sifiletype = 1 AND files.idvd < 1 AND seriesparts.bfavorite = false ORDER BY tseries_name ASC", mDb); while(localQ.next()){ QList serPartData; @@ -171,16 +176,17 @@ void ArchiveBrowserModel::populate(){ }else{ name = QString("%1 - %2").arg(localQ.value(1).toString(), localQ.value(3).toString()); } - serPartData << QChar(0x26A4) << name << localQ.value(4) << SeriesPartNode << QVariant() << QVariant() << QVariant() << QString() << false; + serPartData << QChar(0x26A4) << name << localQ.value(4) << SeriesPartNode << QVariant() << QVariant() << QVariant() << QString() << false << QVariant(); SmTreeItem *seriesItem = new SmTreeItem(serPartData, rootItem); rootItem->appendChild(seriesItem); localFilesQ.bindValue(":sid", localQ.value(4)); localFilesQ.exec(); qint64 totalSize = 0; int quality = -1; + QStringList genres; while(localFilesQ.next()){ QList fileData; - fileData << QVariant() << localFilesQ.value(0) << localFilesQ.value(4) << FileNode << localFilesQ.value(1) << localFilesQ.value(3) << localFilesQ.value(2) << Helper::createArchivePath(localFilesQ.value(0).toString(), localFilesQ.value(5).toString()) << false; + fileData << QVariant() << localFilesQ.value(0) << localFilesQ.value(4) << FileNode << localFilesQ.value(1) << localFilesQ.value(3) << localFilesQ.value(2) << Helper::createArchivePath(localFilesQ.value(0).toString(), localFilesQ.value(5).toString()) << false << QVariant(); totalSize += localFilesQ.value(1).toDouble(); if(localFilesQ.value(2) == FT_MOVIE){ int q = localFilesQ.value(3).toInt(); @@ -192,8 +198,14 @@ void ArchiveBrowserModel::populate(){ SmTreeItem *fileItem = new SmTreeItem(fileData, seriesItem); seriesItem->appendChild(fileItem); } + localGenresQ.bindValue(":sid", localQ.value(4)); + localGenresQ.exec(); + while(localGenresQ.next()){ + genres << localGenresQ.value(1).toString(); + } seriesItem->setData(Quality, quality); seriesItem->setData(TotalSize, totalSize); + seriesItem->setData(Genres, QVariant(genres)); } setRoot(rootItem); emit populated(); -- cgit v1.2.3-70-g09d2