added: search filter "Title (Movie)" in movieset tab

DanCooper · Sep 25, 2017 · 74014b0 · 74014b0
1 parent 96794b5
commit 74014b0
Show file tree

Hide file tree

Showing 7 changed files with 426 additions and 358 deletions.
diff --git a/EmberAPI/DB/MyVideosDBSQL.txt b/EmberAPI/DB/MyVideosDBSQL.txt
@@ -788,7 +788,8 @@ CREATE VIEW setslist
         fanart.url AS FanartPath,
         landscape.url AS LandscapePath,
         poster.url AS PosterPath,
-        COUNT(setlinkmovie.idMovie) AS 'Count'
+        COUNT(setlinkmovie.idMovie) AS 'Count',
+        GROUP_CONCAT(DISTINCT movies.Title) AS 'MovieTitles'
         FROM
         sets
         LEFT OUTER JOIN art AS banner ON (banner.media_id = sets.idSet)
@@ -812,7 +813,8 @@ CREATE VIEW setslist
         LEFT OUTER JOIN art AS poster ON (poster.media_id = sets.idSet)
         AND (poster.media_type = 'set')
         AND (poster.type = 'poster')
-        LEFT OUTER JOIN setlinkmovie ON sets.idSet = setlinkmovie.idSet
+        LEFT OUTER JOIN setlinkmovie AS setlink ON (setlink.idSet = sets.idSet)
+        LEFT OUTER JOIN movie AS movies ON (movies.idMovie = setlink.idMovie)
         GROUP BY sets.idSet;
 
 CREATE VIEW seasonslist

diff --git a/EmberAPI/DB/MyVideosDBSQL_v45_Patch.xml b/EmberAPI/DB/MyVideosDBSQL_v45_Patch.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+<CommandFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <transaction name="MyVideosDBSQL_v45_to_v46">
+    <command type="DB">
+      <description>added MovieTitles to view setslist</description>
+      <execute>
+        DROP VIEW setslist;
+
+        CREATE VIEW setslist
+        AS
+        SELECT
+        sets.*,
+        banner.url AS BannerPath,
+        clearart.url AS ClearArtPath,
+        clearlogo.url AS ClearLogoPath,
+        discart.url AS DiscArtPath,
+        fanart.url AS FanartPath,
+        landscape.url AS LandscapePath,
+        poster.url AS PosterPath,
+        COUNT(setlink.idMovie) AS 'Count',
+        GROUP_CONCAT(DISTINCT movies.Title) AS 'MovieTitles'
+        FROM
+        sets
+        LEFT OUTER JOIN art AS banner ON (banner.media_id = sets.idSet)
+        AND (banner.media_type = 'set')
+        AND (banner.type = 'banner')
+        LEFT OUTER JOIN art AS clearart ON (clearart.media_id = sets.idSet)
+        AND (clearart.media_type = 'set')
+        AND (clearart.type = 'clearart')
+        LEFT OUTER JOIN art AS clearlogo ON (clearlogo.media_id = sets.idSet)
+        AND (clearlogo.media_type = 'set')
+        AND (clearlogo.type = 'clearlogo')
+        LEFT OUTER JOIN art AS discart ON (discart.media_id = sets.idSet)
+        AND (discart.media_type = 'set')
+        AND (discart.type = 'discart')
+        LEFT OUTER JOIN art AS fanart ON (fanart.media_id = sets.idSet)
+        AND (fanart.media_type = 'set')
+        AND (fanart.type = 'fanart')
+        LEFT OUTER JOIN art AS landscape ON (landscape.media_id = sets.idSet)
+        AND (landscape.media_type = 'set')
+        AND (landscape.type = 'landscape')
+        LEFT OUTER JOIN art AS poster ON (poster.media_id = sets.idSet)
+        AND (poster.media_type = 'set')
+        AND (poster.type = 'poster')
+        LEFT OUTER JOIN setlinkmovie AS setlink ON (setlink.idSet = sets.idSet)
+        LEFT OUTER JOIN movie AS movies ON (movies.idMovie = setlink.idMovie)
+        GROUP BY sets.idSet;
+      </execute>
+    </command>
+  </transaction>
+  <noTransaction type="">
+  </noTransaction>
+<!-- 
+  <noTransaction type="DB">
+    <description>nd1</description>
+    <execute>ne1</execute>
+  </noTransaction>
+-->
+</CommandFile>
diff --git a/EmberAPI/EmberAPI.vbproj b/EmberAPI/EmberAPI.vbproj
@@ -443,6 +443,10 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="DB\MyVideosDBSQL_v45_Patch.xml">
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <Content Include="Defaults\DefaultAdvancedSettings - AudioFormatConverts.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

diff --git a/EmberAPI/clsAPIDatabase.vb b/EmberAPI/clsAPIDatabase.vb
@@ -814,7 +814,7 @@ Public Class Database
     Public Function Connect_MyVideos() As Boolean
 
         'set database version
-        Dim MyVideosDBVersion As Integer = 45
+        Dim MyVideosDBVersion As Integer = 46
 
         'set database filename
         Dim MyVideosDB As String = String.Format("MyVideos{0}.emm", MyVideosDBVersion)