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

[Simon C]

- Fix getting stuck if connection drops, and release as 0.7.0

- fix getting stuck if connection drops
- stable enough to release as 0.7.0

[Martin Morrison (isoschiz)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-05 17:45:59 +0000
+++ debian/changelog	2012-10-27 15:42:20 +0000
@@ -1,3 +1,9 @@
+engage (0.7.0) precise; urgency=low
+
+  * Auto-refresh HTTP connection every couple of minutes
+
+ -- Simon C <[e-mail]>  Sat, 27 Oct 2012 16:33:27 +0100
+
 engage (0.6.4) lucid; urgency=low
 
   * Fix bug with lucid version of python snmp package

=== modified file 'setup.py'
--- setup.py	2012-10-05 17:45:59 +0000
+++ setup.py	2012-10-27 15:42:20 +0000
@@ -7,7 +7,7 @@
 from distutils.core import setup
 
 setup(name='engage',
-      version="0.6.4",
+      version="0.7.0",
       description='EnGage: system/network statistics monitoring and Apple TV control',
       url='http://open.ensoft.co.uk/EnGage',
       packages=['engage', 'engage.collector', 'engage.media', 'engage.monitor', 

=== modified file 'src/engage/util/atv.py'
--- src/engage/util/atv.py	2012-10-01 20:36:37 +0000
+++ src/engage/util/atv.py	2012-10-27 15:42:20 +0000
@@ -2,7 +2,7 @@
 #
 # Simon C, September 2012
 
-import re
+import re, time
 from StringIO import StringIO
 from twisted.internet import defer, reactor
 from twisted.python import log
@@ -59,8 +59,15 @@
         self.http_agent = None
 
     def _check_connection(self):
-        if self.http_agent is None:
+        # We don't actually get any disconnection hints from the ATV
+        # if it stops caring about us for some reason (eg another
+        # device has taken over). Moreover, it's actually rather hard
+        # to spot the difference if we drop the http connection
+        # immediately before creating a new one. So just do that every
+        # couple of minutes.
+        if self.http_agent is None or time.time() - self.agent_created > 120:
             self.http_agent = Agent(reactor, pool=HTTPConnectionPool(reactor))
+            self.agent_created = time.time()
 
     def show_photo(self, pathname):
         self._check_connection()