@@ -1,3 +1,23 @@

+2008-08-01  Michal Ludvig  <michal@logix.cz>

+

+	* TODO: Add some items

+

+2008-07-29  Michal Ludvig  <michal@logix.cz>

+

+	* Released version 0.9.8.3

+	  ------------------------

+

+2008-07-29  Michal Ludvig  <michal@logix.cz>

+

+	* S3/PkgInfo.py: Bumped up version to 0.9.8.3

+	* NEWS: Added 0.9.8.3

+

+2008-07-29  Michal Ludvig  <michal@logix.cz>

+

+	* S3/Utils.py (hash_file_md5): Hash files in 32kB chunks

+	  instead of reading it all up to a memory first to avoid

+	  OOM on large files.

+

 2008-07-07  Michal Ludvig  <michal@logix.cz>

 	* s3cmd.1: couple of syntax fixes from Mikhail Gusarov

@@ -1,3 +1,8 @@

+s3cmd 0.9.8.3 -   2008-07-29

+=============

+* Bugfix release. Avoid running out-of-memory in MD5'ing

+  large files.

+

 s3cmd 0.9.8.2 -   2008-06-27

 =============

 * Bugfix release. Re-upload file if Amazon doesn't send ETag 

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

 package = "s3cmd"

-version = "0.9.8.2"

+version = "0.9.8.3"

 url = "http://s3tools.logix.cz"

 license = "GPL version 2"

 short_description = "S3cmd is a tool for managing Amazon S3 storage space."

@@ -139,7 +139,12 @@ def mktmpfile(prefix = "/tmp/tmpfile-", randchars = 20):

 def hash_file_md5(filename):

 	h = md5.new()

 	f = open(filename, "rb")

-	h.update(f.read())

+	while True:

+		# Hash 32kB chunks

+		data = f.read(32*1024)

+		if not data:

+			break

+		h.update(data)

 	f.close()

 	return h.hexdigest()

@@ -1,6 +1,18 @@

 TODO list for s3cmd project

 ===========================

+- For 0.9.9

+  - Implement 'cp' and 'mv'

+  - Better upload / download progress display (and remove 

+    excessive useless transfer info from verbose/debug 

+    output)

+  - Warn when encryption is required (conf/arg) for sync

+    and request for explicit --no-encrypt parameter.

+  - Add --include/--include-from/--rinclude* for sync

+

+- After 1.0.0

+  - Speed up upload / download with multiple threads.

+

 - Treat objects with "/" in their name as directories

   - Will need local cache for bucket listings

   - More user friendly 'del' operation that would work

@@ -14,6 +14,7 @@ import errno

 import pwd, grp

 import glob

 import traceback

+import codecs

 from copy import copy

 from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatter

@@ -1037,6 +1038,9 @@ if __name__ == '__main__':

 		from S3 import Utils

 		from S3.Exceptions import *

+		## Output UTF-8 in all cases, even on output redirects

+		sys.stdout = codecs.getwriter("utf-8")(sys.stdout)

+

 		main()

 		sys.exit(0)

 	except SystemExit, e: