From 05b84b6e20c910d7c6e1cfe76c7f4a9a90c59ce8 Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:23:02 +0200
Subject: [PVR] Fix CPVRTimers::UpdateEntries: Delete existing epg-based local
 timers if the respective EPG tag does no longer exist.

---
 xbmc/pvr/timers/PVRTimers.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/xbmc/pvr/timers/PVRTimers.cpp b/xbmc/pvr/timers/PVRTimers.cpp
index 3f98227fa4..b01e678209 100644
--- a/xbmc/pvr/timers/PVRTimers.cpp
+++ b/xbmc/pvr/timers/PVRTimers.cpp
@@ -551,6 +551,12 @@ bool CPVRTimers::UpdateEntries(int iMaxNotificationDelay)
                 }
               }
             }
+            else if (!timer->IsTimerRule())
+            {
+              // epg event no longer present. delete the timer
+              bDeleteTimer = true;
+              timer->DeleteFromDatabase();
+            }
           }
         }
 
-- 
cgit v1.2.3


From 4b20052e59dff894ca111c0027aab5c809b7618c Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sat, 29 Jun 2024 17:55:55 +0200
Subject: [PVR] Fix CPVRTimers::UpdateEntries: Delete existing epg-based local
 timers if the respective EPG tag was re-used for an unrelated event that no
 longer matches the related timer rule.

---
 xbmc/pvr/timers/PVRTimers.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/xbmc/pvr/timers/PVRTimers.cpp b/xbmc/pvr/timers/PVRTimers.cpp
index b01e678209..9c848239dc 100644
--- a/xbmc/pvr/timers/PVRTimers.cpp
+++ b/xbmc/pvr/timers/PVRTimers.cpp
@@ -550,6 +550,23 @@ bool CPVRTimers::UpdateEntries(int iMaxNotificationDelay)
                   timer->Persist();
                 }
               }
+
+              // check for epg tag uids that were re-used for a different event (which is actually
+              // an add-on/a backend bug)
+              if (!timer->IsTimerRule() && (epgTag->Title() != timer->Title()))
+              {
+                const std::shared_ptr<CPVRTimerInfoTag> parent{GetTimerRule(timer)};
+                if (parent)
+                {
+                  const CPVRTimerRuleMatcher matcher{parent, now};
+                  if (!matcher.Matches(epgTag))
+                  {
+                    // epg event no longer matches the rule. delete the timer
+                    bDeleteTimer = true;
+                    timer->DeleteFromDatabase();
+                  }
+                }
+              }
             }
             else if (!timer->IsTimerRule())
             {
-- 
cgit v1.2.3


From 50dde2a959d5ced1569a26abf4bb956512c1cc1e Mon Sep 17 00:00:00 2001
From: ksooo <3226626+ksooo@users.noreply.github.com>
Date: Sat, 29 Jun 2024 21:04:03 +0200
Subject: [PVR] Fix CPVRTimers::UpdateEntries: Re-insert timers with changed
 start time before checking whether new children for local timer rules need to
 be created. The timers with changed start time need to be found during that
 check. This fixes creation of duplicate timers.

---
 xbmc/pvr/timers/PVRTimers.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xbmc/pvr/timers/PVRTimers.cpp b/xbmc/pvr/timers/PVRTimers.cpp
index 9c848239dc..a2b9e91c70 100644
--- a/xbmc/pvr/timers/PVRTimers.cpp
+++ b/xbmc/pvr/timers/PVRTimers.cpp
@@ -668,6 +668,13 @@ bool CPVRTimers::UpdateEntries(int iMaxNotificationDelay)
       ++it;
   }
 
+  // reinsert timers with changed timer start
+  for (const auto& timer : timersToReinsert)
+  {
+    InsertEntry(timer);
+    timer->Persist();
+  }
+
   // create new children of local epg-based reminder timer rules
   for (const auto& epgMapEntry : epgMap)
   {
@@ -694,14 +701,7 @@ bool CPVRTimers::UpdateEntries(int iMaxNotificationDelay)
     }
   }
 
-  // reinsert timers with changed timer start
-  for (const auto& timer : timersToReinsert)
-  {
-    InsertEntry(timer);
-    timer->Persist();
-  }
-
-  // insert new children of time-based local timer rules
+  // persist and insert/update new children of local time-based and epg-based reminder timer rules
   for (const auto& timerPair : childTimersToInsert)
   {
     PersistAndUpdateLocalTimer(timerPair.second, timerPair.first);
-- 
cgit v1.2.3