Refs #1355, Refs #1356 - Fix problem with DVR dup detect.

I have completely removed global duplicate detection at this stage until
such time as I can do things properly. This means a user can ALWAYS manually
override and force a recording of a show.

For now duplicate detection only exists within the context or a series
link. So it will only record the "first?" instance of a given episode in
a give series link.

This is still a bit of a hack until I provide the user with the ability
to control the configuration and implement all the hooks properly.

diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index e4902d9227d23b32f954cdc320bee0cd0227b138..4eff0435a78620997b3d39dbdb8bc0ab37274bc4 100644 (file)
--- a/src/dvr/dvr_autorec.c
+++ b/src/dvr/dvr_autorec.c
@@ -562,14 +562,10 @@ void
 dvr_autorec_check_event(epg_broadcast_t *e)
 {
   dvr_autorec_entry_t *dae;
-  dvr_entry_t *existingde;
 
   TAILQ_FOREACH(dae, &autorec_entries, dae_link)
-    if(autorec_cmp(dae, e)) {
-      existingde = dvr_entry_find_by_event_fuzzy(e);
-      if (existingde == NULL)
-        dvr_entry_create_by_autorec(e, dae);
-    }
+    if(autorec_cmp(dae, e))
+      dvr_entry_create_by_autorec(e, dae);
   // Note: no longer updating event here as it will be done from EPG
   //       anyway
 }

diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index b26b51ce6bae36fcee9985400a313b982e6c14b4..fe53120e98b1324704d2834ac861703ee1597c3a 100644 (file)
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -258,19 +258,6 @@ static dvr_entry_t *_dvr_entry_create (
     if(de->de_start == start && de->de_sched_state != DVR_COMPLETED)
       return NULL;
 
-  /* Reject duplicate episodes (unless earlier) */
-  if (e && cfg->dvr_dup_detect_episode) {
-    de = dvr_entry_find_by_episode(e);
-    if (de) {
-      if (de->de_start > start) {
-        dvr_event_replaced(de->de_bcast, e);
-        return de;
-      } else {
-        return NULL;
-      }
-    }
-  }
-
   de = calloc(1, sizeof(dvr_entry_t));
   de->de_id = ++de_tally;