Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Remove the 'grouping' behaviour from XMLTV Parser.

This isn't within the XMLTV spec, it doesn't actually group anything
it just mangles titles and has the very real potential to do so
accidentally and without explanation to the end-user. This doesn't
affect or relate to the in-spec clumpidx handling which was added in the same
commit 9 years ago.
  • Loading branch information...
commit 460f77cf378b958806504471ed40942b7ee329a3 1 parent ff5ab27
Stuart Morgan stuartm authored

Showing 1 changed file with 4 additions and 22 deletions. Show diff stats Hide diff stats

  1. +4 22 mythtv/programs/mythfilldatabase/xmltvparser.cpp
26 mythtv/programs/mythfilldatabase/xmltvparser.cpp
@@ -604,8 +604,6 @@ bool XMLTVParser::parseFile(
604 604
605 605 QString aggregatedTitle;
606 606 QString aggregatedDesc;
607   - QString groupingTitle;
608   - QString groupingDesc;
609 607
610 608 QDomNode n = docElem.firstChild();
611 609 while (!n.isNull())
@@ -626,31 +624,15 @@ bool XMLTVParser::parseFile(
626 624
627 625 if (pginfo->startts == pginfo->endts)
628 626 {
629   - /* Not a real program : just a grouping marker */
630   - if (!pginfo->title.isEmpty())
631   - groupingTitle = pginfo->title + " : ";
632   -
633   - if (!pginfo->description.isEmpty())
634   - groupingDesc = pginfo->description + " : ";
  627 + LOG(VB_GENERAL, LOG_WARNING, QString("Invalid programme (%1), "
  628 + "identical start and end "
  629 + "times, skipping")
  630 + .arg(pginfo->title));
635 631 }
636 632 else
637 633 {
638 634 if (pginfo->clumpidx.isEmpty())
639   - {
640   - if (!groupingTitle.isEmpty())
641   - {
642   - pginfo->title.prepend(groupingTitle);
643   - groupingTitle.clear();
644   - }
645   -
646   - if (!groupingDesc.isEmpty())
647   - {
648   - pginfo->description.prepend(groupingDesc);
649   - groupingDesc.clear();
650   - }
651   -
652 635 (*proglist)[pginfo->channel].push_back(*pginfo);
653   - }
654 636 else
655 637 {
656 638 /* append all titles/descriptions from one clump */

0 comments on commit 460f77c

Please sign in to comment.
Something went wrong with that request. Please try again.