From: APTX <marek321@gmail.com>
Date: Sun, 21 Apr 2013 16:51:41 +0000 (+0200)
Subject: Account for file/ep relations in firstUnwatched* methods.
X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=f6213786ef69d1de3161b3b789a58926636a5b2c;p=localmylist.git

Account for file/ep relations in firstUnwatched* methods.
---

diff --git a/localmylist/database.cpp b/localmylist/database.cpp
index b5399ce..aba2447 100644
--- a/localmylist/database.cpp
+++ b/localmylist/database.cpp
@@ -96,7 +96,12 @@ OpenFileData Database::firstUnwatchedByExactTitle(const QString &title)
 	"	WHERE f.my_watched IS NULL "
 	"		AND lower(at.title) = lower(:title) "
 	"		AND fl.path IS NOT NULL "
-	"		AND NOT EXISTS (SELECT 1 FROM file WHERE eid = e.eid AND my_watched IS NOT NULL LIMIT 1) "
+	"		AND NOT EXISTS ( "
+	"			SELECT 1 FROM file WHERE eid = e.eid AND my_watched IS NOT NULL "
+	"			UNION "
+	"			SELECT 1 FROM file f "
+	"				JOIN file_episode_rel fer ON fer.eid = e.eid AND f.fid = fer.fid "
+	"				WHERE my_watched IS NOT NULL) "
 	"ORDER BY epno ASC ");
 	q.bindValue(":title", title);
 
@@ -121,8 +126,12 @@ OpenFileData Database::firstUnwatchedByTitle(const QString &title)
 	"	WHERE f.my_watched IS NULL "
 	"		AND at.title ILIKE :fuzzyTitle "
 	"		AND fl.path IS NOT NULL "
-	"		AND NOT EXISTS (SELECT 1 FROM file WHERE eid = e.eid AND my_watched IS NOT NULL LIMIT 1) "
-	"GROUP BY f.fid, a.title_romaji, e.title_english, e.epno, fl.path, fl.host_id "
+	"			AND NOT EXISTS ( "
+	"			SELECT 1 FROM file WHERE eid = e.eid AND my_watched IS NOT NULL "
+	"			UNION "
+	"			SELECT 1 FROM file f "
+	"				JOIN file_episode_rel fer ON fer.eid = e.eid AND f.fid = fer.fid "
+	"				WHERE my_watched IS NOT NULL) "
 	"ORDER BY epno ASC ");
 	q.bindValue(":fuzzyTitle", "%" + title + "%");