DEFINE_REF(eDVBService);
-RESULT eBouquet::addService(const eServiceReference &ref)
+RESULT eBouquet::addService(const eServiceReference &ref, eServiceReference before)
{
list::iterator it =
std::find(m_services.begin(), m_services.end(), ref);
if ( it != m_services.end() )
return -1;
- m_services.push_back(ref);
+ if (before.valid())
+ {
+ it = std::find(m_services.begin(), m_services.end(), before);
+ m_services.insert(it, ref);
+ }
+ else
+ m_services.push_back(ref);
return 0;
}
RESULT eBouquet::flushChanges()
{
- FILE *f=fopen(m_path.c_str(), "wt");
+ FILE *f=fopen((CONFIGDIR"/enigma2/"+m_filename).c_str(), "w");
if (!f)
return -1;
if ( fprintf(f, "#NAME %s\r\n", m_bouquet_name.c_str()) < 0 )
{
eServiceReference tmp = *i;
std::string str = tmp.path;
- if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+ if ( i->flags&eServiceReference::canDescent )
{
unsigned int p1 = str.find("FROM BOUQUET \"");
if (p1 == std::string::npos)
return 0;
err:
fclose(f);
- eDebug("couldn't write file %s", m_path.c_str());
+ eDebug("couldn't write file %s", m_filename.c_str());
return -1;
}
+RESULT eBouquet::setListName(const std::string &name)
+{
+ m_bouquet_name = name;
+ return 0;
+}
+
eDVBService::eDVBService()
+ :m_cache(0), m_flags(0)
{
}
eDVBService::~eDVBService()
{
+ delete [] m_cache;
}
eDVBService &eDVBService::operator=(const eDVBService &s)
m_provider_name = s.m_provider_name;
m_flags = s.m_flags;
m_ca = s.m_ca;
- m_cache = s.m_cache;
+ copyCache(s.m_cache);
return *this;
}
makeUpper(m_service_name_sort);
while ((!m_service_name_sort.empty()) && m_service_name_sort[0] == ' ')
m_service_name_sort.erase(0, 1);
-
+
/* put unnamed services at the end, not at the beginning. */
if (m_service_name_sort.empty())
m_service_name_sort = "\xFF";
RESULT eDVBService::getName(const eServiceReference &ref, std::string &name)
{
- if (!ref.name.empty())
+ if (!ref.name.empty())
name = ref.name; // use renamed service name..
else if (!m_service_name.empty())
name = m_service_name;
return 0;
}
-RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr)
+RESULT eDVBService::getEvent(const eServiceReference &ref, ePtr<eServiceEvent> &ptr, time_t start_time)
{
- time_t t=-1;
- return eEPGCache::getInstance()->lookupEventTime(ref, t, ptr);
+ return eEPGCache::getInstance()->lookupEventTime(ref, start_time, ptr);
}
-bool eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
+int eDVBService::isPlayable(const eServiceReference &ref, const eServiceReference &ignore)
{
ePtr<eDVBResourceManager> res_mgr;
if ( eDVBResourceManager::getInstance( res_mgr ) )
((const eServiceReferenceDVB&)ignore).getChannelID(chid_ignore);
return res_mgr->canAllocateChannel(chid, chid_ignore);
}
- return false;
+ return 0;
}
int eDVBService::checkFilter(const eServiceReferenceDVB &ref, const eDVBChannelQuery &query)
res = 0;
break;
case eDVBChannelQuery::tSatellitePosition:
- res = (ref.getDVBNamespace().get() >> 16) == query.m_int;
+ res = ((unsigned int)ref.getDVBNamespace().get())>>16 == (unsigned int)query.m_int;
+ break;
+ case eDVBChannelQuery::tFlags:
+ res = (m_flags & query.m_int) == query.m_int;
break;
case eDVBChannelQuery::tChannelID:
{
case eDVBChannelQuery::tOR:
res = checkFilter(ref, *query.m_p1) || checkFilter(ref, *query.m_p2);
break;
+ case eDVBChannelQuery::tAny:
+ res = 1;
+ break;
}
if (query.m_inverse)
return res;
}
-int eDVBService::getCachePID(cacheID id)
+bool eDVBService::cacheEmpty()
{
- std::map<int, int>::iterator it = m_cache.find(id);
- if ( it != m_cache.end() )
- return it->second;
- return -1;
+ if (m_cache)
+ for (int i=0; i < cacheMax; ++i)
+ if (m_cache[i] != -1)
+ return false;
+ return true;
}
-void eDVBService::setCachePID(cacheID id, int pid)
+void eDVBService::initCache()
{
- m_cache[id] = pid;
+ m_cache = new int[cacheMax];
+ memset(m_cache, -1, sizeof(int) * cacheMax);
+}
+
+void eDVBService::copyCache(int *source)
+{
+ if (source)
+ {
+ if (!m_cache)
+ m_cache = new int[cacheMax];
+ memcpy(m_cache, source, cacheMax * sizeof(int));
+ }
+ else
+ {
+ delete [] m_cache;
+ m_cache = 0;
+ }
+}
+
+int eDVBService::getCacheEntry(cacheID id)
+{
+ if (id >= cacheMax || !m_cache)
+ return -1;
+ return m_cache[id];
+}
+
+void eDVBService::setCacheEntry(cacheID id, int pid)
+{
+ if (!m_cache)
+ initCache();
+ if (id < cacheMax)
+ m_cache[id] = pid;
}
DEFINE_REF(eDVBDB);
/* THIS CODE IS BAD. it should be replaced by somethine better. */
-void eDVBDB::load()
+void eDVBDB::reloadServicelist()
{
eDebug("---- opening lame channel db");
- FILE *f=fopen("lamedb", "rt");
+ FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "rt");
if (!f)
+ {
+ struct stat s;
+ if ( !stat("lamedb", &s) )
+ {
+ if ( !stat(CONFIGDIR"/enigma2", &s) )
+ {
+ rename("lamedb", CONFIGDIR"/enigma2/lamedb" );
+ reloadServicelist();
+ }
+ }
return;
+ }
char line[256];
if ((!fgets(line, 256, f)) || strncmp(line, "eDVB services", 13))
{
if (line[1]=='s')
{
eDVBFrontendParametersSatellite sat;
- int frequency, symbol_rate, polarisation, fec, orbital_position, inversion;
- sscanf(line+2, "%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion);
+ int frequency, symbol_rate, polarisation, fec, orbital_position, inversion,
+ system=eDVBFrontendParametersSatellite::System::DVB_S,
+ modulation=eDVBFrontendParametersSatellite::Modulation::QPSK,
+ rolloff=eDVBFrontendParametersSatellite::RollOff::alpha_auto;
+ sscanf(line+2, "%d:%d:%d:%d:%d:%d:%d:%d:%d", &frequency, &symbol_rate, &polarisation, &fec, &orbital_position, &inversion, &system, &modulation, &rolloff);
sat.frequency = frequency;
sat.symbol_rate = symbol_rate;
sat.polarisation = polarisation;
sat.fec = fec;
- sat.orbital_position = orbital_position;
+ sat.orbital_position =
+ orbital_position < 0 ? orbital_position + 3600 : orbital_position;
sat.inversion = inversion;
+ sat.system = system;
+ sat.modulation = modulation;
+ sat.roll_off = rolloff;
feparm->setDVBS(sat);
} else if (line[1]=='t')
{
ter.guard_interval = guard_interval;
ter.hierarchy = hierarchy;
ter.inversion = inversion;
-
feparm->setDVBT(ter);
} else if (line[1]=='c')
{
- int frequency, symbol_rate, inversion=0, modulation=3;
- sscanf(line+2, "%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation);
-// t.setCable(frequency, symbol_rate, inversion, modulation);
+ eDVBFrontendParametersCable cab;
+ int frequency, symbol_rate,
+ inversion=eDVBFrontendParametersCable::Inversion::Unknown,
+ modulation=eDVBFrontendParametersCable::Modulation::Auto,
+ fec_inner=eDVBFrontendParametersCable::FEC::fAuto;
+ sscanf(line+2, "%d:%d:%d:%d:%d", &frequency, &symbol_rate, &inversion, &modulation, &fec_inner);
+ cab.frequency = frequency;
+ cab.fec_inner = fec_inner;
+ cab.inversion = inversion;
+ cab.symbol_rate = symbol_rate;
+ cab.modulation = modulation;
+ feparm->setDVBC(cab);
}
}
addChannelToList(channelid, feparm);
s->m_service_name = line;
s->genSortName();
-
+
fgets(line, 256, f);
if (strlen(line))
line[strlen(line)-1]=0;
-
std::string str=line;
if (str[1]!=':') // old ... (only service_provider)
} else if (p == 'c')
{
int cid, val;
- sscanf(v.c_str(), "%02d%04x", &cid, &val);
- s->m_cache[cid]=val;
+ sscanf(v.c_str(), "%02d%x", &cid, &val);
+ s->setCacheEntry((eDVBService::cacheID)cid,val);
} else if (p == 'C')
{
int val;
sscanf(v.c_str(), "%04x", &val);
- s->m_ca.insert(val);
+ s->m_ca.push_front((uint16_t)val);
}
}
addService(ref, s);
fclose(f);
}
-void eDVBDB::save()
+void eDVBDB::saveServicelist()
{
eDebug("---- saving lame channel db");
- FILE *f=fopen("lamedb", "wt");
+ FILE *f=fopen(CONFIGDIR"/enigma2/lamedb", "w");
int channels=0, services=0;
if (!f)
eFatal("couldn't save lame channel db!");
chid.transport_stream_id.get(), chid.original_network_id.get());
eDVBFrontendParametersSatellite sat;
eDVBFrontendParametersTerrestrial ter;
+ eDVBFrontendParametersCable cab;
if (!ch.m_frontendParameters->getDVBS(sat))
{
- fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
- sat.frequency, sat.symbol_rate,
- sat.polarisation, sat.fec, sat.orbital_position,
- sat.inversion);
+ if (sat.system == eDVBFrontendParametersSatellite::System::DVB_S2)
+ {
+ fprintf(f, "\ts %d:%d:%d:%d:%d:%d:%d:%d:%d\n",
+ sat.frequency, sat.symbol_rate,
+ sat.polarisation, sat.fec,
+ sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
+ sat.inversion,
+ sat.system,
+ sat.modulation,
+ sat.roll_off);
+ }
+ else
+ {
+ fprintf(f, "\ts %d:%d:%d:%d:%d:%d\n",
+ sat.frequency, sat.symbol_rate,
+ sat.polarisation, sat.fec,
+ sat.orbital_position > 1800 ? sat.orbital_position - 3600 : sat.orbital_position,
+ sat.inversion);
+ }
}
if (!ch.m_frontendParameters->getDVBT(ter))
{
ter.code_rate_LP, ter.modulation, ter.transmission_mode,
ter.guard_interval, ter.hierarchy, ter.inversion);
}
+ if (!ch.m_frontendParameters->getDVBC(cab))
+ {
+ fprintf(f, "\tc %d:%d:%d:%d:%d\n",
+ cab.frequency, cab.symbol_rate, cab.inversion, cab.modulation, cab.fec_inner);
+ }
fprintf(f, "/\n");
channels++;
}
0);
fprintf(f, "%s\n", i->second->m_service_name.c_str());
+
fprintf(f, "p:%s", i->second->m_provider_name.c_str());
// write cached pids
- for (std::map<int,int>::const_iterator ca(i->second->m_cache.begin());
- ca != i->second->m_cache.end(); ++ca)
- fprintf(f, ",c:%02d%04x", ca->first, ca->second);
+ for (int x=0; x < eDVBService::cacheMax; ++x)
+ {
+ int entry = i->second->getCacheEntry((eDVBService::cacheID)x);
+ if (entry != -1)
+ fprintf(f, ",c:%02d%04x", x, entry);
+ }
// write cached ca pids
- for (std::set<int>::const_iterator ca(i->second->m_ca.begin());
+ for (CAID_LIST::const_iterator ca(i->second->m_ca.begin());
ca != i->second->m_ca.end(); ++ca)
fprintf(f, ",C:%04x", *ca);
+ if (i->second->m_flags)
+ fprintf(f, ",f:%x", i->second->m_flags);
+
fprintf(f, "\n");
services++;
}
return;
}
eBouquet &bouquet = m_bouquets[bouquet_name];
- bouquet.m_path = path;
+ bouquet.m_filename = bouquet_name;
std::list<eServiceReference> &list = bouquet.m_services;
list.clear();
- eDebug("loading bouquet... %s", path);
- FILE *fp=fopen(path, "rt");
+ std::string p = CONFIGDIR"/enigma2/";
+ p+=path;
+ eDebug("loading bouquet... %s", p.c_str());
+ FILE *fp=fopen(p.c_str(), "rt");
int entries=0;
if (!fp)
{
+ struct stat s;
+ if ( !stat(path, &s) )
+ {
+ rename(path, p.c_str() );
+ loadBouquet(path);
+ return;
+ }
eDebug("failed to open.");
if ( strstr(path, "bouquets.tv") )
{
eDebug("only DVB Bouquets supported");
continue;
}
- if ( (tmp.flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+ if ( tmp.flags&eServiceReference::canDescent )
{
- std::string str = tmp.path;
- unsigned int pos = str.rfind('/');
+ unsigned int pos = tmp.path.rfind('/');
if ( pos != std::string::npos )
- str.erase(0, pos+1);
- if (str.empty())
+ tmp.path.erase(0, pos+1);
+ if (tmp.path.empty())
{
eDebug("Bouquet load failed.. no filename given..");
continue;
}
loadBouquet(tmp.path.c_str());
char buf[256];
- snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], str.c_str());
+ snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], tmp.path.c_str());
tmp.path = buf;
}
list.push_back(tmp);
eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
}
-void eDVBDB::loadBouquets()
+void eDVBDB::reloadBouquets()
{
+ m_bouquets.clear();
loadBouquet("bouquets.tv");
loadBouquet("bouquets.radio");
// create default bouquets when missing
if ( m_bouquets.find("userbouquet.favourites.tv") == m_bouquets.end() )
{
eBouquet &b = m_bouquets["userbouquet.favourites.tv"];
- b.m_path = "userbouquet.favourites.tv";
+ b.m_filename = "userbouquet.favourites.tv";
b.m_bouquet_name = "Favourites (TV)";
b.flushChanges();
eServiceReference ref;
if ( m_bouquets.find("userbouquet.favourites.radio") == m_bouquets.end() )
{
eBouquet &b = m_bouquets["userbouquet.favourites.radio"];
- b.m_path = "userbouquet.favourites.radio";
+ b.m_filename = "userbouquet.favourites.radio";
b.m_bouquet_name = "Favourites (Radio)";
b.flushChanges();
eServiceReference ref;
memset(ref.data, 0, sizeof(ref.data));
ref.type=1;
ref.flags=7;
- ref.data[0]=1;
+ ref.data[0]=2;
ref.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
eBouquet &parent = m_bouquets["bouquets.radio"];
parent.m_services.push_back(ref);
}
}
+eDVBDB *eDVBDB::instance;
+
eDVBDB::eDVBDB()
{
- load();
- loadBouquets();
+ instance = this;
+ reloadServicelist();
}
eDVBDB::~eDVBDB()
{
-// save();
+ instance=NULL;
+}
+
+RESULT eDVBDB::removeService(const eServiceReference &ref)
+{
+ if (ref.type == eServiceReference::idDVB)
+ {
+ eServiceReferenceDVB &service = (eServiceReferenceDVB&)ref;
+ std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_services.find(service));
+ if (it != m_services.end())
+ {
+ m_services.erase(it);
+ return 0;
+ }
+ }
+ return -1;
+}
+
+RESULT eDVBDB::removeServices(int dvb_namespace, int tsid, int onid, unsigned int orb_pos)
+{
+ return removeServices(eDVBChannelID(eDVBNamespace(dvb_namespace), eTransportStreamID(tsid), eOriginalNetworkID(onid)), orb_pos);
+}
+
+RESULT eDVBDB::removeServices(eDVBChannelID chid, unsigned int orbpos)
+{
+ RESULT ret=-1;
+ eDVBNamespace eNs;
+ eTransportStreamID eTsid;
+ eOriginalNetworkID eOnid;
+ std::map<eDVBChannelID, channel>::iterator it(m_channels.begin());
+ std::set<eDVBChannelID> removed_chids;
+ while (it != m_channels.end())
+ {
+ const eDVBChannelID &ch = it->first;
+ bool remove=true;
+ int system;
+ it->second.m_frontendParameters->getSystem(system);
+ if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+ {
+ eDVBFrontendParametersSatellite sat;
+ it->second.m_frontendParameters->getDVBS(sat);
+ if ((unsigned int)sat.orbital_position != orbpos)
+ remove=false;
+ }
+ if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
+ remove=false;
+ if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
+ remove=false;
+ if ( remove && chid.transport_stream_id != eTsid && chid.transport_stream_id != ch.transport_stream_id )
+ remove=false;
+ if ( remove )
+ {
+ eDebug("remove %08x %04x %04x",
+ ch.dvbnamespace.get(),
+ ch.original_network_id.get(),
+ ch.transport_stream_id.get());
+ removed_chids.insert(it->first);
+ m_channels.erase(it++);
+ }
+ else
+ ++it;
+ }
+ if (!removed_chids.empty())
+ {
+ std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator service(m_services.begin());
+ while(service != m_services.end())
+ {
+ eDVBChannelID chid;
+ service->first.getChannelID(chid);
+ std::set<eDVBChannelID>::iterator it(removed_chids.find(chid));
+ if (it != removed_chids.end())
+ m_services.erase(service++);
+ else
+ ++service;
+ ret=0;
+ }
+ }
+ return ret;
+}
+
+RESULT eDVBDB::addFlag(const eServiceReference &ref, unsigned int flagmask)
+{
+ if (ref.type == eServiceReference::idDVB)
+ {
+ eServiceReferenceDVB &service = (eServiceReferenceDVB&)ref;
+ std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_services.find(service));
+ if (it != m_services.end())
+ it->second->m_flags |= ~flagmask;
+ return 0;
+ }
+ return -1;
+}
+
+RESULT eDVBDB::removeFlag(const eServiceReference &ref, unsigned int flagmask)
+{
+ if (ref.type == eServiceReference::idDVB)
+ {
+ eServiceReferenceDVB &service = (eServiceReferenceDVB&)ref;
+ std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_services.find(service));
+ if (it != m_services.end())
+ it->second->m_flags &= ~flagmask;
+ return 0;
+ }
+ return -1;
+}
+
+RESULT eDVBDB::removeFlags(unsigned int flagmask, int dvb_namespace, int tsid, int onid, unsigned int orb_pos)
+{
+ return removeFlags(flagmask, eDVBChannelID(eDVBNamespace(dvb_namespace), eTransportStreamID(tsid), eOriginalNetworkID(onid)), orb_pos);
+}
+
+RESULT eDVBDB::removeFlags(unsigned int flagmask, eDVBChannelID chid, unsigned int orbpos)
+{
+ eDVBNamespace eNs;
+ eTransportStreamID eTsid;
+ eOriginalNetworkID eOnid;
+ std::map<eDVBChannelID, channel>::iterator it(m_channels.begin());
+ std::set<eDVBChannelID> removed_chids;
+ while (it != m_channels.end())
+ {
+ const eDVBChannelID &ch = it->first;
+ bool remove=true;
+ int system;
+ it->second.m_frontendParameters->getSystem(system);
+ if ( orbpos != 0xFFFFFFFF && system == iDVBFrontend::feSatellite )
+ {
+ eDVBFrontendParametersSatellite sat;
+ it->second.m_frontendParameters->getDVBS(sat);
+ if ((unsigned int)sat.orbital_position != orbpos)
+ remove=false;
+ }
+ if ( remove && chid.dvbnamespace != eNs && chid.dvbnamespace != ch.dvbnamespace )
+ remove=false;
+ if ( remove && chid.original_network_id != eOnid && chid.original_network_id != ch.original_network_id )
+ remove=false;
+ if ( remove && chid.transport_stream_id != eTsid && chid.transport_stream_id != ch.transport_stream_id )
+ remove=false;
+ if ( remove )
+ removed_chids.insert(it->first);
+ ++it;
+ }
+ if (!removed_chids.empty())
+ {
+ std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator service(m_services.begin());
+ while(service != m_services.end())
+ {
+ eDVBChannelID chid;
+ service->first.getChannelID(chid);
+ std::set<eDVBChannelID>::iterator it(removed_chids.find(chid));
+ if (it != removed_chids.end())
+ service->second->m_flags &= ~flagmask;
+ ++service;
+ }
+ }
+ return 0;
}
RESULT eDVBDB::addChannelToList(const eDVBChannelID &id, iDVBFrontendParameters *feparm)
RESULT eDVBDB::addService(const eServiceReferenceDVB &serviceref, eDVBService *service)
{
- m_services.insert(std::pair<eServiceReferenceDVB, ePtr<eDVBService> >(serviceref, service));
+ std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_services.find(serviceref));
+ if (it == m_services.end())
+ m_services.insert(std::pair<eServiceReferenceDVB, ePtr<eDVBService> >(serviceref, service));
return 0;
}
RESULT eDVBDB::flush()
{
- save();
+ saveServicelist();
return 0;
}
return 0;
}
+eServiceReference eDVBDB::searchReference(int tsid, int onid, int sid)
+{
+ eServiceID Sid(sid);
+ eTransportStreamID Tsid(tsid);
+ eOriginalNetworkID Onid(onid);
+ for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator sit(m_services.begin());
+ sit != m_services.end(); ++sit)
+ {
+ if (sit->first.getTransportStreamID() == Tsid &&
+ sit->first.getOriginalNetworkID() == Onid &&
+ sit->first.getServiceID() == Sid)
+ return sit->first;
+ }
+ return eServiceReference();
+}
+
DEFINE_REF(eDVBDBQueryBase);
eDVBDBQueryBase::eDVBDBQueryBase(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
int eDVBDBQueryBase::compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)
{
ePtr<eDVBService> a_service, b_service;
-
int sortmode = m_query ? m_query->m_sort : eDVBChannelQuery::tName;
if ((sortmode == eDVBChannelQuery::tName) || (sortmode == eDVBChannelQuery::tProvider))
{
- if (m_db->getService(a, a_service))
+ if (a.name.empty() && m_db->getService(a, a_service))
return 1;
- if (m_db->getService(b, b_service))
+ if (b.name.empty() && m_db->getService(b, b_service))
return 1;
}
switch (sortmode)
{
case eDVBChannelQuery::tName:
- return a_service->m_service_name_sort < b_service->m_service_name_sort;
+ if (a_service)
+ {
+ if (b_service)
+ return a_service->m_service_name_sort < b_service->m_service_name_sort;
+ else
+ {
+ std::string str = b.name;
+ makeUpper(str);
+ return a_service->m_service_name_sort < str;
+ }
+ }
+ else if (b_service)
+ {
+ std::string str = a.name;
+ makeUpper(str);
+ return str < b_service->m_service_name_sort;
+ }
+ else
+ {
+ std::string aa = a.name, bb = b.name;
+ makeUpper(aa);
+ makeUpper(bb);
+ return aa < bb;
+ }
case eDVBChannelQuery::tProvider:
return a_service->m_provider_name < b_service->m_provider_name;
case eDVBChannelQuery::tType:
int eDVBDBListQuery::compareLessEqual(const eServiceReferenceDVB &a, const eServiceReferenceDVB &b)
{
if ( m_query->m_sort == eDVBChannelQuery::tSatellitePosition )
- return (a.getDVBNamespace().get() >> 16) < (b.getDVBNamespace().get() >> 16);
- return a.name < b.name;
+ {
+ int x = (a.getDVBNamespace().get() >> 16);
+ int y = (b.getDVBNamespace().get() >> 16);
+ if ( x > 1800 )
+ x -= 3600;
+ if ( y > 1800 )
+ y -= 3600;
+ return x < y;
+ }
+ std::string aa = a.name, bb = b.name;
+ makeUpper(aa);
+ makeUpper(bb);
+ return aa < bb;
}
eDVBDBSatellitesQuery::eDVBDBSatellitesQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
:eDVBDBListQuery(db, source, query)
{
+ std::set<unsigned int> found;
for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
it != m_db->m_services.end(); ++it)
{
if (res)
{
unsigned int dvbnamespace = it->first.getDVBNamespace().get()&0xFFFF0000;
- bool found=0;
- for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
- if ( (i->getDVBNamespace().get()&0xFFFF0000) == dvbnamespace )
- {
- found=true;
- break;
- }
- if (!found)
+ if (found.find(dvbnamespace) == found.end())
{
+ found.insert(dvbnamespace);
eServiceReferenceDVB ref;
ref.setDVBNamespace(dvbnamespace);
- char buf[64];
-// TODO get real satellite name..
-// but i dont like to parse the satellites.xml here.. and in the python part
- snprintf(buf, 64, "Services - %d", dvbnamespace>>16);
- ref.name=buf;
- snprintf(buf, 64, "(satellitePosition == %d) && ", dvbnamespace>>16);
+ ref.flags=eServiceReference::flagDirectory;
+ char buf[128];
+ snprintf(buf, 128, "(satellitePosition == %d) && ", dvbnamespace>>16);
+
ref.path=buf+source.path;
unsigned int pos=ref.path.find("FROM");
- ref.flags=eServiceReference::flagDirectory;
ref.path.erase(pos);
ref.path+="ORDER BY name";
// eDebug("ref.path now %s", ref.path.c_str());
ref.path.erase(pos+5);
ref.path+="PROVIDERS ORDER BY name";
// eDebug("ref.path now %s", ref.path.c_str());
- snprintf(buf, 64, "Providers - %d", dvbnamespace>>16);
- ref.name=buf;
+ m_list.push_back(ref);
+
+ snprintf(buf, 128, "(satellitePosition == %d) && (flags == %d) && ", dvbnamespace>>16, eDVBService::dxNewFound);
+ ref.path=buf+source.path;
+ pos=ref.path.find("FROM");
+ ref.path.erase(pos);
+ ref.path+="ORDER BY name";
+// eDebug("ref.path now %s", ref.path.c_str());
m_list.push_back(ref);
}
}
eDVBDBProvidersQuery::eDVBDBProvidersQuery(eDVBDB *db, const eServiceReference &source, eDVBChannelQuery *query)
:eDVBDBListQuery(db, source, query)
{
+ std::set<std::string> found;
for (std::map<eServiceReferenceDVB, ePtr<eDVBService> >::iterator it(m_db->m_services.begin());
it != m_db->m_services.end(); ++it)
{
int res = it->second->checkFilter(it->first, *query);
if (res)
{
- bool found=0;
-
const char *provider_name = it->second->m_provider_name.length() ?
it->second->m_provider_name.c_str() :
"Unknown";
-
- for (std::list<eServiceReferenceDVB>::iterator i(m_list.begin()); i != m_list.end(); ++i)
- if (i->name == provider_name)
- {
- found=true;
- break;
- }
- if (!found)
+ if (found.find(std::string(provider_name)) == found.end())
{
+ found.insert(std::string(provider_name));
eServiceReferenceDVB ref;
char buf[64];
ref.name=provider_name;
return eDVBChannelQuery::tSatellitePosition;
else if (type == "channelID")
return eDVBChannelQuery::tChannelID;
+ else if (type == "flags")
+ return eDVBChannelQuery::tFlags;
else
return -1;
}
RESULT parseExpression(ePtr<eDVBChannelQuery> &res, std::list<std::string>::const_iterator begin, std::list<std::string>::const_iterator end)
{
std::list<std::string>::const_iterator end_of_exp;
+
+ if (begin == end)
+ {
+ eDebug("empty expression!");
+ return 0;
+ }
+
if (*begin == "(")
{
end_of_exp = begin;
/* now we recursivly parse that. */
int r = parseExpression(res, tokens.begin(), tokens.end());
+ /* we have an empty (but valid!) expression */
+ if (!r && !res)
+ {
+ res = new eDVBChannelQuery();
+ res->m_inverse = 0;
+ res->m_type = eDVBChannelQuery::tAny;
+ }
+
if (res)
{
res->m_sort = sort;