Ticket #4327: eitfixup5.patch
File eitfixup5.patch, 3.2 KB (added by , 16 years ago) |
---|
-
libs/libmythtv/eitfixup.cpp
36 36 m_ukBBC7rpt("\\[Rptd?[^]]+\\d{1,2}\\.\\d{1,2}[ap]m\\]\\."), 37 37 m_ukCBBC("^CBBC."), 38 38 m_ukCBeebies("^CBeebies."), 39 m_ukStarring1("star(ring )"),39 m_ukStarring1("star(ring|s)"), 40 40 m_ukDoubleDotEnd("\\.\\.+$"), 41 41 m_ukDoubleDotStart("^\\.\\.+"), 42 42 m_ukDotSpaceStart("^\\. "), 43 m_ukTime("\\d{1,2}[\\.:]\\d{1,2}\\s*(am|pm|)"), 43 44 m_comHemCountry("^(\\(.+\\))?\\s?([^ ]+)\\s([^\\.0-9]+)" 44 45 "(?:\\sfrån\\s([0-9]{4}))(?:\\smed\\s([^\\.]+))?\\.?"), 45 46 m_comHemDirector("[Rr]egi"), … … 360 361 // BBC 7 [Rpt of ...] case. 361 362 event.description = event.description.remove(m_ukBBC7rpt); 362 363 364 event.title = event.title.stripWhiteSpace(); 365 event.description = event.description.stripWhiteSpace(); 366 363 367 QRegExp tmp24ep = m_uk24ep; 364 368 if (!event.title.startsWith("CSI:") && !event.title.startsWith("CD:")) 365 369 { … … 385 389 event.description = event.title.mid(position1); 386 390 event.title = event.title.left(position1); 387 391 } 388 } 392 } 389 393 } 390 394 else if ((position1 = tmp24ep.search(event.description)) != -1) 391 395 { … … 395 399 tmp24ep.cap(0).length() - 2); 396 400 event.description = event.description.remove(tmp24ep.cap(0)); 397 401 } 398 else if (((position1 = event.title.find(m_ukColonHyphen)) != -1) && 399 (event.description.find(":") < 0 )) 402 else if ((position1 = event.description.find(m_ukTime)) == -1) 400 403 { 401 if ((uint)position1 < SUBTITLE_MAX_LEN) 404 if (((position1 = event.title.find(m_ukColonHyphen)) != -1) && 405 (event.description.find(":") < 0 )) 402 406 { 403 event.subtitle = event.title.mid(position1 + 1); 404 event.title = event.title.left(position1); 407 if ((uint)position1 < SUBTITLE_MAX_LEN) 408 { 409 event.subtitle = event.title.mid(position1 + 1); 410 event.title = event.title.left(position1); 411 } 405 412 } 413 else 414 SetUKSubtitle(event); 406 415 } 407 else408 SetUKSubtitle(event);409 416 } 410 417 411 if ( event.subtitle.isEmpty())418 if ((event.description.find(m_ukTime) == -1) && (event.subtitle.isEmpty())) 412 419 { 413 420 QStringList strList1 = QStringList::split(".",event.description,TRUE); 414 421 QStringList strList2 = QStringList::split("?",event.description,TRUE); -
libs/libmythtv/eitfixup.h
103 103 const QRegExp m_ukDoubleDotEnd; 104 104 const QRegExp m_ukDoubleDotStart; 105 105 const QRegExp m_ukDotSpaceStart; 106 const QRegExp m_ukTime; 106 107 const QRegExp m_comHemCountry; 107 108 const QRegExp m_comHemDirector; 108 109 const QRegExp m_comHemActor;