Skip to content

Commit 460f77c

Browse files
committed
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.
1 parent ff5ab27 commit 460f77c

File tree

1 file changed

+4
-22
lines changed

1 file changed

+4
-22
lines changed

mythtv/programs/mythfilldatabase/xmltvparser.cpp

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -604,8 +604,6 @@ bool XMLTVParser::parseFile(
604604

605605
QString aggregatedTitle;
606606
QString aggregatedDesc;
607-
QString groupingTitle;
608-
QString groupingDesc;
609607

610608
QDomNode n = docElem.firstChild();
611609
while (!n.isNull())
@@ -626,31 +624,15 @@ bool XMLTVParser::parseFile(
626624

627625
if (pginfo->startts == pginfo->endts)
628626
{
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));
635631
}
636632
else
637633
{
638634
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-
652635
(*proglist)[pginfo->channel].push_back(*pginfo);
653-
}
654636
else
655637
{
656638
/* append all titles/descriptions from one clump */

0 commit comments

Comments
 (0)