git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generic language update
[enigma2.git]
/
lib
/
python
/
Components
/
Converter
/
ServiceName.py
diff --git
a/lib/python/Components/Converter/ServiceName.py
b/lib/python/Components/Converter/ServiceName.py
index 5de8910386beb960ab1395d43b8b65da40fa2cf7..18b1f2a592b015233b2041868e56552b9cb27c5c 100644
(file)
--- a/
lib/python/Components/Converter/ServiceName.py
+++ b/
lib/python/Components/Converter/ServiceName.py
@@
-1,36
+1,48
@@
+# -*- coding: utf-8 -*-
from Components.Converter.Converter import Converter
from Components.Converter.Converter import Converter
-from enigma import iServiceInformation, iPlayableService
+from enigma import iServiceInformation, iPlayableService
, iPlayableServicePtr
from Components.Element import cached
class ServiceName(Converter, object):
NAME = 0
PROVIDER = 1
from Components.Element import cached
class ServiceName(Converter, object):
NAME = 0
PROVIDER = 1
+ REFERENCE = 2
def __init__(self, type):
Converter.__init__(self, type)
if type == "Provider":
self.type = self.PROVIDER
def __init__(self, type):
Converter.__init__(self, type)
if type == "Provider":
self.type = self.PROVIDER
+ elif type == "Reference":
+ self.type = self.REFERENCE
else:
self.type = self.NAME
else:
self.type = self.NAME
- @cached
- def getServiceInfoValue(self, info, what):
- v = info.getInfo(what)
- if v != -2:
+ def getServiceInfoValue(self, info, what, ref=None):
+ v = ref and info.getInfo(ref, what) or info.getInfo(what)
+ if v != iServiceInformation.resIsString:
return "N/A"
return "N/A"
- return info.getInfoString(what)
+ return
ref and info.getInfoString(ref, what) or
info.getInfoString(what)
@cached
def getText(self):
service = self.source.service
@cached
def getText(self):
service = self.source.service
- info = service and service.info()
+ if isinstance(service, iPlayableServicePtr):
+ info = service and service.info()
+ ref = None
+ else: # reference
+ info = service and self.source.info
+ ref = service
if info is None:
return ""
if info is None:
return ""
-
if self.type == self.NAME:
if self.type == self.NAME:
- return info.getName()
+ name = ref and info.getName(ref)
+ if name is None:
+ name = info.getName()
+ return name.replace('\xc2\x86', '').replace('\xc2\x87', '')
elif self.type == self.PROVIDER:
elif self.type == self.PROVIDER:
- return self.getServiceInfoValue(info, iServiceInformation.sProvider)
+ return self.getServiceInfoValue(info, iServiceInformation.sProvider, ref)
+ elif self.type == self.REFERENCE:
+ return self.getServiceInfoValue(info, iServiceInformation.sServiceref, ref)
text = property(getText)
text = property(getText)