diff -r 3fbcd3d9b2d1 -r 6431b16e18fb gmyth-stream/server/0.3/plugins/transcoders/mencoder_lib/mythtv.py --- a/gmyth-stream/server/0.3/plugins/transcoders/mencoder_lib/mythtv.py Tue May 29 21:24:48 2007 +0100 +++ b/gmyth-stream/server/0.3/plugins/transcoders/mencoder_lib/mythtv.py Thu May 31 16:09:47 2007 +0100 @@ -54,7 +54,7 @@ self.args["gmyth-cat"]["cfile"] ] else: - self.log.error(self.tid, "URI error") + self.log.error(self.tid, "Error: URI error") return [] # _setup_gmythcat @@ -65,7 +65,7 @@ stderr=subprocess.PIPE, close_fds=True) except Exception, e: - self.log.error(self.tid, "Error executing gmyth-cat: %s" % e) + self.log.error(self.tid, "Error: gmyth-cat: %s" % e) return False if not self._run_mencoder(input=self.gmyth.stdout, @@ -75,9 +75,10 @@ if self.args["gmyth-cat"]["kind"] == "f": try: size = _setup_mythfile(self.gmyth.stderr) - self.log.debug(self.tid, "Size of file: %s" % size) + self.log.debug(self.tid, "Info: Size of file: %s" % size) except Exception, e: - self.log.error(self.tid, "Problems getting size of file: %s" % e) + self.log.error(self.tid, "Error: Problems getting size of"\ + " file: %s" % e) return False try: @@ -91,16 +92,15 @@ if self.gmyth.stderr in r: partial = self.gmyth.stderr.read(50).split("\n")[-2] if partial != "": - self.status = utils.progress_bar(self.log, - int(partial), + self.status = utils.progress_bar(int(partial), int(size), 50) except IndexError, e: pass except Exception, e: - self.log.error(self.tid, "Problems handling data: %s" % e) + self.log.error(self.tid, "Error: %s" % e) return False - self.log.info(self.tid, "Finished sending data") + self.log.info(self.tid, "OK: Done") return True # _start_myth()