DEFINE_REF(eDVBService);
+RESULT eBouquet::addService(const eServiceReference &ref)
+{
+ list::iterator it =
+ std::find(m_services.begin(), m_services.end(), ref);
+ if ( it != m_services.end() )
+ return -1;
+ m_services.push_back(ref);
+ return 0;
+}
+
+RESULT eBouquet::removeService(const eServiceReference &ref)
+{
+ list::iterator it =
+ std::find(m_services.begin(), m_services.end(), ref);
+ if ( it == m_services.end() )
+ return -1;
+ m_services.erase(it);
+ return 0;
+}
+
+RESULT eBouquet::moveService(const eServiceReference &ref, unsigned int pos)
+{
+ if ( pos < 0 || pos >= m_services.size() )
+ return -1;
+ ++pos;
+ list::iterator source=m_services.end();
+ list::iterator dest=m_services.end();
+ bool forward = false;
+ for (list::iterator it(m_services.begin()); it != m_services.end(); ++it)
+ {
+ if (dest == m_services.end() && !--pos)
+ dest = it;
+ if (*it == ref)
+ {
+ source = it;
+ forward = pos>0;
+ }
+ if (dest != m_services.end() && source != m_services.end())
+ break;
+ }
+ if (dest == m_services.end() || source == m_services.end() || source == dest)
+ return -1;
+ while (source != dest)
+ {
+ if (forward)
+ std::iter_swap(source++, source);
+ else
+ std::iter_swap(source--, source);
+ }
+ return 0;
+}
+
+RESULT eBouquet::flushChanges()
+{
+ FILE *f=fopen(m_path.c_str(), "wt");
+ if (!f)
+ return -1;
+ if ( fprintf(f, "#NAME %s\r\n", m_bouquet_name.c_str()) < 0 )
+ goto err;
+ for (list::iterator i(m_services.begin()); i != m_services.end(); ++i)
+ {
+ eServiceReference tmp = *i;
+ std::string str = tmp.path;
+ if ( (i->flags&eServiceReference::flagDirectory) == eServiceReference::flagDirectory )
+ {
+ unsigned int p1 = str.find("FROM BOUQUET \"");
+ if (p1 == std::string::npos)
+ {
+ eDebug("doof... kaputt");
+ continue;
+ }
+ str.erase(0, p1+14);
+ p1 = str.find("\"");
+ if (p1 == std::string::npos)
+ {
+ eDebug("doof2... kaputt");
+ continue;
+ }
+ str.erase(p1);
+ tmp.path=str;
+ }
+ if ( fprintf(f, "#SERVICE %s\r\n", tmp.toString().c_str()) < 0 )
+ goto err;
+ if ( i->name.length() )
+ if ( fprintf(f, "#DESCRIPTION %s\r\n", i->name.c_str()) < 0 )
+ goto err;
+ }
+ fclose(f);
+ return 0;
+err:
+ fclose(f);
+ eDebug("couldn't write file %s", m_path.c_str());
+ return -1;
+}
+
eDVBService::eDVBService()
{
}
return *this;
}
+void eDVBService::genSortName()
+{
+ m_service_name_sort = removeDVBChars(m_service_name);
+ 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.length() )
+ if (!ref.name.empty())
name = ref.name;
- else
+ else if (!m_service_name.empty())
name = m_service_name;
+ else
+ name = "(...)";
return 0;
}
sat.fec = fec;
sat.orbital_position = orbital_position;
sat.inversion = inversion;
- // ...
-// t.setSatellite(frequency, symbol_rate, polarisation, fec, sat, inversion);
feparm->setDVBS(sat);
} else if (line[1]=='t')
{
line[strlen(line)-1]=0;
s->m_service_name = line;
- s->m_service_name_sort = removeDVBChars(line);
- makeUpper(s->m_service_name_sort);
-
+ s->genSortName();
+
fgets(line, 256, f);
if (strlen(line))
line[strlen(line)-1]=0;
if (!fp)
{
eDebug("failed to open.");
+ if ( strstr(path, "bouquets.tv") )
+ {
+ eDebug("recreate bouquets.tv");
+ bouquet.m_bouquet_name="Bouquets (TV)";
+ bouquet.flushChanges();
+ }
+ else if ( strstr(path, "bouquets.radio") )
+ {
+ eDebug("recreate bouquets.radio");
+ bouquet.m_bouquet_name="Bouquets (Radio)";
+ bouquet.flushChanges();
+ }
return;
}
char line[256];
char buf[256];
snprintf(buf, 256, "(type == %d) FROM BOUQUET \"%s\" ORDER BY bouquet", tmp.data[0], str.c_str());
tmp.path = buf;
- eDebug("read bouquet %s", tmp.toString().c_str());
}
list.push_back(tmp);
e = &list.back();
eDebug("%d entries in Bouquet %s", entries, bouquet_name.c_str());
}
-void eDVBDB::saveBouquet(const char *path)
-{
-
-}
-
void eDVBDB::loadBouquets()
{
loadBouquet("bouquets.tv");
loadBouquet("bouquets.radio");
-}
-
-void eDVBDB::saveBouquets()
-{
-
+// 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_bouquet_name = "Favourites (TV)";
+ b.flushChanges();
+ eServiceReference ref;
+ memset(ref.data, 0, sizeof(ref.data));
+ ref.type=1;
+ ref.flags=7;
+ ref.data[0]=1;
+ ref.path="(type == 1) FROM BOUQUET \"userbouquet.favourites.tv\" ORDER BY bouquet";
+ eBouquet &parent = m_bouquets["bouquets.tv"];
+ parent.m_services.push_back(ref);
+ parent.flushChanges();
+ }
+ 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_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.path="(type == 2) FROM BOUQUET \"userbouquet.favourites.radio\" ORDER BY bouquet";
+ eBouquet &parent = m_bouquets["bouquets.radio"];
+ parent.m_services.push_back(ref);
+ parent.flushChanges();
+ }
}
eDVBDB::eDVBDB()
return 0;
}
-RESULT eDVBDB::getBouquet(const eServiceReference &ref, const eBouquet* &bouquet)
+RESULT eDVBDB::flush()
+{
+ save();
+ return 0;
+}
+
+RESULT eDVBDB::getBouquet(const eServiceReference &ref, eBouquet* &bouquet)
{
std::string str = ref.path;
if (str.empty())
if ( pos != std::string::npos )
{
str.erase(0, pos+14);
- eDebug("str now %s", str.c_str());
pos = str.find('"');
if ( pos != std::string::npos )
str.erase(pos);
else
str.clear();
- eDebug("str now %s", str.c_str());
}
if (str.empty())
{
RESULT eDVBDB::startQuery(ePtr<iDVBChannelListQuery> &query, eDVBChannelQuery *q, const eServiceReference &source)
{
if ( q && q->m_bouquet_name.length() )
- {
- eDebug("bouquet");
query = new eDVBDBBouquetQuery(this, source, q);
- }
else
query = new eDVBDBQuery(this, source, q);
return 0;
return 0;
}
- ref = eServiceReferenceDVB();
+ ref.type = eServiceReference::idInvalid;
+
return 1;
}
return 0;
}
- ref = eServiceReferenceDVB();
+ ref.type = eServiceReference::idInvalid;
return 1;
}
/* we had only one sub expression */
if (end_of_exp == end)
{
- eDebug("only one sub expression");
+// eDebug("only one sub expression");
return 0;
}
std::string current_token;
std::string bouquet_name;
- eDebug("splitting %s....", query.c_str());
+// eDebug("splitting %s....", query.c_str());
unsigned int i = 0;
const char *splitchars="()";
int quotemode = 0, lastsplit = 0, lastalnum = 0;
return -1;
}
- eDebug("sort by %d", sort);
+// eDebug("sort by %d", sort);
/* now we recursivly parse that. */
int r = parseExpression(res, tokens.begin(), tokens.end());
res->m_bouquet_name = bouquet_name;
}
- eDebug("return: %d", r);
+// eDebug("return: %d", r);
return r;
}
git.cweiske.de / enigma2.git / blobdiff