Ticket #12081: 12081_possible_fix.diff

mythtv/libs/libmyth/programinfo.cpp

@@ -2051 +2051 @@
  *  \brief Checks for duplicates according to dupmethod.
  *  \param other ProgramInfo to compare this one with.
  */
-bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const
+bool ProgramInfo::IsDuplicateProgram(const ProgramInfo& other) const
 {
     if (GetRecordingRuleType() == kOneRecord)
         return recordid == other.recordid;
@@ -2115 +2115 @@
 }
 
 /**
+ *  \brief Checks whether this is the same program as "other", which may or may
+ *         not be a repeat or on another channel. Matches based on programid
+ *         with a fallback to dupmethod
+ *  \param other ProgramInfo to compare this one with.
+ */
+bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const
+{
+    if (title.compare(other.title, Qt::CaseInsensitive) != 0)
+        return false;
+
+    if (!programid.isEmpty() && !other.programid.isEmpty())
+    {
+        if (catType == kCategorySeries)
+        {
+            if (programid.endsWith("0000"))
+                return false;
+        }
+
+        if (usingProgIDAuth)
+        {
+            int index = programid.indexOf('/');
+            int oindex = other.programid.indexOf('/');
+            if (index == oindex && (index < 0 ||
+                programid.leftRef(index) == other.programid.leftRef(oindex)))
+                return programid == other.programid;
+        }
+        else
+        {
+            return programid == other.programid;
+        }
+    }
+
+    if ((dupmethod & kDupCheckSub) &&
+        ((subtitle.isEmpty()) ||
+         (subtitle.compare(other.subtitle, Qt::CaseInsensitive) != 0)))
+        return false;
+
+    if ((dupmethod & kDupCheckDesc) &&
+        ((description.isEmpty()) ||
+         (description.compare(other.description, Qt::CaseInsensitive) != 0)))
+        return false;
+
+    if ((dupmethod & kDupCheckSubThenDesc) &&
+        ((subtitle.isEmpty() &&
+          ((!other.subtitle.isEmpty() &&
+            description.compare(other.subtitle, Qt::CaseInsensitive) != 0) ||
+           (other.subtitle.isEmpty() &&
+            description.compare(other.description, Qt::CaseInsensitive) != 0))) ||
+         (!subtitle.isEmpty() &&
+          ((other.subtitle.isEmpty() &&
+            subtitle.compare(other.description, Qt::CaseInsensitive) != 0) ||
+           (!other.subtitle.isEmpty() &&
+            subtitle.compare(other.subtitle, Qt::CaseInsensitive) != 0)))))
+        return false;
+
+    return true;
+}
+
+/**
  *  \brief Match same program, with same starttime (channel may be different)
  *  \param other ProgramInfo to compare this one with.
  *  \return true if this program is the same and shares same start time as "other" program.

mythtv/libs/libmyth/programinfo.h

@@ -298 +298 @@
     virtual void SubstituteMatches(QString &str);
 
     // Used for scheduling recordings
-    bool IsSameProgram(const ProgramInfo &other) const;
+    bool IsSameProgram(const ProgramInfo &other) const; // Exact same program
+    bool IsDuplicateProgram(const ProgramInfo &other) const; // Is this program considered a duplicate according to rule type and dup method (scheduler only)
     bool IsSameProgramAndStartTime(const ProgramInfo &other) const; // Exact same program and same starttime, Any channel
     bool IsSameTitleStartTimeAndChannel(const ProgramInfo &other) const; // Same title, starttime and channel
     bool IsSameTitleTimeslotAndChannel(const ProgramInfo &other) const;//sched only - Same title, starttime, endtime and channel

mythtv/programs/mythbackend/scheduler.cpp

@@ -1024 +1024 @@
     if (it != cache_is_same_program.end())
         return *it;
 
-    return cache_is_same_program[X] = a->IsSameProgram(*b);
+    return cache_is_same_program[X] = a->IsDuplicateProgram(*b);
 }
 
 bool Scheduler::FindNextConflict(