git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change record option ordering
[enigma2.git]
/
ServiceReference.py
diff --git
a/ServiceReference.py
b/ServiceReference.py
index 238e7f6caf0972cb3de11f3e41ad22845a8a0863..11e287860991488d8c332faccee62dedace8caa3 100644
(file)
--- a/
ServiceReference.py
+++ b/
ServiceReference.py
@@
-1,12
+1,9
@@
-
-from enigma import *
-
-import NavigationInstance
+from enigma import eServiceReference, eServiceCenter
class ServiceReference(eServiceReference):
def __init__(self, ref):
class ServiceReference(eServiceReference):
def __init__(self, ref):
- if
isinstance(ref, str
):
- self.ref = eServiceReference(ref)
+ if
not isinstance(ref, eServiceReference
):
+ self.ref = eServiceReference(ref
or ""
)
else:
self.ref = ref
self.serviceHandler = eServiceCenter.getInstance()
else:
self.ref = ref
self.serviceHandler = eServiceCenter.getInstance()
@@
-16,22
+13,10
@@
class ServiceReference(eServiceReference):
def getServiceName(self):
info = self.info()
def getServiceName(self):
info = self.info()
- if info is None:
- return None
-
- return info.getName(self.ref)
+ return info and info.getName(self.ref) or ""
- def play(self):
- return self.serviceHandler.info(self.ref)
-
- def record(self):
- return self.serviceHandler.record(self.ref)
-
- def list(self):
- return self.serviceHandler.list(self.ref)
-
def info(self):
return self.serviceHandler.info(self.ref)
def info(self):
return self.serviceHandler.info(self.ref)
- def
offlineOperations
(self):
- return self.serviceHandler.
offlineOperations
(self.ref)
+ def
list
(self):
+ return self.serviceHandler.
list
(self.ref)