comparison visualclient/visclient.py @ 32:cb57e554ae80

some bug fixes while testing connection

 FADE = 15
 DIST = 0.15 # blob equivalence tolerance
 FRAMERATE = 60
 
 # Connection:
-# IP = "127.0.0.1:8030"
+IP = "127.0.0.1:8030"
 # IP = "192.168.2.158:8030"
-IP = "138.37.95.215"
+# IP = "138.37.95.215"
 HTTP_TIMEOUT = 3
 SERVER_UPDATE_INTERVAL = 0.8
 
 
 class Indicator(object):

 		r,g,b = map(lambda x: int(x*255), cs.hls_to_rgb(h,l,s))
 		return r,g,b
 		
 	def start_update_thread(self):
 		'''Start the thread that reads data from the server.'''
-		self.running = True		
 		self.thread = Thread(target = self.update_thread)
 		self.thread.daemon = True
 		self.thread.start()
+		self.running = True
+		print "OK. Update thread started."
 		
 	def stop_update_thread(self):
 		'''Stop the thread and allow some time fot the connections to close.'''
 		self.running = False
 		try :

 			print "No update thread to join."
 
 	def update_thread(self):
 		'''The server update thread'''
 		while self.running :
+			# self.update()
 			try :				
 				self.update()
 				# self.indicators["update"].visible = True
 			except Exception, e:
 				if str(e).strip() : print "Exception: ", str(e), type(e), len(str(e).strip())

 				
 
 	def update_server_config(self,age,dist,ninp,retry = 3):
 		'''Send the server some configuration data.'''
 		try :
+			print "Sending configuration data."
 			self.conn.putrequest("GET","/moodconductor/config?age=%(age)s&dist=%(dist)s&ninp=%(ninp)s" %locals(), skip_host=True)
 			self.conn.putheader("Host", "www.isophonics.net")
 			self.conn.endheaders()
 			res = self.conn.getresponse()
+			res.read()
 			if not res.status == 200 :
 				print "Server response:", res.status, res.reason
 				self.indicators["conn"].off()
 			time.sleep(0.5)
 			self.conn.putrequest("GET","/moodconductor/getconf", skip_host=True)
 			self.conn.putheader("Host", "www.isophonics.net")
 			self.conn.endheaders()
 			res = self.conn.getresponse()
 			if not res.status == 200 :
 				print "Server response:", res.status, res.reason
-				self.indicators["conn"].off()		
+				self.indicators["conn"].off()
 			print "Server configuration:", res.read()
 		except:
+			print "Failed to send configuration data."
 			time.sleep(2)
 			retry -= 1
 			self.update_server_config(age,dist,ninp,retry)
 	
 		

 			pg.quit()
 			raise SystemExit
 		if retry < 5 :
 			time.sleep(3)
 		try :
+			print "connecting to server..."
 			self.conn = ht.HTTPConnection(IP,timeout=HTTP_TIMEOUT)
-			# self.start_update_thread()
 			self.indicators["conn"].on()
 		except :
 			self.indicators["conn"].off()
 			self.connect(retry = retry-1)
+			print "connection failed."
 			
 		try:
+			print "Testing connection."
 			self.conn.putrequest("GET","/moodconductor/index.html", skip_host=True)
 			self.conn.putheader("Host", "www.isophonics.net")
 			self.conn.endheaders()
 			res = self.conn.getresponse()
+			res.read()
 			if res.status == 200 :
 				self.indicators["conn"].on()
 			else :
 				print "Server response:", res.status, res.reason
 				self.indicators["conn"].off()
 				if not hasattr(self,"noretry") and raw_input("Go offline? ") in ['y',''] :
 					return False
 				else :
+					print "Failed. retrying."
 					self.noretry = None
 					self.connect(retry = retry-1)
 		except :
 			print "Exception while testing connection."
 			self.indicators["conn"].off()

 				return False
 			else :
 				self.noretry = None
 				self.connect(retry = retry-1)
 		self.configure_server()
+		print "OK. Starting update thread..."
 		self.start_update_thread()
 		return True