Ticket #4327: eitfixup7.patch

libs/libmythtv/eitfixup.cpp

@@ -17 +17 @@
       m_bellPPVDescriptionEventId("\\([0-9]{5}\\)"),
       m_ukSubtitle("\\[.*S\\]"),
       m_ukThen("\\s*(Then|Followed by) 60 Seconds\\.", false),
-      m_ukNew("\\s*(Brand New|New)\\s*Series\\s*[:\\.\\-]",false),
+      m_ukNew("\\s*(Brand New|New)\\s*(Series|Episode)\\s*[:\\.\\-]",false),
       m_ukNew1("^New\\."),
       m_ukT4("^[tT]4:"),
       m_ukEQ("[:\\!\\?]"),
@@ -36 +36 @@
       m_ukBBC7rpt("\\[Rptd?[^]]+\\d{1,2}\\.\\d{1,2}[ap]m\\]\\."),
       m_ukCBBC("^CBBC."),
       m_ukCBeebies("^CBeebies."),
-      m_ukStarring1("star(ring)"),
+      m_ukStarring1("star(ring|s)"),
       m_ukDoubleDotEnd("\\.\\.+$"),
       m_ukDoubleDotStart("^\\.\\.+"),
       m_ukDotSpaceStart("^\\. "),
+      m_ukTime("\\d{1,2}[\\.:]\\d{1,2}\\s*(am|pm|)"),
       m_comHemCountry("^(\\(.+\\))?\\s?([^ ]+)\\s([^\\.0-9]+)"
                       "(?:\\sfrån\\s([0-9]{4}))(?:\\smed\\s([^\\.]+))?\\.?"),
       m_comHemDirector("[Rr]egi"),
@@ -360 +361 @@
     // BBC 7 [Rpt of ...] case.
     event.description = event.description.remove(m_ukBBC7rpt);
 
+    event.title = event.title.stripWhiteSpace();
+    event.description = event.description.stripWhiteSpace();
+
     QRegExp tmp24ep = m_uk24ep;
     if (!event.title.startsWith("CSI:") && !event.title.startsWith("CD:"))
     {
@@ -375 +379 @@
                      position1++;
                  event.title = strFull.left(position1);
                  event.description = strFull.mid(position1 + 1);
+                 event.description = event.description.remove(m_ukNew1);
                  SetUKSubtitle(event);
             }
             if ((position1 = strFull.find(m_ukYear)) != -1)
@@ -385 +390 @@
                     event.description = event.title.mid(position1);
                     event.title = event.title.left(position1);
                 }
-            }
+            } 
         }
         else if ((position1 = tmp24ep.search(event.description)) != -1)
         {
@@ -395 +400 @@
                                 tmp24ep.cap(0).length() - 2);
             event.description = event.description.remove(tmp24ep.cap(0));
         }
-        else if (((position1 = event.title.find(m_ukColonHyphen)) != -1) &&
-            (event.description.find(":") < 0 ))
+        else if ((position1 = event.description.find(m_ukTime)) == -1)
         {
-            if ((uint)position1 < SUBTITLE_MAX_LEN)
+            if (((position1 = event.title.find(m_ukColonHyphen)) != -1) &&
+                (event.description.find(":") < 0 ))
             {
-                event.subtitle = event.title.mid(position1 + 1);
-                event.title = event.title.left(position1);
+                if ((uint)position1 < SUBTITLE_MAX_LEN)
+                {
+                    event.subtitle = event.title.mid(position1 + 1);
+                    event.title = event.title.left(position1);
+                }
             }
+            else
+                SetUKSubtitle(event);
         }
-        else
-            SetUKSubtitle(event);
     }
 
-    if (event.subtitle.isEmpty())
+    if ((event.description.find(m_ukTime) == -1) && (event.subtitle.isEmpty()))
     {
        QStringList strList1 = QStringList::split(".",event.description,TRUE);
        QStringList strList2 = QStringList::split("?",event.description,TRUE);

libs/libmythtv/eitfixup.h

@@ -103 +103 @@
     const QRegExp m_ukDoubleDotEnd;
     const QRegExp m_ukDoubleDotStart;
     const QRegExp m_ukDotSpaceStart;
+    const QRegExp m_ukTime;
     const QRegExp m_comHemCountry;
     const QRegExp m_comHemDirector;
     const QRegExp m_comHemActor;