From b2dfb729de1afcb49b1c70bf8ea42a080a38e8b9 Mon Sep 17 00:00:00 2001
From: sfaulds <sfaulds@connexity.com>
Date: Fri, 25 Aug 2017 18:23:02 +1000
Subject: [PATCH] add setting to show watched items in the recently added lists

---
 .../language/resource.language.en_gb/strings.po  |  4 ++++
 resources/lib/downloadutils.py                   | 16 ++++++++++++++++
 resources/lib/menu_functions.py                  | 10 +++++-----
 resources/lib/widgets.py                         |  6 +++---
 resources/settings.xml                           |  1 +
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 2b57c25..ca44ee5 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -98,6 +98,10 @@ msgctxt "#30026"
 msgid "Widget item select action"
 msgstr ""
 
+msgctxt "#30027"
+msgid "Show unplayed in recently added"
+msgstr ""
+
 msgctxt "#30044"
 msgid "Incorrect Username/Password"
 msgstr ""
diff --git a/resources/lib/downloadutils.py b/resources/lib/downloadutils.py
index de42284..6d14f91 100644
--- a/resources/lib/downloadutils.py
+++ b/resources/lib/downloadutils.py
@@ -325,6 +325,22 @@ class DownloadUtils():
         if url.find("{ItemLimit}") != -1:
             show_x_filtered_items = settings.getSetting("show_x_filtered_items")
             url = url.replace("{ItemLimit}", show_x_filtered_items)
+        if url.find("{IsUnplayed}") != -1 or url.find("{,IsUnplayed}") != -1 or url.find("{IsUnplayed,}") != -1 \
+                or url.find("{,IsUnplayed,}") != -1:
+            show_latest_unplayed = settings.getSetting("show_latest_unplayed") == "true"
+            if show_latest_unplayed:
+                url = url.replace("{IsUnplayed}", "")
+                url = url.replace("{,IsUnplayed}", "")
+                url = url.replace("{IsUnplayed,}", "")
+                url = url.replace("{,IsUnplayed,}", "")
+            elif url.find("{IsUnplayed}") != -1:
+                url = url.replace("{IsUnplayed}", "IsUnplayed")
+            elif url.find("{,IsUnplayed}") != -1:
+                url = url.replace("{,IsUnplayed}", ",IsUnplayed")
+            elif url.find("{IsUnplayed,}") != -1:
+                url = url.replace("{IsUnplayed,}", "IsUnplayed,")
+            elif url.find("{,IsUnplayed,}") != -1:
+                url = url.replace("{,IsUnplayed,}", ",IsUnplayed,")
         log.debug(url)
 
         return_data = "null"
diff --git a/resources/lib/menu_functions.py b/resources/lib/menu_functions.py
index 6fc0838..9d1627b 100644
--- a/resources/lib/menu_functions.py
+++ b/resources/lib/menu_functions.py
@@ -265,7 +265,7 @@ def getCollections(detailsString):
                          '&Fields=' + detailsString +
                          '&SortBy=DateCreated' +
                          '&SortOrder=Descending' +
-                         '&Filters=IsUnplayed,IsNotFolder' +
+                         '&Filters={IsUnplayed,}IsNotFolder' +
                          '&Recursive=true' +
                          '&IncludeItemTypes=Episode' +
                          '&ImageTypeLimit=1' +
@@ -326,7 +326,7 @@ def getCollections(detailsString):
                          '&Fields=' + detailsString +
                          '&SortBy=DateCreated' +
                          '&SortOrder=Descending' +
-                         '&Filters=IsUnplayed,IsNotFolder' +
+                         '&Filters={IsUnplayed,}IsNotFolder' +
                          '&ImageTypeLimit=1' +
                          '&format=json'),
                 'media_type': collection_type})
@@ -377,7 +377,7 @@ def getCollections(detailsString):
                          '&SortBy=DateCreated' +
                          '&Fields=' + detailsString +
                          '&SortOrder=Descending' +
-                         '&Filters=IsUnplayed,IsNotFolder' +
+                         '&Filters={IsUnplayed,}IsNotFolder' +
                          '&IncludeItemTypes=Movie' +
                          '&ImageTypeLimit=1' +
                          '&format=json')
@@ -451,7 +451,7 @@ def getCollections(detailsString):
                          '&SortBy=DateCreated' +
                          '&Fields=' + detailsString +
                          '&SortOrder=Descending' +
-                         '&Filters=IsUnplayed' +
+                         '&Filters={IsUnplayed}' +
                          '&IsVirtualUnaired=false' +
                          '&IsMissing=False' +
                          '&IncludeItemTypes=Episode' +
@@ -483,7 +483,7 @@ def getCollections(detailsString):
                          '&SortBy=DateCreated' +
                          '&Fields=' + detailsString +
                          '&SortOrder=Descending' +
-                         '&Filters=IsUnplayed,IsNotFolder' +
+                         '&Filters={IsUnplayed,}IsNotFolder' +
                          '&IsVirtualUnaired=false' +
                          '&IsMissing=False' +
                          '&IncludeItemTypes=Episode' +
diff --git a/resources/lib/widgets.py b/resources/lib/widgets.py
index 145570e..e521925 100644
--- a/resources/lib/widgets.py
+++ b/resources/lib/widgets.py
@@ -79,7 +79,7 @@ def getWigetContent(handle, params):
         itemsUrl += ("&Recursive=true" +
                      "&SortBy=DateCreated" +
                      "&SortOrder=Descending" +
-                     "&Filters=IsUnplayed,IsNotFolder" +
+                     "&Filters={IsUnplayed,}IsNotFolder" +
                      "&IsVirtualUnaired=false" +
                      "&IsMissing=False" +
                      "&IncludeItemTypes=Movie")
@@ -97,7 +97,7 @@ def getWigetContent(handle, params):
         itemsUrl += ("&Recursive=true" +
                      "&SortBy=Random" +
                      "&SortOrder=Descending" +
-                     "&Filters=IsUnplayed,IsNotFolder" +
+                     "&Filters={IsUnplayed,}IsNotFolder" +
                      "&IsVirtualUnaired=false" +
                      "&IsMissing=False" +
                      "&IncludeItemTypes=Movie")
@@ -106,7 +106,7 @@ def getWigetContent(handle, params):
         itemsUrl += ("&Recursive=true" +
                      "&SortBy=DateCreated" +
                      "&SortOrder=Descending" +
-                     "&Filters=IsUnplayed,IsNotFolder" +
+                     "&Filters={IsUnplayed,}IsNotFolder" +
                      "&IsVirtualUnaired=false" +
                      "&IsMissing=False" +
                      "&IncludeItemTypes=Episode")
diff --git a/resources/settings.xml b/resources/settings.xml
index 1fe4f58..bfbbe4d 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -46,6 +46,7 @@
 		<setting id="include_people" type="bool" label="30183" default="false" visible="true" enable="true" />
 		<setting id="flatten_single_season" type="bool" label="30020" default="true" visible="true" enable="true" />
 		<setting id="show_x_filtered_items" type="slider" label="30018" default="20" range="5,1,100" option="int" visible="true"/>
+		<setting id="show_latest_unplayed" type="bool" label="30027" default="false" visible="true" enable="true" />
 		<setting id="widget_select_action" type="enum" label="30026" lvalues="menu|play" default="0" visible="true"/>
 		<setting id="episode_name_format" type="text" default="{SeriesName} - s{SeasonIndex}e{EpisodeIndex} - {ItemName}" label="30019" />
 	</category>