add function to get a comparable service reference string (useable to

compare servicesrefs in python)

diff --git a/lib/service/iservice.h b/lib/service/iservice.h
index eff03436d1a42dd1f4a4e9cbd3e3e7a918a45c10..31c1c99d7d025bfd9ef7f2c20db94f2a219d1785 100644 (file)
--- a/lib/service/iservice.h
+++ b/lib/service/iservice.h
@@ -145,6 +145,7 @@ public:
 #endif
        eServiceReference(const std::string &string);
        std::string toString() const;
+       std::string toCompareString() const;
        bool operator==(const eServiceReference &c) const
        {
                if (type != c.type)

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index 11f88b1fe251c14170c233846e5f80ac1cd0fbc6..aa1ee4d855a0152a99b966f202b0bce57c635389 100644 (file)
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -51,6 +51,16 @@ std::string eServiceReference::toString() const
        return ret;
 }
 
+std::string eServiceReference::toCompareString() const
+{
+       std::string ret;
+       ret += getNum(type);
+       ret += ":0";
+       for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
+               ret+=":"+getNum(data[i], 0x10);
+       ret+=":"+path;
+       return ret;
+}
 
 eServiceCenter *eServiceCenter::instance;
 

diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 75b55215b9158099309f3785d8ce55c5ae2fa873..750fd34c207b3dba3c597497d5078ba0e9aca6ad 100644 (file)
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -396,6 +396,7 @@ RESULT eDVBServiceList::getContent(std::list<eServiceReference> &list, bool sort
 //   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
@@ -435,6 +436,9 @@ PyObject *eDVBServiceList::getContent(const char* format, bool sorted)
                                case 'R':  // service reference (swig)object
                                        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());
                                        break;

diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp
index 1f65ae1739de0597197133d02047b34fcd10957f..16948854484240a9af262edec8cad69c3e65315d 100644 (file)
--- a/lib/service/servicefs.cpp
+++ b/lib/service/servicefs.cpp
@@ -177,6 +177,7 @@ RESULT eServiceFS::getContent(std::list<eServiceReference> &list, bool sorted)
 //   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
@@ -216,6 +217,9 @@ PyObject *eServiceFS::getContent(const char* format, bool sorted)
                                case 'R':  // service reference (swig)object
                                        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());
                                        break;