eServiceCenter::getPrivInstance(sc);
if (sc)
- sc->addServiceFactory(eServiceFactoryFS::id, this);
+ {
+ std::list<std::string> extensions;
+ sc->addServiceFactory(eServiceFactoryFS::id, this, extensions);
+ }
m_service_information = new eStaticServiceFSInformation();
}
RESULT eServiceFactoryFS::list(const eServiceReference &ref, ePtr<iListableService> &ptr)
{
- ptr = new eServiceFS(ref.path.c_str());
+ ptr = new eServiceFS(ref.path.c_str(), ref.getName().length() ? ref.getName().c_str() : 0);
return 0;
}
DEFINE_REF(eServiceFS);
-eServiceFS::eServiceFS(const char *path): path(path)
+eServiceFS::eServiceFS(const char *path, const char *additional_extensions): path(path)
{
m_list_valid = 0;
+ if (additional_extensions)
+ {
+ size_t slen=strlen(additional_extensions);
+ char buf[slen+1];
+ char *tmp=0, *cmds = buf;
+ memcpy(buf, additional_extensions, slen+1);
+
+ // strip spaces at beginning
+ while(cmds[0] == ' ')
+ {
+ ++cmds;
+ --slen;
+ }
+
+ // strip spaces at the end
+ while(slen && cmds[slen-1] == ' ')
+ {
+ cmds[slen-1] = 0;
+ --slen;
+ }
+
+ if (slen)
+ {
+ if (*cmds)
+ {
+ int id;
+ char buf2[16];
+ while(1)
+ {
+ tmp = strchr(cmds, ' ');
+ if (tmp)
+ *tmp = 0;
+ if (strstr(cmds, "0x"))
+ {
+ if (sscanf(cmds, "0x%x:%s", &id, buf2) == 2)
+ m_additional_extensions[id].push_back(buf2);
+ else
+ eDebug("parse additional_extension (%s) failed", cmds);
+ }
+ else
+ {
+ if (sscanf(cmds, "%d:%s", &id, buf2) == 2)
+ m_additional_extensions[id].push_back(buf2);
+ else
+ eDebug("parse additional_extension (%s) failed", cmds);
+ }
+ if (!tmp)
+ break;
+ cmds = tmp+1;
+ while (*cmds && *cmds == ' ')
+ ++cmds;
+ }
+ }
+ }
+ }
}
eServiceFS::~eServiceFS()
{
}
+int lower(char c)
+{
+ return std::tolower(static_cast<unsigned char>(c));
+}
+
RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted)
{
DIR *d=opendir(path.c_str());
} else
{
size_t e = filename.rfind('.');
- std::string extension = (e != std::string::npos) ? filename.substr(e) : "";
- int type = -1;
-
- if (extension == ".ts")
- type = eServiceFactoryDVB::id;
- else if (extension == ".mp3")
- type = 4097;
- else if (extension == ".ogg")
- type = 4097;
- else if (extension == ".mpg")
- type = 4097;
- else if (extension == ".vob")
- type = 4097;
- else if (extension == ".wav" || extension == ".wave")
- type = 4097;
- else if (extension == ".m3u" || extension == ".pls" || extension == ".e2pls")
- type = 4098;
-
- if (type != -1)
+ if (e != std::string::npos && e+1 < filename.length())
{
- eServiceReference service(type,
- 0,
- filename);
- service.data[0] = 0;
- list.push_back(service);
+ std::string extension = filename.substr(e+1);
+ std::transform(extension.begin(), extension.end(), extension.begin(), lower);
+ int type = getServiceTypeForExtension(extension);
+
+ if (type == -1)
+ {
+ ePtr<eServiceCenter> sc;
+ eServiceCenter::getPrivInstance(sc);
+ type = sc->getServiceTypeForExtension(extension);
+ }
+
+ if (type != -1)
+ {
+ eServiceReference service(type,
+ 0,
+ filename);
+ service.data[0] = 0;
+ list.push_back(service);
+ }
}
}
}
// useable format options are
// R = Service Reference (as swig object .. this is very slow)
// S = Service Reference (as python string object .. same as ref.toString())
+// C = Service Reference (as python string object .. same as ref.toCompareString())
// N = Service Name (as python string object)
// when exactly one return value per service is selected in the format string,
// then each value is directly a list entry
// unknown format string chars are returned as python None values !
PyObject *eServiceFS::getContent(const char* format, bool sorted)
{
- PyObject *ret=0;
+ ePyObject ret;
std::list<eServiceReference> tmplist;
int retcount=1;
for (int cnt=0; cnt < services; ++cnt)
{
eServiceReference &ref=*it++;
- PyObject *tuple = retcount > 1 ? PyTuple_New(retcount) : 0;
+ ePyObject tuple = retcount > 1 ? PyTuple_New(retcount) : ePyObject();
for (int i=0; i < retcount; ++i)
{
- PyObject *tmp=0;
+ ePyObject tmp;
switch(format[i])
{
case 'R': // service reference (swig)object
- tmp = New_eServiceReference(ref);
+ tmp = NEW_eServiceReference(ref);
+ break;
+ case 'C': // service reference compare string
+ tmp = PyString_FromString(ref.toCompareString().c_str());
break;
case 'S': // service reference string
tmp = PyString_FromString(ref.toString().c_str());
PyList_SET_ITEM(ret, cnt, tuple);
}
}
- return ret ? ret : PyList_New(0);
+ return ret ? (PyObject*)ret : (PyObject*)PyList_New(0);
}
RESULT eServiceFS::getNext(eServiceReference &ptr)
return -1;
}
+int eServiceFS::getServiceTypeForExtension(const char *str)
+{
+ for (std::map<int, std::list<std::string> >::iterator sit(m_additional_extensions.begin()); sit != m_additional_extensions.end(); ++sit)
+ {
+ for (std::list<std::string>::iterator eit(sit->second.begin()); eit != sit->second.end(); ++eit)
+ {
+ if (*eit == str)
+ return sit->first;
+ }
+ }
+ return -1;
+}
+
+int eServiceFS::getServiceTypeForExtension(const std::string &str)
+{
+ return getServiceTypeForExtension(str.c_str());
+}
+
eAutoInitPtr<eServiceFactoryFS> init_eServiceFactoryFS(eAutoInitNumbers::service+1, "eServiceFactoryFS");
git.cweiske.de / enigma2.git / blobdiff