AutoPoller.py: fix missing import
[vuplus_dvbapp-plugin] / autotimer / src / AutoTimerComponent.py
index d8faaf4..52f1f05 100644 (file)
@@ -7,6 +7,9 @@ from re import compile as re_compile
 # Alternatives and service restriction
 from enigma import eServiceReference, eServiceCenter
 
+# To get preferred component
+from Components.config import config
+
 class AutoTimerComponent(object):
        """AutoTimer Component which also handles validity checks"""
 
@@ -76,21 +79,14 @@ class AutoTimerComponent(object):
        def setAfterEvent(self, afterevent):
                if afterevent is not self._afterevent:
                        del self._afterevent[:]
+               else:
+                       self._afterevent = []
 
-               Len = len(afterevent)
-               if Len:
-                       for x in range(0, Len):
-                               action, timespan = afterevent[x]
-
-                               # Remove original entry
-                               del afterevent[x]
-                               # If the second argument is a tuple we assume the entry is already parsed
-                               if isinstance(timespan, tuple):
-                                       self._afterevent.insert(x, (action, timespan))
-                               elif timespan is None:
-                                       self._afterevent.insert(x, (action, (None,)))
-                               else:
-                                       self._afterevent.insert(x, (action, self.calculateDayspan(*timespan)))
+               for action, timespan in afterevent:
+                       if timespan is None or timespan[0] is None:
+                               self._afterevent.append((action, (None,)))
+                       else:
+                               self._afterevent.append((action, self.calculateDayspan(*timespan)))
 
        afterevent = property(lambda self: self._afterevent, setAfterEvent)
 
@@ -155,7 +151,7 @@ class AutoTimerComponent(object):
        services = property(lambda self: self._services, setServices)
 
        def setTimespan(self, timespan):
-               if timespan is None or len(timespan) and timespan[0] is None:
+               if timespan is None or timespan and timespan[0] is None:
                        self._timespan = (None,)
                else:
                        self._timespan = self.calculateDayspan(*timespan)
@@ -186,7 +182,7 @@ class AutoTimerComponent(object):
                return self.maxduration is not None
 
        def hasTags(self):
-               return len(self.tags) > 0
+               return len(self.tags)
 
        def hasTimespan(self):
                return self.timespan[0] is not None
@@ -235,35 +231,6 @@ class AutoTimerComponent(object):
                        return False
 
        """
-        Returns a list of all allowed services by listing the bouquets
-       """
-       def getFullServices(self):
-               list = self.services[:]
-
-               from enigma import eServiceReference, eServiceCenter
-               serviceHandler = eServiceCenter.getInstance()
-               for bouquet in self.bouquets:
-                       myref = eServiceReference(str(bouquet))
-                       mylist = serviceHandler.list(myref)
-                       if mylist is not None:
-                               while 1:
-                                       s = mylist.getNext()
-                                       # TODO: I wonder if its sane to assume we get services here (and not just new lists)
-                                       # We can ignore markers & directorys here because they won't match any event's service :-)
-                                       if s.valid():
-                                               # strip all after last :
-                                               value = s.toString()
-                                               pos = value.rfind(':')
-                                               if pos != -1:
-                                                       value = value[:pos+1]
-
-                                               list.append(value)
-                                       else:
-                                               break
-
-               return list
-
-       """
         Called when a timer based on this component was added
        """
        def update(self, begin, timestamp):
@@ -361,13 +328,13 @@ class AutoTimerComponent(object):
 
        def checkExcluded(self, title, short, extended, dayofweek):
                if self.exclude[3]:
-                       list = [x for x in self.exclude[3]]
-                       if "weekend" in list:
-                               list.extend(["5", "6"])
-                       if "weekday" in list:
-                               list.extend(["0", "1", "2", "3", "4"])
+                       list = self.exclude[3]
                        if dayofweek in list:
                                return True
+                       if "weekend" in list and dayofweek in ("5", "6"):
+                               return True
+                       if "weekday" in list and dayofweek in ("0", "1", "2", "3", "4"):
+                               return True
 
                for exclude in self.exclude[0]:
                        if exclude.search(title):
@@ -388,11 +355,11 @@ class AutoTimerComponent(object):
 
        def checkIncluded(self, title, short, extended, dayofweek):
                if self.include[3]:
-                       list = [x for x in self.include[3]]
+                       list = self.include[3][:]
                        if "weekend" in list:
-                               list.extend(["5", "6"])
+                               list.extend(("5", "6"))
                        if "weekday" in list:
-                               list.extend(["0", "1", "2", "3", "4"])
+                               list.extend(("0", "1", "2", "3", "4"))
                        if dayofweek not in list:
                                return True
 
@@ -436,6 +403,8 @@ class AutoTimerComponent(object):
                                                        value = s.toString()
                                                        pos = value.rfind(':')
                                                        if pos != -1:
+                                                               if value[pos-1] == ':':
+                                                                       pos -= 1
                                                                value = value[:pos+1]
 
                                                        if value == check_service:
@@ -466,6 +435,8 @@ class AutoTimerComponent(object):
                                                                value = s.toString()
                                                                pos = value.rfind(':')
                                                                if pos != -1:
+                                                                       if value[pos-1] == ':':
+                                                                               pos -= 1
                                                                        value = value[:pos+1]
 
                                                                if value == override_service:
@@ -607,3 +578,94 @@ class AutoTimerComponent(object):
                         ")>"
                ))
 
+class AutoTimerFastscanComponent(AutoTimerComponent):
+       def __init__(self, *args, **kwargs):
+               AutoTimerComponent.__init__(self, *args, **kwargs)
+               self._fastServices = None
+
+       def setBouquets(self, bouquets):
+               AutoTimerComponent.setBouquets(self, bouquets)
+               self._fastServices = None
+
+       def setServices(self, services):
+               AutoTimerComponent.setServices(self, services)
+               self._fastServices = None
+
+       def getFastServices(self):
+               if self._fastServices is None:
+                       fastServices = []
+                       append = fastServices.append
+                       addbouquets = []
+                       for service in self.services:
+                               myref = eServiceReference(str(service))
+                               if myref.flags & eServiceReference.isGroup:
+                                       addbouquets.append(service)
+                               else:
+                                       comp = service.split(':')
+                                       append(':'.join(comp[3:]))
+
+                       serviceHandler = eServiceCenter.getInstance()
+                       for bouquet in self.bouquets + addbouquets:
+                               myref = eServiceReference(str(bouquet))
+                               mylist = serviceHandler.list(myref)
+                               if mylist is not None:
+                                       while 1:
+                                               s = mylist.getNext()
+                                               # TODO: I wonder if its sane to assume we get services here (and not just new lists)
+                                               # We can ignore markers & directorys here because they won't match any event's service :-)
+                                               if s.valid():
+                                                       # strip all after last :
+                                                       value = s.toString()
+                                                       pos = value.rfind(':')
+                                                       if pos != -1:
+                                                               if value[pos-1] == ':':
+                                                                       pos -= 1
+                                                               value = value[:pos+1]
+
+                                                       comp = value.split(':')
+                                                       append(':'.join(value[3:]))
+                                               else:
+                                                       break
+                       self._fastServices = fastServices
+               return self._fastServices
+
+       def checkServices(self, check_service):
+               services = self.getFastServices()
+               if services:
+                       check = ':'.join(check_service.split(':')[3:])
+                       for service in services:
+                               if service == check:
+                                       return False # included
+                       return True # not included
+               return False # no restriction
+
+       def getAlternative(self, override_service):
+               services = self.services
+               if services:
+                       override = ':'.join(override_service.split(':')[3:])
+                       serviceHandler = eServiceCenter.getInstance()
+
+                       for service in services:
+                               myref = eServiceReference(str(service))
+                               if myref.flags & eServiceReference.isGroup:
+                                       mylist = serviceHandler.list(myref)
+                                       if mylist is not None:
+                                               while 1:
+                                                       s = mylist.getNext()
+                                                       if s.valid():
+                                                               # strip all after last :
+                                                               value = s.toString()
+                                                               pos = value.rfind(':')
+                                                               if pos != -1:
+                                                                       if value[pos-1] == ':':
+                                                                               pos -= 1
+                                                                       value = value[:pos+1]
+
+                                                               if ':'.join(value.split(':')[3:]) == override:
+                                                                       return service
+                                                       else:
+                                                               break
+               return override_service
+
+# very basic factory ;-)
+preferredAutoTimerComponent = lambda *args, **kwargs: AutoTimerFastscanComponent(*args, **kwargs) if config.plugins.autotimer.fastscan.value else AutoTimerComponent(*args, **kwargs)