Ticket #13159: mythtv-13159-PreferExactTitleMatchesForMetadata2.patch

mythtv/libs/libmythmetadata/metadatacommon.cpp

@@ -219 +219 @@
     m_artwork(artwork),
     m_downloads(downloads)
 {
+    QString manRecSuffix = QString(" (%1)").arg(QObject::tr("Manual Record"));
+    m_base_title = title;
+    m_base_title.replace(manRecSuffix,"");
 }
 
 // ProgramInfo-style constructor
@@ -312 +315 @@
     m_popularity = 0;
     m_budget = 0;
     m_revenue = 0;
+    QString manRecSuffix = QString(" (%1)").arg(QObject::tr("Manual Record"));
+    m_base_title = title;
+    m_base_title.replace(manRecSuffix,"");
 }
 
 // XBMC NFO-style constructor
@@ -388 +394 @@
     m_artwork(artwork),
     m_downloads(downloads)
 {
+    QString manRecSuffix = QString(" (%1)").arg(QObject::tr("Manual Record"));
+    m_base_title = title;
+    m_base_title.replace(manRecSuffix,"");
 }
 
 MetadataLookup::~MetadataLookup()

mythtv/libs/libmythmetadata/metadatadownload.cpp

@@ -97 +97 @@
             lookup->GetType() == kMetadataRecording)
         {
             if (lookup->GetSubtype() == kProbableTelevision)
+            {
                 list = handleTelevision(lookup);
+                if (findExactMatchWithArtCount(list, lookup->GetBaseTitle()) == 0)
+                {
+                    // There are no exact match prospects with artwork from TV search,
+                    // so add in movies, where we might find a better match.
+                    list.append(handleMovie(lookup));
+                }
+            }
             else if (lookup->GetSubtype() == kProbableMovie)
+            {
                 list = handleMovie(lookup);
+                if (findExactMatchWithArtCount(list, lookup->GetBaseTitle()) == 0)
+                {
+                    // There are no exact match prospects with artwork from Movie search
+                    // so add in television, where we might find a better match.
+                    list.append(handleTelevision(lookup));
+                }
+            }
             else
             {
                 // will try both movie and TV
@@ -199 +215 @@
     RunEpilog();
 }
 
+unsigned int MetadataDownload::findExactMatchWithArtCount(MetadataLookupList list,
+                                                          const QString &originaltitle) const
+{
+    unsigned int exactMatchesWithArt = 0;
+
+    for (MetadataLookupList::const_iterator i = list.begin();
+            i != list.end(); ++i)
+    {
+        QString title = (*i)->GetTitle();
+        // Consider exact title matches (ignoring case)
+        if ((QString::compare(title, originaltitle, Qt::CaseInsensitive) == 0))
+        {
+            // In lookup by name, the television database tends to only include Banner artwork.
+            // In lookup by name, the movie database tends to include only Fan and Cover artwork.
+            if ((((*i)->GetArtwork(kArtworkFanart)).size() != 0) ||
+                (((*i)->GetArtwork(kArtworkCoverart)).size() != 0) ||
+                (((*i)->GetArtwork(kArtworkBanner)).size() != 0))
+            {
+                exactMatchesWithArt++;
+            }
+        }
+    }
+    return exactMatchesWithArt;
+}
+
 MetadataLookup* MetadataDownload::findBestMatch(MetadataLookupList list,
                                             const QString &originaltitle) const
 {
     QStringList titles;
     MetadataLookup *ret = NULL;
+    QDate exactTitleDate;
 
     // Build a list of all the titles
     int exactMatches = 0;
     for (MetadataLookupList::const_iterator i = list.begin();
             i != list.end(); ++i)
     {
-        QString title = (*i)->GetBaseTitle();
-        if (title == originaltitle)
+        QString title = (*i)->GetTitle();
+        LOG(VB_GENERAL, LOG_INFO, QString("Comparing metadata title '%1' [%2] to recording title '%3'")
+                .arg(title)
+                .arg((*i)->GetReleaseDate().toString())
+                .arg(originaltitle));
+        // Consider exact title matches (ignoring case), which have some artwork available.
+        if ((QString::compare(title, originaltitle, Qt::CaseInsensitive) == 0) &&
+            ((((*i)->GetArtwork(kArtworkFanart)).size() != 0) ||
+             (((*i)->GetArtwork(kArtworkCoverart)).size() != 0) ||
+             (((*i)->GetArtwork(kArtworkBanner)).size() != 0)))
         {
-            ret = (*i);
+            // We have an exact match on the title (ignoring case). After
+            // the first exact match, prefer any more recently released one.
+            if ((ret == NULL) || ((*i)->GetReleaseDate() > exactTitleDate))
+            {
+                exactTitleDate = (*i)->GetReleaseDate();
+                ret = (*i);
+            }
             exactMatches++;
         }
 
@@ -226 +282 @@
     {
         if (exactMatches == 1)
         {
-            LOG(VB_GENERAL, LOG_INFO, QString("Single Exact Title Match For %1")
+            LOG(VB_GENERAL, LOG_INFO, QString("Single exact title match for '%1'")
                     .arg(originaltitle));
-            return ret;
         }
         else
         {
-            LOG(VB_GENERAL, LOG_ERR,
-                QString("Multiple exact title matches found for %1. "
-                        "Need to match on other criteria.")
-                    .arg(originaltitle));
-            return NULL;
+            LOG(VB_GENERAL, LOG_INFO,
+                QString("Multiple exact title matches found for '%1'. "
+                        "Selecting most recent [%2]")
+                    .arg(originaltitle)
+                    .arg(exactTitleDate.toString()));
         }
+        return ret;
     }
 
     // Apply Levenshtein distance algorithm to determine closest match
@@ -260 +316 @@
     MetadataLookupList::const_iterator i = list.begin();
     for (; i != list.end(); ++i)
     {
-        if ((*i)->GetBaseTitle() == bestTitle)
+        if ((*i)->GetTitle() == bestTitle)
         {
             ret = (*i);
             break;
@@ -534 +590 @@
         list = grabber.Search(lookup->GetBaseTitle(), lookup);
     }
 
+    // remove any list elements which are lacking artwork
+    MetadataLookupList::const_iterator itr = list.begin();
+    while (itr != list.end())
+    {
+        // In lookup by name, the movie database tends to include only Fan and Cover artwork.
+        // However, this tendency may not be universal, so we'll look for any of the three
+        // types of artwork.
+        if ((((*itr)->GetArtwork(kArtworkFanart)).size() == 0) &&
+            (((*itr)->GetArtwork(kArtworkCoverart)).size() == 0) &&
+            (((*itr)->GetArtwork(kArtworkBanner)).size() == 0))
+        {
+            LOG(VB_GENERAL, LOG_INFO, QString("Removing '%1' entry with no artwork")
+                    .arg((*itr)->GetTitle()));
+            MetadataLookupList::const_iterator next_itr = itr;
+            next_itr++;
+            MetadataLookup *mdl = list.takeAt(itr - list.begin());
+            if (mdl != NULL)
+                delete(mdl);
+            itr = next_itr;
+        }
+        else
+            ++itr;
+    }
+
     return list;
 }
 
@@ -650 +730 @@
         }
     }
 
+    // remove any list elements which are lacking artwork
+    MetadataLookupList::const_iterator itr = list.begin();
+    while (itr != list.end())
+    {
+        // In lookup by name, the television database tends to include only Banner artwork.
+        // However, this tendency may not be universal, so we'll look for any of the three
+        // types of artwork.
+        if ((((*itr)->GetArtwork(kArtworkFanart)).size() == 0) &&
+            (((*itr)->GetArtwork(kArtworkCoverart)).size() == 0) &&
+            (((*itr)->GetArtwork(kArtworkBanner)).size() == 0))
+        {
+            LOG(VB_GENERAL, LOG_INFO, QString("Removing '%1' entry with no artwork")
+                    .arg((*itr)->GetTitle()));
+            MetadataLookupList::const_iterator next_itr = itr;
+            next_itr++;
+            MetadataLookup *mdl = list.takeAt(itr - list.begin());
+            if (mdl != NULL)
+                delete(mdl);
+            itr = next_itr;
+        }
+        else
+            ++itr;
+    }
+
     return list;
 }
 

mythtv/libs/libmythmetadata/metadatadownload.h

@@ -67 +67 @@
 
     MetadataLookupList  handleGame(MetadataLookup* lookup);
 
+    unsigned int        findExactMatchWithArtCount(MetadataLookupList list,
+                                                   const QString &originaltitle) const;
     MetadataLookup*     findBestMatch(MetadataLookupList list,
                                       const QString &originaltitle) const;
     MetadataLookupList  runGrabber(QString cmd, QStringList args,

mythtv/programs/mythmetadatalookup/lookup.cpp

@@ -246 +246 @@
         if (list.count() > 1)
         {
             int yearindex = -1;
+            MetadataLookup *exactTitleMeta = NULL;
+            QDate exactTitleDate;
 
             for (int p = 0; p != list.size(); ++p)
             {
                 ProgramInfo *pginfo = list[p]->GetData().value<ProgramInfo *>();
 
+                if (pginfo && (QString::compare(pginfo->GetTitle(), list[p]->GetBaseTitle(), Qt::CaseInsensitive)) == 0)
+                {
+                    // We have an exact match on the title (ignoring case)
+                    if ((exactTitleMeta == NULL) ||
+                        (list[p]->GetReleaseDate() > exactTitleDate))
+                    {
+                        // remember the most recently released exact match
+                        exactTitleDate = list[p]->GetReleaseDate();
+                        exactTitleMeta = list[p];
+                    }
+                }
+
                 if (pginfo && !pginfo->GetSeriesID().isEmpty() &&
                     pginfo->GetSeriesID() == (list[p])->GetTMSref())
                 {
@@ -291 +305 @@
                 return;
             }
 
+            if (exactTitleMeta != NULL)
+            {
+                LOG(VB_GENERAL, LOG_INFO, QString("Most recent exact match released %1").arg(exactTitleDate.toString()));
+                MetadataLookup *lookup = exactTitleMeta;
+                ProgramInfo *pginfo = exactTitleMeta->GetData().value<ProgramInfo *>();
+                if (lookup->GetSubtype() != kProbableGenericTelevision)
+                    pginfo->SaveSeasonEpisode(lookup->GetSeason(), lookup->GetEpisode());
+                pginfo->SaveInetRef(lookup->GetInetref());
+                m_busyRecList.removeAll(pginfo);
+                return;
+            }
+
             LOG(VB_GENERAL, LOG_INFO, "Unable to match this title, too many possible matches. "
                                       "You may wish to manually set the season, episode, and "
                                       "inetref in the 'Watch Recordings' screen.");