Permalink
Browse files

* s3cmd.1: Document all the new options and commands.

* s3cmd, S3/Config.py: Updated some help texts. Removed
  option --debug-syncmatch along the way (because --dry-run
  with --debug is good enough).
* TODO: Updated.



git-svn-id: https://s3tools.svn.sourceforge.net/svnroot/s3tools/s3cmd/trunk@376 830e0280-6d2a-0410-9c65-932aecc39d9d
  • Loading branch information...
mludvig committed Feb 16, 2009
1 parent 5c805fd commit 01a805248c1b925f44984c545355ca1cb51c8fb6
Showing with 173 additions and 93 deletions.
  1. +8 −0 ChangeLog
  2. +0 −1 S3/Config.py
  3. +4 −3 TODO
  4. +4 −12 s3cmd
  5. +157 −77 s3cmd.1
View
@@ -1,3 +1,11 @@
+2009-02-17 Michal Ludvig <michal@logix.cz>
+
+ * s3cmd.1: Document all the new options and commands.
+ * s3cmd, S3/Config.py: Updated some help texts. Removed
+ option --debug-syncmatch along the way (because --dry-run
+ with --debug is good enough).
+ * TODO: Updated.
+
2009-02-16 Michal Ludvig <michal@logix.cz>
* s3cmd: Check Python version >= 2.4 as soon as possible.
View
@@ -59,7 +59,6 @@ class Config(object):
bucket_location = "US"
default_mime_type = "binary/octet-stream"
guess_mime_type = True
- debug_syncmatch = False
# List of checks to be performed for 'sync'
sync_checks = ['size', 'md5'] # 'weak-timestamp'
# List of compiled REGEXPs
View
7 TODO
@@ -6,12 +6,13 @@ TODO list for s3cmd project
(at the moment it'll always download).
- Enable --exclude for [del], [setacl], [ls].
- Enable --dry-run for [del], [setacl], reject for all others.
- - Add testsuite for new put, get and sync semantic.
- Recursive cp/mv on remote "folders".
- - Document --recursive and --force for buckets, CloudFront,
- new options --dry-run, --include, etc.
- Allow change /tmp to somewhere else
- With --guess-mime use 'magic' module if available.
+ - Support --preserve for [put] and [get]. Update manpage.
+ - Don't let --continue fail if the file is already fully downloaded.
+ - Option --mime-type should set mime type with 'cp' and 'mv'.
+ If possible --guess-mime-type should do as well.
- For 1.0.0
- Add 'geturl' command, both Unicode and urlencoded output.
View
16 s3cmd
@@ -692,12 +692,9 @@ def _compare_filelists(src_list, dst_list, src_is_local_and_dst_is_remote):
info(u"Verifying attributes...")
cfg = Config()
exists_list = SortedDict()
- if cfg.debug_syncmatch:
- logging.root.setLevel(logging.DEBUG)
for file in src_list.keys():
- if not cfg.debug_syncmatch:
- debug(u"CHECK: %s" % file)
+ debug(u"CHECK: %s" % file)
if dst_list.has_key(file):
## Was --skip-existing requested?
if cfg.skip_existing:
@@ -736,10 +733,6 @@ def _compare_filelists(src_list, dst_list, src_is_local_and_dst_is_remote):
## Remove from destination-list, all that is left there will be deleted
del(dst_list[file])
- if cfg.debug_syncmatch:
- warning(u"Exiting because of --debug-syncmatch")
- sys.exit(1)
-
return src_list, dst_list, exists_list
def cmd_sync_remote2local(args):
@@ -1350,7 +1343,7 @@ def 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 (only for [sync] command)")
+ 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 (only for file transfer commands)")
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.")
@@ -1372,19 +1365,18 @@ def main():
optparser.add_option( "--include-from", dest="include_from", action="append", metavar="FILE", help="Read --include GLOBs from FILE")
optparser.add_option( "--rinclude", dest="rinclude", action="append", metavar="REGEXP", help="Same as --include but uses REGEXP (regular expression) instead of GLOB")
optparser.add_option( "--rinclude-from", dest="rinclude_from", action="append", metavar="FILE", help="Read --rinclude REGEXPs from FILE")
- optparser.add_option( "--debug-syncmatch", "--debug-exclude", dest="debug_syncmatch", action="store_true", help="Output detailed information about remote vs. local filelist matching and --exclude processing and then exit")
optparser.add_option( "--bucket-location", dest="bucket_location", help="Datacentre to create bucket in. Either EU or US (default)")
optparser.add_option("-m", "--mime-type", dest="default_mime_type", type="mimetype", metavar="MIME/TYPE", help="Default MIME-type to be set for objects stored.")
optparser.add_option("-M", "--guess-mime-type", dest="guess_mime_type", action="store_true", help="Guess MIME-type of files by their extension. Falls back to default MIME-Type as specified by --mime-type option")
- optparser.add_option( "--add-header", dest="add_header", action="append", metavar="NAME:VALUE", help="Add a given HTTP header to the upload request. Can be used multiple times. (only for [put] and [sync] commands).")
+ optparser.add_option( "--add-header", dest="add_header", action="append", metavar="NAME:VALUE", help="Add a given HTTP header to the upload request. Can be used multiple times. For instance set 'Expires' or 'Cache-Control' headers (or both) using this options if you like.")
optparser.add_option( "--encoding", dest="encoding", metavar="ENCODING", help="Override autodetected terminal and filesystem encoding (character set). Autodetected: %s" % preferred_encoding)
optparser.add_option( "--list-md5", dest="list_md5", action="store_true", help="Include MD5 sums in bucket listings (only for 'ls' command).")
- optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form.")
+ optparser.add_option("-H", "--human-readable-sizes", dest="human_readable_sizes", action="store_true", help="Print sizes in human readable form (eg 1kB instead of 1234).")
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).")
Oops, something went wrong.

0 comments on commit 01a8052

Please sign in to comment.