tiny optimizations (yeah, call me crazy)

diff --git a/autotimer/src/AutoTimerComponent.py b/autotimer/src/AutoTimerComponent.py
index e260848..fb03719 100644 (file)
--- a/autotimer/src/AutoTimerComponent.py
+++ b/autotimer/src/AutoTimerComponent.py
@@ -65,9 +65,6 @@ class AutoTimerComponent(object):
 
 ### Attributes / Properties
 
-       def getCompleteAfterEvent(self):
-               return self._afterevent
-
        def setAfterEvent(self, afterevent):
                del self._afterevent[:]
                if len(afterevent):
@@ -78,7 +75,7 @@ class AutoTimerComponent(object):
                                else:
                                        self._afterevent.append((action, self.calculateDayspan(*timespan)))
 
-       afterevent = property(getCompleteAfterEvent, setAfterEvent)
+       afterevent = property(lamba self: self._afterevent, setAfterEvent)
 
        def setBouquets(self, bouquets):
                if bouquets:
@@ -86,10 +83,7 @@ class AutoTimerComponent(object):
                else:
                        self._bouquets = []
 
-       def getBouquets(self):
-               return self._bouquets
-
-       bouquets = property(getBouquets, setBouquets)
+       bouquets = property(lambda self: self._bouquets , setBouquets)
 
        def setExclude(self, exclude):
                if exclude:
@@ -102,10 +96,7 @@ class AutoTimerComponent(object):
                else:
                        self._exclude = ([], [], [], [])
 
-       def getExclude(self):
-               return self._exclude
-
-       exclude = property(getExclude, setExclude)
+       exclude = property(lambda self: self._exclude, setExclude)
 
        def setInclude(self, include):
                if include:
@@ -118,10 +109,7 @@ class AutoTimerComponent(object):
                else:
                        self._include = ([], [], [], [])
 
-       def getInclude(self):
-               return self._include
-
-       include = property(getInclude, setInclude)
+       include = property(lamba self: self._include, setInclude)
 
        def setName(self, name):
                self.name = name
@@ -135,19 +123,13 @@ class AutoTimerComponent(object):
 
        match = property(getMatch, setMatch)
 
-       def getServices(self):
-               return self._services
-
        def setServices(self, services):
                if services:
                        self._services = services
                else:
                        self._services = []
 
-       services = property(getServices, setServices)
-
-       def getTimespan(self):
-               return self._timespan
+       services = property(lambda self: self._services, setServices)
 
        def setTimespan(self, timespan):
                if timespan is None or len(timespan) and timespan[0] is None:
@@ -155,7 +137,7 @@ class AutoTimerComponent(object):
                else:
                        self._timespan = self.calculateDayspan(*timespan)
 
-       timespan = property(getTimespan, setTimespan)
+       timespan = property(lambda self: self._timespan, setTimespan)
 
 ### See if Attributes are set
 
@@ -276,81 +258,54 @@ class AutoTimerComponent(object):
 
 ### Makes saving Config easier
 
-       def getAvoidDuplicateDescription(self):
-               return self.avoidDuplicateDescription
-
-       def getCounter(self):
-               return self.matchCount
-
-       def getCounterFormatString(self):
-               return self.matchFormatString
-
-       def getCounterLeft(self):
-               return self.matchLeft
-
-       def getCounterLimit(self):
-               return self.matchLimit
-
-       def getDestination(self):
-               # XXX: as this function was not added by me (ritzMo) i'll leave it like this but i'm not really sure if this is right ;-)
-               return self.destination is not None
-
-       def getDuration(self):
-               return self.maxduration/60
-
-       def getEnabled(self):
-               return self.enabled and "yes" or "no"
-
-       def getExcludedDays(self):
-               return self.exclude[3]
+       getAvoidDuplicateDescription = lambda self: self.avoidDuplicateDescription
 
-       def getExcludedDescription(self):
-               return [x.pattern for x in self.exclude[2]]
+       getBouquets = lamda self: self._bouquets
 
-       def getExcludedShort(self):
-               return [x.pattern for x in self.exclude[1]]
+       getCompleteAfterEvent = lambda self: self._afterevent
 
-       def getExcludedTitle(self):
-               return [x.pattern for x in self.exclude[0]]     
+       getCounter = lambda self: self.matchCount
+       getCounterFormatString = lambda self: self.matchFormatString
+       getCounterLeft = lambda self: self.matchLeft
+       getCounterLimit = lambda self: self.matchLimit
 
-       def getIncludedTitle(self):
-               return [x.pattern for x in self.include[0]]
+       # XXX: as this function was not added by me (ritzMo) i'll leave it like this but i'm not really sure if this is right ;-)
+       getDestination = lambda self: self.destination is not None
 
-       def getIncludedShort(self):
-               return [x.pattern for x in self.include[1]]
+       getDuration = lambda self: self.maxduration/60
 
-       def getIncludedDescription(self):
-               return [x.pattern for x in self.include[2]]
+       getEnabled = lambda self: self.enabled and "yes" or "no"
 
-       def getIncludedDays(self):
-               return self.include[3]
+       getExclude = lambda self: self._exclude
+       getExcludedDays = lambda self: self.exclude[3]
+       getExcludedDescription = lambda self: [x.pattern for x in self.exclude[2]]
+       getExcludedShort = lambda self: [x.pattern for x in self.exclude[1]]
+       getExcludedTitle = lambda self: [x.pattern for x in self.exclude[0]]    
 
-       def getJustplay(self):
-               return self.justplay and "1" or "0"
+       getInclude = lambda self: self._include
+       getIncludedTitle = lambda self: [x.pattern for x in self.include[0]]
+       getIncludedShort = lambda self: [x.pattern for x in self.include[1]]
+       getIncludedDescription = lambda self: [x.pattern for x in self.include[2]]
+       getIncludedDays = lambda self: self.include[3]
 
-       def getLastBegin(self):
-               return self.lastBegin
+       getJustplay = lambda self: self.justplay and "1" or "0"
 
-       def getName(self):
-               return self.name
+       getLastBegin = lambda self: self.lastBegin
 
-       def getOffsetBegin(self):
-               return self.offset[0]/60
+       getName = lambda self: self.name
 
-       def getOffsetEnd(self):
-               return self.offset[1]/60
+       getOffsetBegin = lambda self: self.offset[0]/60
+       getOffsetEnd = lambda self: self.offset[1]/60
 
-       def getTags(self):
-               return self.tags
+       getServices = lambda self: self._services
 
-       def getTimespanBegin(self):
-               return '%02d:%02d' % (self.timespan[0][0], self.timespan[0][1])
+       getTags = lambda self: self.tags
 
-       def getTimespanEnd(self):
-               return '%02d:%02d' % (self.timespan[1][0], self.timespan[1][1])
+       getTimespan = lambda self: self._timespan
+       getTimespanBegin = lambda self: '%02d:%02d' % (self.timespan[0][0], self.timespan[0][1])
+       getTimespanEnd = lambda self: '%02d:%02d' % (self.timespan[1][0], self.timespan[1][1])
 
-       def isOffsetEqual(self):
-               return self.offset[0] == self.offset[1]
+       isOffsetEqual = lambda self: self.offset[0] == self.offset[1]
        
 ### Actual functionality
 

diff --git a/autotimer/src/AutoTimerConfiguration.py b/autotimer/src/AutoTimerConfiguration.py
index a9fa0a7..6de985d 100644 (file)
--- a/autotimer/src/AutoTimerConfiguration.py
+++ b/autotimer/src/AutoTimerConfiguration.py
@@ -486,13 +486,13 @@ def writeConfig(filename, defaultTimer, timers):
        list.append('>\n')
 
        # Services
-       for serviceref in defaultTimer.getServices():
+       for serviceref in defaultTimer.services:
                list.extend(['  <serviceref>', serviceref, '</serviceref>'])
                ref = ServiceReference(str(serviceref))
                list.extend([' <!-- ', stringToXML(ref.getServiceName().replace('\xc2\x86', '').replace('\xc2\x87', '')), ' -->\n'])
 
        # Bouquets
-       for bouquet in defaultTimer.getBouquets():
+       for bouquet in defaultTimer.bouquets:
                list.extend(['  <bouquet>', str(bouquet), '</bouquet>'])
                ref = ServiceReference(str(bouquet))
                list.extend([' <!-- ', stringToXML(ref.getServiceName().replace('\xc2\x86', '').replace('\xc2\x87', '')), ' -->\n'])
@@ -505,7 +505,7 @@ def writeConfig(filename, defaultTimer, timers):
                        AFTEREVENT.DEEPSTANDBY: "shutdown",
                        AFTEREVENT.AUTO: "auto"
                }
-               for afterevent in defaultTimer.getCompleteAfterEvent():
+               for afterevent in defaultTimer.afterevent:
                        action, timespan = afterevent
                        list.append('  <afterevent')
                        if timespan[0] is not None:
@@ -582,13 +582,13 @@ def writeConfig(filename, defaultTimer, timers):
                list.append('>\n')
 
                # Services
-               for serviceref in timer.getServices():
+               for serviceref in timer.services:
                        list.extend(['  <serviceref>', serviceref, '</serviceref>'])
                        ref = ServiceReference(str(serviceref))
                        list.extend([' <!-- ', stringToXML(ref.getServiceName().replace('\xc2\x86', '').replace('\xc2\x87', '')), ' -->\n'])
 
                # Bouquets
-               for bouquet in timer.getBouquets():
+               for bouquet in timer.bouquets:
                        list.extend(['  <bouquet>', str(bouquet), '</bouquet>'])
                        ref = ServiceReference(str(bouquet))
                        list.extend([' <!-- ', stringToXML(ref.getServiceName().replace('\xc2\x86', '').replace('\xc2\x87', '')), ' -->\n'])
@@ -601,7 +601,7 @@ def writeConfig(filename, defaultTimer, timers):
                                AFTEREVENT.DEEPSTANDBY: "shutdown",
                                AFTEREVENT.AUTO: "auto"
                        }
-                       for afterevent in timer.getCompleteAfterEvent():
+                       for afterevent in timer.afterevent:
                                action, timespan = afterevent
                                list.append('  <afterevent')
                                if timespan[0] is not None:

diff --git a/autotimer/src/AutoTimerEditor.py b/autotimer/src/AutoTimerEditor.py
index 1c042b6..4805592 100644 (file)
--- a/autotimer/src/AutoTimerEditor.py
+++ b/autotimer/src/AutoTimerEditor.py
@@ -126,8 +126,8 @@ class AutoTimerEditorBase:
                        self.filterSet = False
 
                # See if services are restricted
-               self.services = timer.getServices()
-               self.bouquets = timer.getBouquets()
+               self.services = timer.services
+               self.bouquets = timer.bouquets
                if len(self.services) or len(self.bouquets):
                        self.serviceRestriction = True
                else: