Ticket #12277: mythtv-12277-Metadata_collection_for_Manual_Record.patch

mythtv/libs/libmythmetadata/metadatacommon.h

@@ -249 +249 @@
     void SetDownloads(ArtworkMap map) { m_downloads = map; };
 
     // General Sets
-    void SetTitle(const QString &title) { m_title = title; };
+    void SetTitle(const QString &title)
+    {
+        m_title = title;
+        QString manRecSuffix = QString(" (%1)").arg(QObject::tr("Manual Record"));
+        m_base_title = title;  // m_title with " (Manual Record)" stripped.
+        m_base_title.replace(manRecSuffix,"");
+    };
     void SetFilename(const QString &filename) { m_filename = filename; };
 
     // General Sets - Video
@@ -287 +293 @@
     // General
     QString GetFilename() const { return m_filename; };
     QString GetTitle() const { return m_title; };
+    QString GetBaseTitle() const { return m_base_title; };
     QStringList GetCategories() const { return m_categories; };
     float GetUserRating() const { return m_userrating; };
     uint GetRatingCount() const { return m_ratingcount; };
@@ -375 +382 @@
 
     QString m_filename;
     QString m_title;
+    QString m_base_title;  // m_title with " (Manual Record)" stripped.
     QString m_network;
     QString m_status;
     const QStringList m_categories;

mythtv/libs/libmythmetadata/metadatadownload.cpp

@@ -148 +148 @@
             if (list[0]->GetAutomatic() && list.count() > 1
                 && list[0]->GetStep() == kLookupSearch)
             {
-                MetadataLookup *bestLookup = findBestMatch(list, lookup->GetTitle());
+                MetadataLookup *bestLookup = findBestMatch(list, lookup->GetBaseTitle());
                 if (bestLookup)
                 {
                     MetadataLookup *newlookup = bestLookup;
@@ -172 +172 @@
 
             LOG(VB_GENERAL, LOG_INFO,
                 QString("Returning Metadata Results: %1 %2 %3")
-                    .arg(lookup->GetTitle()).arg(lookup->GetSeason())
+                    .arg(lookup->GetBaseTitle()).arg(lookup->GetSeason())
                     .arg(lookup->GetEpisode()));
             QCoreApplication::postEvent(m_parent,
                 new MetadataLookupEvent(list));
@@ -183 +183 @@
             {
                 LOG(VB_GENERAL, LOG_INFO,
                     QString("Metadata Lookup Failed: No Results %1 %2 %3")
-                        .arg(lookup->GetTitle()).arg(lookup->GetSeason())
+                        .arg(lookup->GetBaseTitle()).arg(lookup->GetSeason())
                         .arg(lookup->GetEpisode()));
             }
             if (m_parent)
@@ -210 +210 @@
     for (MetadataLookupList::const_iterator i = list.begin();
             i != list.end(); ++i)
     {
-        QString title = (*i)->GetTitle();
+        QString title = (*i)->GetBaseTitle();
         if (title == originaltitle)
         {
             ret = (*i);
@@ -260 +260 @@
     MetadataLookupList::const_iterator i = list.begin();
     for (; i != list.end(); ++i)
     {
-        if ((*i)->GetTitle() == bestTitle)
+        if ((*i)->GetBaseTitle() == bestTitle)
         {
             ret = (*i);
             break;
@@ -526 +526 @@
     }
     else if (lookup->GetStep() == kLookupSearch)
     {
-        if (lookup->GetTitle().isEmpty())
+        if (lookup->GetBaseTitle().isEmpty())
         {
             // no point searching on nothing...
             return list;
         }
-        list = grabber.Search(lookup->GetTitle(), lookup);
+        list = grabber.Search(lookup->GetBaseTitle(), lookup);
     }
 
     return list;
@@ -582 +582 @@
         if (!lookup->GetSubtitle().isEmpty())
         {
             list = grabber.SearchSubtitle(lookup->GetInetref(),
-                                          lookup->GetTitle() /* unused */,
+                                          lookup->GetBaseTitle() /* unused */,
                                           lookup->GetSubtitle(), lookup, false);
         }
 
@@ -608 +608 @@
     }
     else if (lookup->GetStep() == kLookupSearch)
     {
-        if (lookup->GetTitle().isEmpty())
+        if (lookup->GetBaseTitle().isEmpty())
         {
             // no point searching on nothing...
             return list;
         }
         if (!lookup->GetSubtitle().isEmpty())
         {
-            list = grabber.SearchSubtitle(lookup->GetTitle(),
+            list = grabber.SearchSubtitle(lookup->GetBaseTitle(),
                                           lookup->GetSubtitle(), lookup, false);
         }
         if (list.isEmpty())
         {
-            list = grabber.Search(lookup->GetTitle(), lookup);
+            list = grabber.Search(lookup->GetBaseTitle(), lookup);
         }
     }
     else if (lookup->GetStep() == kLookupCollection)
@@ -685 +685 @@
 
     MetadataLookupList list;
 
-    if (lookup->GetTitle().isEmpty())
+    if (lookup->GetBaseTitle().isEmpty())
     {
         // no point searching on nothing...
         return list;
@@ -705 +705 @@
         lookup->SetEpisode(1);
     }
 
-    list = grabber.Search(lookup->GetTitle(), lookup);
+    list = grabber.Search(lookup->GetBaseTitle(), lookup);
 
     if (list.count() == 1)
     {