Ticket #4327: eitfixup7.patch
File eitfixup7.patch, 3.9 KB (added by , 16 years ago) |
---|
-
libs/libmythtv/eitfixup.cpp
17 17 m_bellPPVDescriptionEventId("\\([0-9]{5}\\)"), 18 18 m_ukSubtitle("\\[.*S\\]"), 19 19 m_ukThen("\\s*(Then|Followed by) 60 Seconds\\.", false), 20 m_ukNew("\\s*(Brand New|New)\\s* Series\\s*[:\\.\\-]",false),20 m_ukNew("\\s*(Brand New|New)\\s*(Series|Episode)\\s*[:\\.\\-]",false), 21 21 m_ukNew1("^New\\."), 22 22 m_ukT4("^[tT]4:"), 23 23 m_ukEQ("[:\\!\\?]"), … … 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 { … … 375 379 position1++; 376 380 event.title = strFull.left(position1); 377 381 event.description = strFull.mid(position1 + 1); 382 event.description = event.description.remove(m_ukNew1); 378 383 SetUKSubtitle(event); 379 384 } 380 385 if ((position1 = strFull.find(m_ukYear)) != -1) … … 385 390 event.description = event.title.mid(position1); 386 391 event.title = event.title.left(position1); 387 392 } 388 } 393 } 389 394 } 390 395 else if ((position1 = tmp24ep.search(event.description)) != -1) 391 396 { … … 395 400 tmp24ep.cap(0).length() - 2); 396 401 event.description = event.description.remove(tmp24ep.cap(0)); 397 402 } 398 else if (((position1 = event.title.find(m_ukColonHyphen)) != -1) && 399 (event.description.find(":") < 0 )) 403 else if ((position1 = event.description.find(m_ukTime)) == -1) 400 404 { 401 if ((uint)position1 < SUBTITLE_MAX_LEN) 405 if (((position1 = event.title.find(m_ukColonHyphen)) != -1) && 406 (event.description.find(":") < 0 )) 402 407 { 403 event.subtitle = event.title.mid(position1 + 1); 404 event.title = event.title.left(position1); 408 if ((uint)position1 < SUBTITLE_MAX_LEN) 409 { 410 event.subtitle = event.title.mid(position1 + 1); 411 event.title = event.title.left(position1); 412 } 405 413 } 414 else 415 SetUKSubtitle(event); 406 416 } 407 else408 SetUKSubtitle(event);409 417 } 410 418 411 if ( event.subtitle.isEmpty())419 if ((event.description.find(m_ukTime) == -1) && (event.subtitle.isEmpty())) 412 420 { 413 421 QStringList strList1 = QStringList::split(".",event.description,TRUE); 414 422 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;