Skip to content

Always request EPG update from Kodi on startup if it has not happened #68

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

Draft
phunkyfish wants to merge 1 commit into
base: Omega
Choose a base branch
from
Draft

Always request EPG update from Kodi on startup if it has not happened #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions src/OctonetData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,16 @@ OctonetData::OctonetData(const std::string& octonetAddress,
kodi::QueueFormattedNotification(QUEUE_ERROR, kodi::addon::GetLocalizedString(30001).c_str(),
m_channels.size());

/*
// Currently unused, as thread was already present before with
// p8platform, by remove of them was it added as C++11 thread way.
kodi::Log(ADDON_LOG_INFO, "%s Starting separate client update thread...", __func__);
m_running = true;
m_thread = std::thread([&] { Process(); });
*/
}

OctonetData::~OctonetData(void)
{
/*
m_running = false;
if (m_thread.joinable())
m_thread.join();
*/
}

PVR_ERROR OctonetData::GetCapabilities(kodi::addon::PVRCapabilities& capabilities)
Expand Down Expand Up @@ -256,7 +250,19 @@ bool OctonetData::LoadEPG(void)

void OctonetData::Process()
{
return;
// If we have not loaded EPG prior to a 10 second delay after startup
// then request and update from Kodi for each channel
std::this_thread::sleep_for(std::chrono::milliseconds(10000));

if (!m_readInitialEPG)
{
kodi::Log(ADDON_LOG_INFO, "No request detected from Kodi to load EPG, so requesting now");

for (const auto& myChannel : m_channels)
TriggerEpgUpdate(myChannel.id);
}

m_running = false;
}

PVR_ERROR OctonetData::GetChannelsAmount(int& amount)
Expand Down Expand Up @@ -292,6 +298,8 @@ PVR_ERROR OctonetData::GetEPGForChannel(int channelUid,
time_t end,
kodi::addon::PVREPGTagsResultSet& results)
{
m_readInitialEPG = true;

for (unsigned int i = 0; i < m_channels.size(); i++)
{
OctonetChannel& chan = m_channels.at(i);
Expand Down
1 change: 1 addition & 0 deletions src/OctonetData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,5 +97,6 @@ class ATTR_DLL_LOCAL OctonetData : public kodi::addon::CInstancePVRClient
time_t m_lastEpgLoad;

std::atomic<bool> m_running = {false};
std::atomic<bool> m_readInitialEPG = {false};
std::thread m_thread;
};