Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Text Search timer type and other fixes #4

Closed
wants to merge 7 commits into from
Closed

Text Search timer type and other fixes #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d88175b
Add TEXT_SEARCH Timer Type
metaron-uk Jun 28, 2015
0c0e5a9
Extra debug trace for MythScheduleHelper functions
metaron-uk Jun 28, 2015
e5564ca
Use Rule Start/End time if no assoc. recordings
metaron-uk Jun 28, 2015
533f1c6
Added '75::' to debug in MythScheduleHelper75.cpp
metaron-uk Jun 28, 2015
40ea2cd
Extra debug trace for MythScheduleHelper7X::NewFromTimer
metaron-uk Jun 28, 2015
5c12edd
Add change of Channel/AnyChannel to UpdateRecordingRule
metaron-uk Jun 29, 2015
e4db1ec
Add change of SearchType to UpdateRecordingRule
metaron-uk Jun 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pvr.mythtv/resources/language/English/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,11 @@ msgctxt "#30466"
msgid "Record series (EPG based)"
msgstr ""

# empty strings from id 30467 to 30500
msgctxt "#30467"
msgid "Text Search"
msgstr ""

# empty strings from id 30468 to 30500

msgctxt "#30501"
msgid "Don't match duplicates"
Expand Down
85 changes: 76 additions & 9 deletions src/cppmyth/MythScheduleHelper75.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,27 @@ const std::vector<MythScheduleManager::TimerType>& MythScheduleHelper75::GetTime
GetRuleRecordingGroupList(),
GetRuleRecordingGroupDefault()));

typeList.push_back(MythScheduleManager::TimerType(TIMER_TYPE_TEXT_SEARCH,
PVR_TIMER_TYPE_IS_REPEATING |
PVR_TIMER_TYPE_SUPPORTS_ENABLE_DISABLE |
PVR_TIMER_TYPE_SUPPORTS_CHANNELS |
PVR_TIMER_TYPE_SUPPORTS_START_END_MARGIN |
PVR_TIMER_TYPE_SUPPORTS_PRIORITY |
PVR_TIMER_TYPE_SUPPORTS_LIFETIME |
PVR_TIMER_TYPE_SUPPORTS_RECORDING_GROUP |
PVR_TIMER_TYPE_SUPPORTS_RECORD_ONLY_NEW_EPISODES |
PVR_TIMER_TYPE_SUPPORTS_TITLE_EPG_MATCH |
PVR_TIMER_TYPE_SUPPORTS_FULLTEXT_EPG_MATCH,
XBMC->GetLocalizedString(30467),
GetRulePriorityList(),
GetRulePriorityDefault(),
GetRuleDupMethodList(),
GetRuleDupMethodDefault(),
GetRuleExpirationList(),
GetRuleExpirationDefault(),
GetRuleRecordingGroupList(),
GetRuleRecordingGroupDefault()));

///////////////////////////////////////////////////////////////////////////
//// KEEP LAST
///////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -424,7 +445,7 @@ bool MythScheduleHelper75::FillTimerEntry(MythTimerEntry& entry, const MythRecor
// that which is applied in function 'NewFromTimer'

MythRecordingRule rule = node.GetRule();

XBMC->Log(LOG_DEBUG, "75::%s: Rule %u", __FUNCTION__, rule.RecordID());
switch (rule.Type())
{
case Myth::RT_SingleRecord:
Expand Down Expand Up @@ -479,7 +500,12 @@ bool MythScheduleHelper75::FillTimerEntry(MythTimerEntry& entry, const MythRecor
break;

case Myth::RT_AllRecord:
entry.timerType = TIMER_TYPE_RECORD_ALL;
if (rule.SearchType() == Myth::ST_NoSearch)
entry.timerType = TIMER_TYPE_RECORD_ALL;
else if (rule.SearchType() == Myth::ST_TitleSearch)
entry.timerType = TIMER_TYPE_TEXT_SEARCH;
else if (rule.SearchType() == Myth::ST_KeywordSearch)
entry.timerType = TIMER_TYPE_TEXT_SEARCH;
break;

case Myth::RT_OverrideRecord:
Expand All @@ -505,8 +531,12 @@ bool MythScheduleHelper75::FillTimerEntry(MythTimerEntry& entry, const MythRecor
{
case Myth::ST_TitleSearch:
entry.epgSearch = rule.Description();
entry.isFullTextSearch = false;
break;
case Myth::ST_KeywordSearch:
entry.epgSearch = rule.Description();
entry.isFullTextSearch = true;
break;
case Myth::ST_PeopleSearch:
case Myth::ST_PowerSearch:
entry.epgSearch = rule.Description();
Expand Down Expand Up @@ -534,6 +564,7 @@ bool MythScheduleHelper75::FillTimerEntry(MythTimerEntry& entry, const MythRecor
case TIMER_TYPE_RECORD_DAILY:
case TIMER_TYPE_RECORD_ALL:
case TIMER_TYPE_RECORD_SERIES:
case TIMER_TYPE_TEXT_SEARCH:
case TIMER_TYPE_UNHANDLED:
if (difftime(rule.NextRecording(), 0) > 0)
{
Expand All @@ -547,6 +578,11 @@ bool MythScheduleHelper75::FillTimerEntry(MythTimerEntry& entry, const MythRecor
entry.startTime = entry.endTime = rule.LastRecorded();
timeadd(&entry.endTime, difftime(rule.EndTime(), rule.StartTime()));
}
else
{
entry.startTime = rule.StartTime();
entry.endTime = rule.EndTime();
}
break;
default:
entry.startTime = rule.StartTime();
Expand Down Expand Up @@ -584,9 +620,9 @@ bool MythScheduleHelper75::FillTimerEntry(MythTimerEntry& entry, const MythProgr
case Myth::RS_PREVIOUS_RECORDING: //Previoulsy recorded but no longer in the library
if (true /*!m_showNotRecording*/)
{
XBMC->Log(LOG_DEBUG, "%s: Skipping %s:%s on %s because status %d and m_showNotRecording=%d", __FUNCTION__,
XBMC->Log(LOG_DEBUG, "75::%s: Skipping %s:%s on %s because status %d", __FUNCTION__,
recording.Title().c_str(), recording.Subtitle().c_str(), recording.ChannelName().c_str(),
recording.Status(), 0 /*m_showNotRecording*/);
recording.Status());
return false;
}
default:
Expand Down Expand Up @@ -690,7 +726,7 @@ MythRecordingRule MythScheduleHelper75::NewFromTemplate(const MythEPGInfo& epgIn
}
if (tplIt != templates.end())
{
XBMC->Log(LOG_INFO, "Overriding the rule with template %u '%s'", (unsigned)tplIt->RecordID(), tplIt->Title().c_str());
XBMC->Log(LOG_INFO, "75::%s: Overriding the rule with template %u '%s'", __FUNCTION__, (unsigned)tplIt->RecordID(), tplIt->Title().c_str());
rule.SetPriority(tplIt->Priority());
rule.SetStartOffset(tplIt->StartOffset());
rule.SetEndOffset(tplIt->EndOffset());
Expand All @@ -715,7 +751,7 @@ MythRecordingRule MythScheduleHelper75::NewFromTemplate(const MythEPGInfo& epgIn
rule.SetCategory(tplIt->Category());
}
else
XBMC->Log(LOG_INFO, "No template found for the category '%s'", epgInfo.Category().c_str());
XBMC->Log(LOG_INFO, "75::%s: No template found for the category '%s'", __FUNCTION__, epgInfo.Category().c_str());
}
break;
case 0: // Template provider is 'Internal', then set rule with settings
Expand Down Expand Up @@ -745,7 +781,7 @@ MythRecordingRule MythScheduleHelper75::NewFromTemplate(const MythEPGInfo& epgIn
Myth::SettingPtr categoryOverTime = m_control->GetSetting("CategoryOverTime", false);
if (categoryOverTime)
{
XBMC->Log(LOG_DEBUG, "Overriding end offset for category %s: +%s", overTimeCategory->value.c_str(), categoryOverTime->value.c_str());
XBMC->Log(LOG_DEBUG, "75::%s: Overriding end offset for category %s: +%s", __FUNCTION__, overTimeCategory->value.c_str(), categoryOverTime->value.c_str());
rule.SetEndOffset(atoi(categoryOverTime->value.c_str()));
}
}
Expand All @@ -759,7 +795,7 @@ MythRecordingRule MythScheduleHelper75::NewFromTimer(const MythTimerEntry& entry
// that which is applied in function 'FillTimerEntry'

MythRecordingRule rule;

XBMC->Log(LOG_DEBUG, "75::%s", __FUNCTION__);
if (withTemplate)
{
// Base on template
Expand Down Expand Up @@ -1046,6 +1082,37 @@ MythRecordingRule MythScheduleHelper75::NewFromTimer(const MythTimerEntry& entry
break;
}

case TIMER_TYPE_TEXT_SEARCH:
{
if (entry.HasChannel())
{
rule.SetType(Myth::RT_ChannelRecord);
rule.SetChannelID(entry.chanid);
rule.SetCallsign(entry.callsign);
}
else
rule.SetType(Myth::RT_AllRecord);
rule.SetInactive(entry.isInactive);
rule.SetTitle(entry.title);
if (!entry.epgInfo.IsNull())
{
rule.SetStartTime(entry.epgInfo.StartTime());
rule.SetEndTime(entry.epgInfo.EndTime());
rule.SetCategory(entry.epgInfo.Category());
}
if (!entry.epgSearch.empty())
{
if (entry.isFullTextSearch)
rule.SetSearchType(Myth::ST_KeywordSearch);
else
rule.SetSearchType(Myth::ST_TitleSearch);
rule.SetSubtitle(""); // Backend uses Subtitle as table join SQL for power searches (not needed for keyword or title)
rule.SetDescription(entry.epgSearch); // Backend uses description to find program by keywords or title and SQL for power searches
return rule;
}
break;
}

case TIMER_TYPE_DONT_RECORD:
case TIMER_TYPE_OVERRIDE:
case TIMER_TYPE_UPCOMING:
Expand All @@ -1066,7 +1133,7 @@ MythRecordingRule MythScheduleHelper75::NewFromTimer(const MythTimerEntry& entry
break;
}
rule.SetType(Myth::RT_UNKNOWN);
XBMC->Log(LOG_ERROR, "%s - Invalid timer %u: TYPE=%d CHANID=%u SIGN=%s ST=%u ET=%u", __FUNCTION__, entry.entryIndex,
XBMC->Log(LOG_ERROR, "75::%s: Invalid timer %u: TYPE=%d CHANID=%u SIGN=%s ST=%u ET=%u", __FUNCTION__, entry.entryIndex,
entry.timerType, entry.chanid, entry.callsign.c_str(), (unsigned)entry.startTime, (unsigned)entry.endTime);
return rule;
}
Expand Down
61 changes: 57 additions & 4 deletions src/cppmyth/MythScheduleHelper76.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ bool MythScheduleHelper76::FillTimerEntry(MythTimerEntry& entry, const MythRecor
// that which is applied in function 'NewFromTimer'

MythRecordingRule rule = node.GetRule();
XBMC->Log(LOG_DEBUG, "76::%s: RecordID %u", __FUNCTION__, rule.RecordID());

switch (rule.Type())
{
Expand Down Expand Up @@ -111,7 +112,14 @@ bool MythScheduleHelper76::FillTimerEntry(MythTimerEntry& entry, const MythRecor
else if ((rule.Filter() & Myth::FM_ThisSeries))
entry.timerType = TIMER_TYPE_RECORD_SERIES;
else
entry.timerType = TIMER_TYPE_RECORD_ALL;
{
if (rule.SearchType() == Myth::ST_NoSearch)
entry.timerType = TIMER_TYPE_RECORD_ALL;
else if (rule.SearchType() == Myth::ST_TitleSearch)
entry.timerType = TIMER_TYPE_TEXT_SEARCH;
else if (rule.SearchType() == Myth::ST_KeywordSearch)
entry.timerType = TIMER_TYPE_TEXT_SEARCH;
}
if (rule.Filter() & Myth::FM_ThisChannel)
{
entry.chanid = rule.ChannelID();
Expand Down Expand Up @@ -142,8 +150,12 @@ bool MythScheduleHelper76::FillTimerEntry(MythTimerEntry& entry, const MythRecor
{
case Myth::ST_TitleSearch:
entry.epgSearch = rule.Description();
entry.isFullTextSearch = false;
break;
case Myth::ST_KeywordSearch:
entry.epgSearch = rule.Description();
entry.isFullTextSearch = true;
break;
case Myth::ST_PeopleSearch:
case Myth::ST_PowerSearch:
entry.epgSearch = rule.Description();
Expand Down Expand Up @@ -171,6 +183,7 @@ bool MythScheduleHelper76::FillTimerEntry(MythTimerEntry& entry, const MythRecor
case TIMER_TYPE_RECORD_DAILY:
case TIMER_TYPE_RECORD_ALL:
case TIMER_TYPE_RECORD_SERIES:
case TIMER_TYPE_TEXT_SEARCH:
case TIMER_TYPE_UNHANDLED:
if (difftime(rule.NextRecording(), 0) > 0)
{
Expand All @@ -184,6 +197,11 @@ bool MythScheduleHelper76::FillTimerEntry(MythTimerEntry& entry, const MythRecor
entry.startTime = entry.endTime = rule.LastRecorded();
timeadd(&entry.endTime, difftime(rule.EndTime(), rule.StartTime()));
}
else
{
entry.startTime = rule.StartTime();
entry.endTime = rule.EndTime();
}
break;
default:
entry.startTime = rule.StartTime();
Expand Down Expand Up @@ -215,7 +233,7 @@ MythRecordingRule MythScheduleHelper76::NewFromTimer(const MythTimerEntry& entry
// that which is applied in function 'FillTimerEntry'

MythRecordingRule rule;

XBMC->Log(LOG_DEBUG, "76::%s", __FUNCTION__);
if (withTemplate)
{
// Base on template
Expand Down Expand Up @@ -480,7 +498,7 @@ MythRecordingRule MythScheduleHelper76::NewFromTimer(const MythTimerEntry& entry

case TIMER_TYPE_RECORD_SERIES:
{
if (!entry.epgInfo.IsNull())
if (!entry.epgInfo.IsNull()) //Question - how does epgInfo get to be populated if this is an 'old' timer.
{
rule.SetType(Myth::RT_AllRecord);
rule.SetFilter(Myth::FM_ThisChannel | Myth::FM_ThisSeries);
Expand All @@ -501,6 +519,36 @@ MythRecordingRule MythScheduleHelper76::NewFromTimer(const MythTimerEntry& entry
break;
}

case TIMER_TYPE_TEXT_SEARCH:
{
if (entry.HasChannel())
{
rule.SetFilter(Myth::FM_ThisChannel);
rule.SetChannelID(entry.chanid);
rule.SetCallsign(entry.callsign);
}
rule.SetType(Myth::RT_AllRecord);
rule.SetInactive(entry.isInactive);
rule.SetTitle(entry.title);
if (!entry.epgInfo.IsNull())
{
rule.SetStartTime(entry.epgInfo.StartTime());
rule.SetEndTime(entry.epgInfo.EndTime());
rule.SetCategory(entry.epgInfo.Category());
}
if (!entry.epgSearch.empty())
{
if (entry.isFullTextSearch)
rule.SetSearchType(Myth::ST_KeywordSearch);
else
rule.SetSearchType(Myth::ST_TitleSearch);
rule.SetSubtitle(""); // Backend uses Subtitle as table join SQL for power searches (not needed for keyword or title)
rule.SetDescription(entry.epgSearch); // Backend uses description to find program by keywords or title and SQL for power searches
return rule;
}
break;
}

case TIMER_TYPE_DONT_RECORD:
case TIMER_TYPE_OVERRIDE:
case TIMER_TYPE_UPCOMING:
Expand All @@ -521,13 +569,14 @@ MythRecordingRule MythScheduleHelper76::NewFromTimer(const MythTimerEntry& entry
break;
}
rule.SetType(Myth::RT_UNKNOWN);
XBMC->Log(LOG_ERROR, "%s - Invalid timer %u: TYPE=%d CHANID=%u SIGN=%s ST=%u ET=%u", __FUNCTION__, entry.entryIndex,
XBMC->Log(LOG_ERROR, "76::%s - Invalid timer %u: TYPE=%d CHANID=%u SIGN=%s ST=%u ET=%u", __FUNCTION__, entry.entryIndex,
entry.timerType, entry.chanid, entry.callsign.c_str(), (unsigned)entry.startTime, (unsigned)entry.endTime);
return rule;
}

MythScheduleManager::RuleSummaryInfo MythScheduleHelper76::GetSummaryInfo(const MythRecordingRule &rule) const
{
XBMC->Log(LOG_DEBUG, "76::%s:", __FUNCTION__);
MythScheduleManager::RuleSummaryInfo meta;
time_t st = rule.StartTime();
meta.isRepeating = false;
Expand Down Expand Up @@ -593,6 +642,7 @@ MythScheduleManager::RuleSummaryInfo MythScheduleHelper76::GetSummaryInfo(const

MythRecordingRule MythScheduleHelper76::NewDailyRecord(const MythEPGInfo& epgInfo)
{
XBMC->Log(LOG_DEBUG, "76::%s:", __FUNCTION__);
unsigned int filter;
MythRecordingRule rule = this->NewFromTemplate(epgInfo);

Expand Down Expand Up @@ -630,6 +680,7 @@ MythRecordingRule MythScheduleHelper76::NewDailyRecord(const MythEPGInfo& epgInf

MythRecordingRule MythScheduleHelper76::NewWeeklyRecord(const MythEPGInfo& epgInfo)
{
XBMC->Log(LOG_DEBUG, "76::%s:", __FUNCTION__);
unsigned int filter;
MythRecordingRule rule = this->NewFromTemplate(epgInfo);

Expand Down Expand Up @@ -667,6 +718,7 @@ MythRecordingRule MythScheduleHelper76::NewWeeklyRecord(const MythEPGInfo& epgIn

MythRecordingRule MythScheduleHelper76::NewChannelRecord(const MythEPGInfo& epgInfo)
{
XBMC->Log(LOG_DEBUG, "76::%s:", __FUNCTION__);
unsigned int filter;
MythRecordingRule rule = this->NewFromTemplate(epgInfo);

Expand Down Expand Up @@ -701,6 +753,7 @@ MythRecordingRule MythScheduleHelper76::NewChannelRecord(const MythEPGInfo& epgI

MythRecordingRule MythScheduleHelper76::NewOneRecord(const MythEPGInfo& epgInfo)
{
XBMC->Log(LOG_DEBUG, "76::%s:", __FUNCTION__);
unsigned int filter;
MythRecordingRule rule = this->NewFromTemplate(epgInfo);

Expand Down
4 changes: 2 additions & 2 deletions src/cppmyth/MythScheduleHelper85.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ bool MythScheduleHelper85::FillTimerEntry(MythTimerEntry& entry, const MythProgr
case Myth::RS_PREVIOUS_RECORDING: //Previoulsy recorded but no longer in the library
if (true /*!m_showNotRecording*/)
{
XBMC->Log(LOG_DEBUG, "%s: Skipping %s:%s on %s because status %d and m_showNotRecording=%d", __FUNCTION__,
XBMC->Log(LOG_DEBUG, "85::%s: Skipping %s:%s on %s because status %d", __FUNCTION__,
recording.Title().c_str(), recording.Subtitle().c_str(), recording.ChannelName().c_str(),
recording.Status(), 0 /*m_showNotRecording*/);
recording.Status());
return false;
}
default:
Expand Down
Loading