@@ -96,6 +96,7 @@ class Config(object):

     website_error = ""

     website_endpoint = "http://%(bucket)s.s3-website-%(location)s.amazonaws.com/"

     additional_destinations = []

+    files_from = []

     cache_file = ""

     add_headers = ""

@@ -14,6 +14,7 @@ from HashCache import HashCache

 from logging import debug, info, warning, error

 import os

+import sys

 import glob

 import copy

@@ -140,7 +141,45 @@ def handle_exclude_include_walk(root, dirs, files):

         else:

             debug(u"PASS: %r" % (file))

-def fetch_local_list(args, recursive = None):

+

+def _get_filelist_from_file(cfg, local_path):

+    def _append(d, key, value):

+        if key not in d:

+            d[key] = [value]

+        else:

+            d[key].append(value)

+

+    filelist = {}

+    for fname in cfg.files_from:

+        if fname == u'-':

+            f = sys.stdin

+        else:

+            try:

+                f = open(fname, 'r')

+            except IOError, e:

+                warning(u"--files-from input file %s could not be opened for reading (%s), skipping." % (fname, e.strerror))

+                continue

+                

+        for line in f:

+            line = line.strip()

+            line = os.path.normpath(os.path.join(local_path, line))

+            dirname = os.path.dirname(line)

+            basename = os.path.basename(line)

+            _append(filelist, dirname, basename)

+        if f != sys.stdin:

+            f.close()

+

+    # reformat to match os.walk()

+    result = []

+    keys = filelist.keys()

+    keys.sort()

+    for key in keys:

+        values = filelist[key]

+        values.sort()

+        result.append((key, [], values))

+    return result

+

+def fetch_local_list(args, is_src = False, recursive = None):

     def _get_filelist_local(loc_list, local_uri, cache):

         info(u"Compiling list of local files...")

@@ -155,11 +194,15 @@ def fetch_local_list(args, recursive = None):

         if local_uri.isdir():

             local_base = deunicodise(local_uri.basename())

             local_path = deunicodise(local_uri.path())

-            if cfg.follow_symlinks:

-                filelist = _fswalk_follow_symlinks(local_path)

+            if is_src and len(cfg.files_from):

+                filelist = _get_filelist_from_file(cfg, local_path)

+                single_file = False

             else:

-                filelist = _fswalk_no_symlinks(local_path)

-            single_file = False

+                if cfg.follow_symlinks:

+                    filelist = _fswalk_follow_symlinks(local_path)

+                else:

+                    filelist = _fswalk_no_symlinks(local_path)

+                single_file = False

         else:

             local_base = ""

             local_path = deunicodise(local_uri.dirname())

@@ -271,7 +271,7 @@ def cmd_object_put(args):

     if len(args) == 0:

         raise ParameterError("Nothing to upload. Expecting a local file or directory.")

-    local_list, single_file_local = fetch_local_list(args)

+    local_list, single_file_local = fetch_local_list(args, is_src = True)

     local_list, exclude_list = filter_exclude_include(local_list)

@@ -726,7 +726,7 @@ def cmd_sync_remote2local(args):

     s3 = S3(Config())

     destination_base = args[-1]

-    local_list, single_file_local = fetch_local_list(destination_base, recursive = True)

+    local_list, single_file_local = fetch_local_list(destination_base, is_src = False, recursive = True)

     remote_list = fetch_remote_list(args[:-1], recursive = True, require_attribs = True)

     local_count = len(local_list)

@@ -1165,7 +1165,7 @@ def cmd_sync_local2remote(args):

         error(u"or disable encryption with --no-encrypt parameter.")

         sys.exit(1)

-    local_list, single_file_local = fetch_local_list(args[:-1], recursive = True)

+    local_list, single_file_local = fetch_local_list(args[:-1], is_src = True, recursive = True)

     destinations = [args[-1]]

     if cfg.additional_destinations:

@@ -1785,6 +1785,7 @@ def main():

     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(      "--files-from", dest="files_from", action="append", metavar="FILE", help="Read list of source-file names from FILE. Use - to read from stdin.")

     optparser.add_option(      "--bucket-location", dest="bucket_location", help="Datacentre to create bucket in. As of now the datacenters are: US (default), EU, ap-northeast-1, ap-southeast-1, sa-east-1, us-west-1 and us-west-2")

     optparser.add_option(      "--reduced-redundancy", "--rr", dest="reduced_redundancy", action="store_true", help="Store object with 'Reduced redundancy'. Lower per-GB price. [put, cp, mv]")

@@ -1966,6 +1967,8 @@ def main():

     if options.additional_destinations:

         cfg.additional_destinations = options.additional_destinations

+    if options.files_from:

+        cfg.files_from = options.files_from

     ## Set output and filesystem encoding for printing out filenames.

     sys.stdout = codecs.getwriter(cfg.encoding)(sys.stdout, "replace")

@@ -225,6 +225,10 @@ Same as --include but uses REGEXP (regular expression) instead of GLOB

 \fB\-\-rinclude\-from\fR=FILE

 Read --rinclude REGEXPs from FILE

 .TP

+\fB\-\-files\-from\fR=FILE

+Read list of source-file names from FILE. Use - to read from stdin.

+May be repeated.

+.TP

 \fB\-\-bucket\-location\fR=BUCKET_LOCATION

 Datacentre to create bucket in. As of now the datacenters are: US (default), EU, ap-northeast-1, ap-southeast-1, sa-east-1, us-west-1 and us-west-2

 .TP