From 5fa46915f9efc33565f0ff68fb2352cff0fd46c9 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 9 Nov 2024 14:08:47 +0100 Subject: Fix MD5sum search in SearchDialog Include files in the quest for md5sums, not only files_origin. While at it, fix some constness warnings in the very same file. --- searchdialog.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/searchdialog.cpp b/searchdialog.cpp index 87a279e..ac5f818 100644 --- a/searchdialog.cpp +++ b/searchdialog.cpp @@ -26,7 +26,6 @@ #include #include "moviepropertiesdialog.h" -#include "smtreeview.h" #include "smtreeitem.h" #include "smtreemodel.h" #include "searchdialog.h" @@ -125,7 +124,7 @@ void FilenamesAndMetadata::search(){ //search md5sums QSqlQuery md5sumQ(db); - md5sumQ.prepare("SELECT tfilename, iseriespart_id, series.tseries_name, seriesparts.tsubtitle FROM files, files_origin, seriesparts, series WHERE files_origin.cmd5sum = :md5 AND files_origin.ifiles_id = files.ifiles_id AND files.iseriespart_id = seriesparts.iseriesparts_id AND seriesparts.iseries_id = series.iseries_id"); + md5sumQ.prepare("SELECT tfilename, iseriespart_id, series.tseries_name, seriesparts.tsubtitle FROM files, files_origin, seriesparts, series WHERE (files_origin.cmd5sum = :md5 OR files.cmd5sum = :md5) AND files_origin.ifiles_id = files.ifiles_id AND files.iseriespart_id = seriesparts.iseriesparts_id AND seriesparts.iseries_id = series.iseries_id"); md5sumQ.bindValue(":md5", mSearch->text()); SmTreeItem *md5Item = new SmTreeItem(QVariantList() << tr("MD5 Sums") << QVariant() << QVariant(), root); root->appendChild(md5Item); @@ -327,7 +326,7 @@ void ActorsAndMore::getGenresForActor(QStandardItem *actorItem){ res << genreQ.value(0).toString(); } if(!res.isEmpty()){ - for(const auto &g : res){ + for(const auto &g : std::as_const(res)){ QStandardItem *cur = new QStandardItem(g); cur->setIcon(icon); cur->setEditable(false); @@ -464,7 +463,7 @@ void ActorsAndMore::getDataForActor(QModelIndex cur){ } QSqlQuery displayQ(db); displayQ.prepare("SELECT series.tseries_name, seriesparts.iseriespart, seriesparts.iseriesparts_id, seriesparts.tsubtitle FROM series, seriesparts WHERE seriesparts.iseriesparts_id = :id AND seriesparts.iseries_id = series.iseries_id"); - for(int part : seriesParts){ + for(int part : std::as_const(seriesParts)){ displayQ.bindValue(":id", part); displayQ.exec(); while(displayQ.next()){ -- cgit v1.2.3-70-g09d2