Ticket #3544: athome-eit.diff

mythtv/libs/libmythtv/eitfixup.cpp

@@ -71 +71 @@
     if (kFixAUStar & event.fixup)
         FixAUStar(event);
 
+    if (kFixAtHome & event.fixup)
+        FixAtHome(event);
+
     if (event.fixup)
     {
         if (!event.title.isEmpty())
@@ -629 +632 @@
         event.description    = stmp.right(stmp.length() - position - 2);
     }
 }
+
+/** \fn EITFixUp::FixAtHome(DBEvent&) const
+ *  \brief Use this to clean up DVB-C guide from AtHome in the Netherlands.
+ */
+void EITFixUp::FixAtHome(DBEvent &event) const
+{
+
+    // Try to get the sub-title from the description (if empty).
+    if(event.subtitle.isEmpty())
+    {
+        int position = event.description.find("Afl.");
+        if (position != -1)
+        {
+            // See if there's a ":" following, if so; ignore.
+            if(event.description.at(position + 4) == ':')
+                position++;
+            // now search for a "." indicating the end of the sub-title
+            int endposition = event.description.find('.', (position + 4));
+            if (endposition != -1)
+            {
+                // Copy the found part
+                event.subtitle = event.description.mid(position + 4, 
+                                     endposition - (position + 4));
+            }
+        }
+    }
+    // Try to get a subtitle from the title by searching for a ":" and
+    // splitting the title 
+    if(event.subtitle.isEmpty())
+    {
+        int position = event.title.find(':');
+        if (position != -1)
+        {
+            event.subtitle = event.title.right(
+                event.title.length() - position - 2);
+            event.title = event.title.left(position);
+        }
+    }
+    // There's more information in the description block but this is
+    // sufficient for me :-)
+}

mythtv/libs/libmythtv/eitfixup.h

@@ -27 +27 @@
         kFixComHem     = 0x0010,
         kFixSubtitle   = 0x0020,
         kFixAUStar     = 0x0040,
+        kFixAtHome     = 0x0080, // Both early and regular
 
         // Early fixups
         kEFixPro7Sat   = 0x0100,
@@ -51 +52 @@
     void FixPBS(DBEvent &event) const;           // USA ATSC
     void FixComHem(DBEvent &event, bool parse_subtitle) const; // Sweden DVB-C
     void FixAUStar(DBEvent &event) const;        // Australia DVB-S
+    void FixAtHome(DBEvent &event) const;        // Netherlands AtHome DVB-C
 
     const QRegExp m_bellYear;
     const QRegExp m_bellActors;

mythtv/libs/libmythtv/eithelper.cpp

@@ -288 +288 @@
                 else
                 {
                     title    = sed.EventName();
-                    subtitle = sed.Text();
+                    if (fix & EITFixUp::kFixAtHome)
+                        description = sed.Text();
+                    else
+                        subtitle = sed.Text();
                 }
             }
 
@@ -296 +299 @@
                 MPEGDescriptor::FindBestMatches(
                     list, DescriptorID::extended_event, languagePreferences);
 
-            description = "";
             for (uint j = 0; j < bestExtendedEvents.size(); j++)
             {
                 if (!bestExtendedEvents[j])
@@ -584 +586 @@
     fix[1082LL << 32 |    1 << 16 | 20005] = EITFixUp::kEFixPro7Sat; //DVB-S Sat.1 Austria
 
     fix[ 133 << 16] = EITFixUp::kEFixPro7Sat; // Premiere and Pro7/Sat.1
+
+    // DVB-C Netherlands: EIT format and sub-title fixes
+    // transport_id<<32 | original_network_id<<16 | service_id
+    fix[ 1000 << 16 ] = EITFixUp::kFixAtHome;
+
 }
 
 static int calc_eit_utc_offset(void)