Merge lp:~slimey/engage/bugfix into lp:engage

[Simon C]

Merge fix to Depends line for lucid builds

Fixes launchpad build issue

[Simon C (slimey)]

review: Approve

[lp:~slimey/engage/bugfix]

6. By Simon C on 2012-10-05

Merge fix to Depends line for lucid builds

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-25 17:47:25 +0000
+++ debian/changelog	2012-10-02 14:05:27 +0000
@@ -1,3 +1,9 @@
+engage (0.6.3) precise; urgency=low
+
+  * Bugfix for launchpad build and movie playing
+
+ -- Simon C <[e-mail]>  Tue, 02 Oct 2012 13:19:15 +0100
+
 engage (0.6.2) precise; urgency=low
 
   * Packaging improvement

=== modified file 'debian/control'
--- debian/control	2012-09-25 12:44:16 +0000
+++ debian/control	2012-10-02 14:05:27 +0000
@@ -8,7 +8,7 @@
 Package: engage
 Architecture: all
 # snmp package is just for snmptranslate
-Depends: python (>= ${python:Versions}), python-setuptools, python-zope.interface, python-rrdtool, libsnmp-python, python-pynetsnmp, snmp, snmp-mibs-downloader, ${python:Depends}, ${misc:Depends}
+Depends: python, python-setuptools, python-zope.interface, python-rrdtool, libsnmp-python, python-pynetsnmp, snmp, snmp-mibs-downloader, ${misc:Depends}
 Description: Combined system/network statistics and Apple TV control framework
  EnGage is a plugin-based framework for gathering, summarizing, and displaying 
  system or network administration data.

=== modified file 'src/engage/media/movie.py'
--- src/engage/media/movie.py	2012-09-25 12:44:16 +0000
+++ src/engage/media/movie.py	2012-10-02 14:05:27 +0000
@@ -2,6 +2,7 @@
 #
 # Simon C, September 2012
 
+import re
 from twisted.python import log
 from engage.media import MediaSource, StartMediaSource
 
@@ -15,7 +16,8 @@
         self.register_cb(self, 1)
 
     def show(self):
-        d = self.atv.show_movie('http://172.22.22.143:8421/mp4/amy-janet.mp4')
+        url = re.sub('\|', ':', self.cfg['url'])
+        d = self.atv.show_movie(url)
         return d
 
 start = StartMediaSource('movie', MovieMediaSource)

=== modified file 'src/engage/media/static.py'
--- src/engage/media/static.py	2012-09-25 12:44:16 +0000
+++ src/engage/media/static.py	2012-10-02 14:05:27 +0000
@@ -30,6 +30,7 @@
     def show(self):
         item = random.randint(0, len(self.photos) - 1)
         pathname = self.photos[item]
+        log.msg("Showing static image %s" % pathname)
         d = self.atv.show_photo(pathname)
         return d
 

=== modified file 'src/engage/ui/carousel.py'
--- src/engage/ui/carousel.py	2012-09-25 12:44:16 +0000
+++ src/engage/ui/carousel.py	2012-10-02 14:05:27 +0000
@@ -83,7 +83,6 @@
             failure.printTraceback()
         d.addErrback(handle_failure)
         def reset(result):
-            log.msg("FINAL CALLBACK!!!")
             reactor.callLater(self.period, self.maybe_show_next_photo)
         d.addBoth(reset)
         

=== modified file 'src/engage/ui/web.py'
--- src/engage/ui/web.py	2012-09-25 12:44:16 +0000
+++ src/engage/ui/web.py	2012-10-02 14:05:27 +0000
@@ -159,8 +159,8 @@
     site.putChild("", Main(config))
     site.putChild("graph", Graph(config))
     site.putChild("png", File('%s/png' % web_config['web_static_dir']))
-    site.putChild("mp4", File('%s/mp4' % web_config['web_static_dir']))
-
+    if 'web_mp4_dir' in web_config:
+        site.putChild("mp4", File(web_config['web_mp4_dir']))
 
     web = Site(site)
     tcp_service = internet.TCPServer(int(web_config['http_port']), web)

=== modified file 'src/engage/util/atv.py'
--- src/engage/util/atv.py	2012-09-25 12:44:16 +0000
+++ src/engage/util/atv.py	2012-10-02 14:05:27 +0000
@@ -11,7 +11,7 @@
 from twisted.web.client import FileBodyProducer
 from twisted.web.http_headers import Headers
 
-POLL_INTERVAL = 1
+POLL_INTERVAL = 2
 
 class ResponseReceiver(Protocol):
 
@@ -25,18 +25,25 @@
                               for key in ('position', 'duration')]
         if duration > 0:
             remaining = duration - position
+            if remaining < 0:
+                remaining = 0
         if remaining < self.remaining:
             self.remaining = remaining
+        elif remaining > self.remaining * 2:
+            self.remaining += remaining % self.remaining
 
         log.msg("Video at %f/%f; timer reset to %f" %
                 (position, duration, self.remaining))
 
     def connectionLost(self, reason):
         if self.remaining < POLL_INTERVAL:
-            log.msg("Last %f seconds, just waiting" % self.remaining)
+            log.msg("Video's final %f seconds, just waiting" % self.remaining)
+            d = self.finished
         else:
-            self.finished.addCallback(self.fire_again)
-        reactor.callLater(self.remaining, self.finished.callback, None)
+            d = defer.Deferred()
+            d.addCallback(self.fire_again)
+            d.addCallback(self.finished.callback)
+        reactor.callLater(self.remaining, d.callback, None)
 
 
 class ATV(object):