Permalink
Browse files

Merge remote-tracking branch 'e2/master'

Conflicts:
	autotimer/src/AutoTimer.py
	autotimer/src/AutoTimerSettings.py
	autotimer/src/__init__.py
	fancontrol2/src/plugin.py
  • Loading branch information...
2 parents 6c942a1 + 32dbdd4 commit 0b6a9e685eabeb56cfc2f47ba05ac8551b650eca @andyblac andyblac committed Oct 31, 2013
Showing with 2,020 additions and 1,220 deletions.
  1. +2 −0 Makefile.am
  2. +7 −4 autotimer/src/AutoTimer.py
  3. +1 −1 autotimer/src/AutoTimerSettings.py
  4. +2 −2 autotimer/src/web-data/autotimereditor.js
  5. +3 −1 bonjour/src/Bonjour.py
  6. +7 −0 configure.ac
  7. +110 −105 fancontrol2/po/de.po
  8. +295 −296 fancontrol2/po/pl.po
  9. +1 −1 fancontrol2/src/globals.py
  10. +41 −42 fancontrol2/src/plugin.py
  11. +2 −17 fritzcall/po/FritzCall.pot
  12. +4 −19 fritzcall/po/de.po
  13. +13 −19 fritzcall/po/es.po
  14. +521 −464 fritzcall/po/it.po
  15. +13 −19 fritzcall/po/nl.po
  16. +9 −18 fritzcall/po/sr.po
  17. +13 −19 fritzcall/po/tr.po
  18. +5 −5 fritzcall/src/FritzCallFBF.py
  19. +34 −78 fritzcall/src/plugin.py
  20. +0 −3 genuinedreambox/meta/plugin_genuinedreambox.xml
  21. +0 −5 mytube/meta/plugin_mytube.xml
  22. +5 −2 partnerbox/src/PartnerboxEPGList.py
  23. +16 −4 partnerbox/src/PartnerboxFunctions.py
  24. +3 −1 partnerbox/src/RemoteTimerEntry.py
  25. +2 −0 pipzap/meta/plugin_pipzap.xml
  26. +0 −5 porncenter/meta/plugin_porncenter.xml
  27. +6 −1 virtualzap/src/plugin.py
  28. +2 −0 weathercomponent/CONTROL/control
  29. +1 −0 weathercomponent/Makefile.am
  30. +159 −0 weathercomponent/src/Components/Converter/MSNWeather.py
  31. +92 −0 weathercomponent/src/Components/Renderer/MSNWeatherPixmap.py
  32. +174 −0 weathercomponent/src/Components/Sources/MSNWeather.py
  33. +59 −0 weathercomponent/src/Components/WeatherMSN.py
  34. +10 −0 weathercomponent/src/Makefile.am
  35. +84 −0 weathercomponent/src/README
  36. +2 −0 weathercomponenthandler/CONTROL/control
  37. +1 −0 weathercomponenthandler/Makefile.am
  38. +4 −0 weathercomponenthandler/src/Makefile.am
  39. 0 weathercomponenthandler/src/__init__.py
  40. +2 −0 weathercomponenthandler/src/maintainer.info
  41. +32 −0 weathercomponenthandler/src/plugin.py
  42. +230 −0 weatherplugin/src/MSNWeather.py
  43. +53 −89 weatherplugin/src/plugin.py
View
@@ -83,6 +83,8 @@ SUBDIRS = \
vlcplayer \
vps \
weatherplugin \
+ weathercomponent \
+ weathercomponenthandler \
webadmin \
webbouqueteditor \
webcamviewer \
@@ -523,10 +523,11 @@ def parseTimer(self, timer, epgcache, serviceHandler, recordHandler, checkEvtLim
if config.plugins.autotimer.refresh.getValue() != "all":
print("[AutoTimer] Won't modify existing timer because it's no timer set by us")
break
- rtimer.log(501, "[AutoTimer] Warning, AutoTimer %s messed with a timer which might not belong to it." % (timer.name))
+ rtimer.log(501, "[AutoTimer] Warning, AutoTimer %s messed with a timer which might not belong to it: %s ." % (timer.name, rtimer.name))
newEntry = rtimer
modified += 1
- self.modifyTimer(rtimer, name, shortdesc, begin, end, serviceref)
+ self.modifyTimer(rtimer, name, shortdesc, begin, end, serviceref, eit)
+ rtimer.log(501, "[AutoTimer] AutoTimer modified timer: %s ." % (rtimer.name))
break
else:
print ("[AutoTimer] Skipping timer because it has not changed.")
@@ -701,12 +702,14 @@ def populateTimerdict(self, epgcache, recordHandler, timerdict):
timer.extdesc = ''
timerdict[str(timer.service_ref)].append(timer)
- def modifyTimer(self, timer, name, shortdesc, begin, end, serviceref):
- timer.name = name
+ def modifyTimer(self, timer, name, shortdesc, begin, end, serviceref, eit):
+ # Don't update the name, it will overwrite the name of the SeriesPlugin
+ #timer.name = name
timer.description = shortdesc
timer.begin = int(begin)
timer.end = int(end)
timer.service_ref = ServiceReference(serviceref)
+ timer.eit = eit
def addDirectoryToMovieDict(self, moviedict, dest, serviceHandler):
movielist = serviceHandler.list(eServiceReference("2:0:1:0:0:0:0:0:0:0:" + dest))
@@ -49,7 +49,7 @@ def __init__(self, session):
getConfigListEntry(_("Show in plugin browser"), config.plugins.autotimer.show_in_plugins, _("Enable this to be able to access the AutoTimer Overview from within the plugin browser.")),
getConfigListEntry(_("Show in extension menu"), config.plugins.autotimer.show_in_extensionsmenu, _("Enable this to be able to access the AutoTimer Overview from within the extension menu.")),
getConfigListEntry(_("Modify existing timers"), config.plugins.autotimer.refresh, _("This setting controls the behavior when a timer matches a found event.")),
- getConfigListEntry(_("Guess existing timer based on begin/end"), config.plugins.autotimer.try_guessing, _("If this is enabled an existing timer will also be considered recording an event if it records at least 80%% of the it.")),
+ getConfigListEntry(_("Guess existing timer based on begin/end"), config.plugins.autotimer.try_guessing, _("If this is enabled an existing timer will also be considered recording an event if it records at least 80% of the it.")),
getConfigListEntry(_("Add similar timer on conflict"), config.plugins.autotimer.addsimilar_on_conflict, _("If a timer conflict occurs, AutoTimer will search outside the timespan for a similar event and add it.")),
getConfigListEntry(_("Add timer as disabled on conflict"), config.plugins.autotimer.disabled_on_conflict, _("This toggles the behavior on timer conflicts. If an AutoTimer matches an event that conflicts with an existing timer it will not ignore this event but add it disabled.")),
getConfigListEntry(_("Include \"AutoTimer\" in tags"), config.plugins.autotimer.add_autotimer_to_tags, _("If this is selected, the tag \"AutoTimer\" will be given to timers created by this plugin.")),
@@ -1774,10 +1774,10 @@ function AutoTimer(xml, defaults){
} else {
after = new Date( after * 1000 )
}
- if (this.before == undefined) {
+ if (before == undefined) {
before = new Date();
} else {
- before = new Date( this.before * 1000 )
+ before = new Date( before * 1000 )
}
this.timeframe = {
'usetimeframe' : usetimeframe,
@@ -3,7 +3,7 @@
from xml.etree.cElementTree import parse as cet_parse
from xml.etree.ElementTree import ParseError
from os import path, listdir
-from os import remove as os_remove
+from os import remove as os_remove, fsync
class Bonjour:
AVAHI_SERVICES_DIR = '/etc/avahi/services/'
@@ -60,6 +60,8 @@ def __writeService(self, service):
try:
file = open(filepath, 'w');
file.writelines(self.__createServiceConfig(service))
+ file.flush()
+ fsync(file.fileno())
file.close()
return True
except IOError:
View
@@ -711,6 +711,13 @@ weatherplugin/po/Makefile
weatherplugin/src/Makefile
weatherplugin/src/icons/Makefile
+weathercomponent/Makefile
+weathercomponent/src/Makefile
+
+weathercomponenthandler/Makefile
+weathercomponenthandler/src/Makefile
+
+
webadmin/Makefile
webadmin/meta/Makefile
webadmin/src/Makefile
Oops, something went wrong.

0 comments on commit 0b6a9e6

Please sign in to comment.