diff -r e38953623405 -r 1d488185037f gmyth-stream/server/0.2/lib/server.py --- a/gmyth-stream/server/0.2/lib/server.py Tue May 08 21:01:03 2007 +0100 +++ b/gmyth-stream/server/0.2/lib/server.py Wed May 16 23:55:23 2007 +0100 @@ -63,12 +63,9 @@ def __str__(self): - return '%s("%s", mux="%s", params=%s, addr=%s)' % \ + return '%s( params=%s )' % \ (self.__class__.__name__, - self.params_first("uri", "None"), - self.params_first("mux", "mpg"), - self.params, - repr(self)) + self.params) # __str__() # Transcoder @@ -244,16 +241,32 @@ running = "
No running transcoder.
\n" stopall = "" stopone = "" + + elif self.query.get("ip") and self.query.get("file"): + for transcoder, request in tl: + filename = "%s" % self.query.get("file")[0] + tfilename = "%s" % transcoder.params_first("uri") + + if tfilename.find(filename) >= 0 and \ + request.client_address[0] == self.query.get("ip")[0]: + self.wfile.write("Status: %s %%" % transcoder.status) + return + else: running = "Running transcoders:
\n" - stopall = self._create_html_item("[STOP ALL]" % + stopall = self._create_html_item("" + "[STOP ALL]" % self.menu["Stop"]) for transcoder, request in tl: - stopone = self._create_html_item("%s: %s:%s" - "[STOP] - Status: %s%%" % ( - transcoder, request.client_address[0], request.client_address[1], - self.menu["Stop"], request.client_address[0], request.client_address[1], + stopone = self._create_html_item("%s: %s:%s" + "[STOP] - Status: %s%%"\ + % ( + transcoder, request.client_address[0], + request.client_address[1], + self.menu["Stop"], request.client_address[0], + request.client_address[1], transcoder.status) ) self.wfile.write(utils.getHTML("status",