@@ -1,5 +1,10 @@

 2008-11-24  Michal Ludvig  <michal@logix.cz>

+	* s3cmd, s3cmd.1, S3/S3.py: Display or don't display progress meter

+	  default depends on whether we're on TTY (console) or not.

+

+2008-11-24  Michal Ludvig  <michal@logix.cz>

+

 	* s3cmd: Fixed 'get' conflict.

 	* s3cmd.1, TODO: Document 'mv' command.

@@ -569,9 +569,15 @@ class S3(object):

 				raise S3DownloadError("Download failed for: %s" % resource['uri'])

 		stream.flush()

-		progress.done("done")

 		timestamp_end = time.time()

+		if self.config.progress_meter:

+			## The above stream.flush() may take some time -> update() progress meter

+			## to correct the average speed. Otherwise people will complain that 

+			## 'progress' and response["speed"] are inconsistent ;-)

+			progress.update()

+			progress.done("done")

+

 		if start_position == 0:

 			# Only compute MD5 on the fly if we were downloading from the beginning

 			response["md5"] = md5_hash.hexdigest()

@@ -996,8 +996,8 @@ def main():

 	optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form.")

-	optparser.add_option(      "--progress", dest="progress_meter", action="store_true", help="Display progress meter (default).")

-	optparser.add_option(      "--no-progress", dest="progress_meter", action="store_false", help="Don't display progress meter.")

+	optparser.add_option(      "--progress", dest="progress_meter", action="store_true", help="Display progress meter (default on TTY).")

+	optparser.add_option(      "--no-progress", dest="progress_meter", action="store_false", help="Don't display progress meter (default on non-TTY).")

 	optparser.add_option("-v", "--verbose", dest="verbosity", action="store_const", const=logging.INFO, help="Enable verbose output.")

 	optparser.add_option("-d", "--debug", dest="verbosity", action="store_const", const=logging.DEBUG, help="Enable debug output.")

 	optparser.add_option(      "--version", dest="show_version", action="store_true", help="Show s3cmd version (%s) and exit." % (PkgInfo.version))

@@ -1044,6 +1044,10 @@ def main():

 		cfg.verbosity = options.verbosity

 	logging.root.setLevel(cfg.verbosity)

+	## Default to --progress on TTY devices, --no-progress elsewhere

+	## Can be overriden by actual --(no-)progress parameter

+	cfg.update_option('progress_meter', sys.stdout.isatty())

+

 	## Update Config with other parameters

 	for option in cfg.option_list():

 		try:

@@ -146,6 +146,9 @@ Print sizes in human readable form.

 .\"\fB\-u\fR, \fB\-\-show\-uri\fR

 .\"Show complete S3 URI in listings.

 .TP

+\fB\-\-progress\fR, \fB\-\-no\-progress\fR

+Display or don't display progress meter. When running on TTY (e.g. console or xterm) the default is to display progress meter. If not on TTY (e.g. output is redirected somewhere or running from cron) the default is to not display progress meter.

+.TP

 \fB\-v\fR, \fB\-\-verbose\fR

 Enable verbose output.

 .TP