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

 2008-06-05  Michal Ludvig  <michal@logix.cz>

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

+	* NEWS: Added 0.9.7

+	* TODO: Removed completed tasks

+	* s3cmd, s3cmd.1: Updated help texts, 

+	  removed --dry-run option as it's not implemented.

+	

+2008-06-05  Michal Ludvig  <michal@logix.cz>

+

 	* S3/Config.py: Store more file attributes in sync to S3.

 	* s3cmd: Make sync remote2local more error-resilient.

@@ -1,3 +1,12 @@

+s3cmd 0.9.7   -   2008-06-05

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

+* Implemented 'sync' from S3 back to local folder, including

+  file attribute restoration.

+* Failed uploads are retried on lower speed to improve error

+  resilience.

+* Compare MD5 of the uploaded file, compare with checksum

+  reported by S3 and re-upload on mismatch.

+

 s3cmd 0.9.6   -   2008-02-28

 ===========

 * Support for setting / guessing MIME-type of uploaded file

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

 package = "s3cmd"

-version = "0.9.7-pre1"

+version = "0.9.7"

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

 license = "GPL version 2"

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

@@ -7,10 +7,6 @@ TODO list for s3cmd project

     with "directories"

   - Recursion for some commands

-- Implement 'sync' from S3 to local filesystem

-  - Will have to restore file attributes

-    - Eh, we have to store them first ;-)

-

 - Implement GPG for sync

   (it's not that easy since it won't be easy to compare

    the encrypted-remote-object size with local file. 

@@ -20,12 +16,5 @@ TODO list for s3cmd project

    have to do large number for object/HEAD requests. tough 

    call).

-- Compute MD5 checksum when sending file to S3 

-  (that's easy and patch exists but it will slow down 

-   the operation. instead I'm planning to run the 

-   MD5-summor in a separate thread since both MD5-summing

-   and sending data to S3 can both be time consuming yet 

-   parallel tasks).

-

 - Keep man page up to date and write some more documentation

   - Yeah, right ;-)

@@ -781,7 +781,7 @@ commands_list = [

 	{"cmd":"get", "label":"Get file from bucket", "param":"s3://BUCKET/OBJECT LOCAL_FILE", "func":cmd_object_get, "argc":1},

 	{"cmd":"del", "label":"Delete file from bucket", "param":"s3://BUCKET/OBJECT", "func":cmd_object_del, "argc":1},

 	#{"cmd":"mkdir", "label":"Make a virtual S3 directory", "param":"s3://BUCKET/path/to/dir", "func":cmd_mkdir, "argc":1},

-	{"cmd":"sync", "label":"Synchronize a directory tree to S3", "param":"LOCAL_DIR s3://BUCKET[/PREFIX]", "func":cmd_sync, "argc":2},

+	{"cmd":"sync", "label":"Synchronize a directory tree to S3", "param":"LOCAL_DIR s3://BUCKET[/PREFIX] or s3://BUCKET[/PREFIX] LOCAL_DIR", "func":cmd_sync, "argc":2},

 	{"cmd":"du", "label":"Disk usage by buckets", "param":"[s3://BUCKET[/PREFIX]]", "func":cmd_du, "argc":0},

 	{"cmd":"info", "label":"Get various information about Buckets or Objects", "param":"s3://BUCKET[/OBJECT]", "func":cmd_info, "argc":1},

 	#{"cmd":"setacl", "label":"Modify Access control list for Bucket or Object", "param":"s3://BUCKET[/OBJECT]", "func":cmd_setacl, "argc":1},

@@ -831,7 +831,7 @@ if __name__ == '__main__':

 	optparser.add_option("-c", "--config", dest="config", metavar="FILE", help="Config file name. Defaults to %default")

 	optparser.add_option(      "--dump-config", dest="dump_config", action="store_true", help="Dump current configuration after parsing config files and command line options and exit.")

-	optparser.add_option("-n", "--dry-run", dest="dry_run", action="store_true", help="Only show what should be uploaded or downloaded but don't actually do it. May still perform S3 requests to get bucket listings and other information though.")

+	#optparser.add_option("-n", "--dry-run", dest="dry_run", action="store_true", help="Only show what should be uploaded or downloaded but don't actually do it. May still perform S3 requests to get bucket listings and other information though.")

 	optparser.add_option("-e", "--encrypt", dest="encrypt", action="store_true", help="Encrypt files before uploading to S3.")

 	optparser.add_option(      "--no-encrypt", dest="encrypt", action="store_false", help="Don't encrypt files.")

@@ -37,7 +37,10 @@ Get file from bucket (i.e. download from S3)

 Delete file from bucket

 .TP

 \fBsync\fR \fILOCAL_DIR s3://BUCKET[/PREFIX]\fR

-Synchronize a directory tree to S3

+Backup a directory tree to S3

+.TP

+\fBsync\fR \fIs3://BUCKET[/PREFIX] LOCAL_DIR\fR

+Restore a tree from S3 to local directory

 .TP

 \fBinfo\fR \fIs3://BUCKET[/OBJECT]\fR

 Get various information about a Bucket or Object

@@ -72,7 +75,7 @@ Most options can have a default value set in the above specified config file.

 Options specific to \fBsync\fR command:

 .TP

 \fB\-\-delete\-removed\fR

-Delete remote objects with no corresponding local file

+Delete remote objects with no corresponding local file when \fIsync\fRing \fBto\fR S3 or delete local files with no corresponding object in S3 when \fIsync\fRing \fBfrom\fR S3.

 .TP

 \fB\-\-no\-delete\-removed\fR

 Don't delete remote objects. Default for 'sync' command.

@@ -82,9 +85,9 @@ Preserve filesystem attributes (mode, ownership, timestamps). Default for 'sync'

 .TP

 \fB\-\-no\-preserve\fR

 Don't store filesystem attributes with uploaded files.

-.TP

-\fB\-n\fR, \fB\-\-dry\-run\fR

-Only show what would be uploaded or downloaded but don't actually do it. May still perform S3 requests to get bucket listings and other information though.

+.\".TP

+.\"\fB\-n\fR, \fB\-\-dry\-run\fR

+.\"Only show what would be uploaded or downloaded but don't actually do it. May still perform S3 requests to get bucket listings and other information though.

 .PP

 Options common for all commands (where it makes sense indeed):

 .TP