gpsd-dev
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gpsd-dev] [PATCH 3/6] webgps.py: fix errors when period is None


From: Beat Bolli
Subject: [gpsd-dev] [PATCH 3/6] webgps.py: fix errors when period is None
Date: Mon, 21 Oct 2013 20:34:58 +0200

---
 contrib/webgps.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/contrib/webgps.py b/contrib/webgps.py
index 6907ebc..91fc668 100755
--- a/contrib/webgps.py
+++ b/contrib/webgps.py
@@ -277,7 +277,8 @@ function draw_satview() {
     def run(self, suffix, period):
         jsfile = 'gpsd' + suffix + '.js'
         htmlfile = 'gpsd' + suffix + '.html'
-        end = time.time() + period
+        if period is not None:
+            end = time.time() + period
         self.needsupdate = 1
         self.stream(WATCH_ENABLE | WATCH_NEWSTYLE)
         for report in self:
@@ -288,8 +289,10 @@ function draw_satview() {
                 self.generate_js(jsfile)
                 self.needsupdate = 0
             self.generate_html(htmlfile, jsfile)
-            if period <= 0 and self.fix.mode >= MODE_2D \
-            or period > 0 and time.time() > end:
+            if period is not None and (
+                period <= 0 and self.fix.mode >= MODE_2D or
+                period > 0 and time.time() > end
+            ):
                 break
 
 def main():
@@ -302,13 +305,13 @@ def main():
     if arg[-1:] in factors.keys():
         period = int(arg[:-1]) * factors[arg[-1]]
     elif arg == 'c':
-       period = None
+        period = None
     elif arg:
         period = int(arg)
     else:
         period = 0
     if arg:
-       arg = '-' + arg
+        arg = '-' + arg
 
     sat = SatTracks()
 
-- 
1.8.4.rc3




reply via email to

[Prev in Thread] Current Thread [Next in Thread]