@@ -12,8 +12,9 @@ from SortedDict import SortedDict

 from BidirMap import BidirMap

 from ConfigParser import ConfigParser

-class AwsConfig:

-	parsed_files = []

+class Config(object):

+	_instance = None

+	_parsed_files = []

 	access_key = ""

 	secret_key = ""

 	host = "s3.amazonaws.com"

@@ -25,21 +26,61 @@ class AwsConfig:

 	show_uri = False

 	acl_public = False

+	## Creating a singleton

+	def __new__(self, configfile = None):

+		if self._instance is None:

+			self._instance = object.__new__(self)

+		return self._instance

+

 	def __init__(self, configfile = None):

 		if configfile:

 			self.read_config_file(configfile)

+	def option_list(self):

+		retval = []

+		for option in dir(self):

+			## Skip attributes that start with underscore or are not string, int or bool

+			option_type = type(getattr(Config, option))

+			if option.startswith("_") or \

+			   not (option_type in (

+			   		type("string"),	# str

+			        	type(42),	# int

+					type(True))):	# bool

+				continue

+			retval.append(option)

+		return retval

+

 	def read_config_file(self, configfile):

 		cp = ConfigParser(configfile)

-		AwsConfig.access_key = cp.get("access_key", AwsConfig.access_key)

-		AwsConfig.secret_key = cp.get("secret_key", AwsConfig.secret_key)

-		AwsConfig.host = cp.get("host", AwsConfig.host)

-		verbosity = cp.get("verbosity", "WARNING")

-		try:

-			AwsConfig.verbosity = logging._levelNames[verbosity]

-		except KeyError:

-			error("AwsConfig: verbosity level '%s' is not valid" % verbosity)

-		AwsConfig.parsed_files.append(configfile)

+		for option in self.option_list():

+			self.update_option(option, cp.get(option))

+		self._parsed_files.append(configfile)

+

+	def update_option(self, option, value):

+		if value is None:

+			return

+		#### Special treatment of some options

+		## verbosity must be known to "logging" module

+		if option == "verbosity":

+			try:

+				setattr(Config, "verbosity", logging._levelNames[value])

+			except KeyError:

+				error("Config: verbosity level '%s' is not valid" % value)

+		## allow yes/no, true/false, on/off and 1/0 for boolean options

+		elif type(getattr(Config, option)) is type(True):	# bool

+			if str(value).lower() in ("true", "yes", "on", "1"):

+				setattr(Config, option, True)

+			elif str(value).lower() in ("false", "no", "off", "0"):

+				setattr(Config, option, False)

+			else:

+				error("Config: value of option '%s' must be Yes or No, not '%s'" % (option, value))

+		elif type(getattr(Config, option)) is type(42):		# int

+			try:

+				setattr(Config, option, int(value))

+			except ValueError, e:

+				error("Config: value of option '%s' must be an integer, not '%s'" % (option, value))

+		else:							# string

+			setattr(Config, option, value)

 class S3Error (Exception):

 	def __init__(self, response):

@@ -139,7 +180,7 @@ class S3:

 			raise ParameterError("%s: %s" % (filename, e.strerror))

 		headers = SortedDict()

 		headers["content-length"] = size

-		if AwsConfig.acl_public:

+		if self.config.acl_public:

 			headers["x-amz-acl"] = "public-read"

 		request = self.create_request("OBJECT_PUT", bucket = bucket, object = object, headers = headers)

 		response = self.send_file(request, file)

@@ -211,8 +252,8 @@ class S3:

 		conn.endheaders()

 		size_left = size_total = headers.get("content-length")

 		while (size_left > 0):

-			debug("SendFile: Reading up to %d bytes from '%s'" % (AwsConfig.send_chunk, file.name))

-			data = file.read(AwsConfig.send_chunk)

+			debug("SendFile: Reading up to %d bytes from '%s'" % (self.config.send_chunk, file.name))

+			data = file.read(self.config.send_chunk)

 			debug("SendFile: Sending %d bytes to the server" % len(data))

 			conn.send(data)

 			size_left -= len(data)

@@ -251,7 +292,7 @@ class S3:

 		md5=hashlib.new("md5")

 		size_left = size_total = int(response["headers"]["content-length"])

 		while (size_left > 0):

-			this_chunk = size_left > AwsConfig.recv_chunk and AwsConfig.recv_chunk or size_left

+			this_chunk = size_left > self.config.recv_chunk and self.config.recv_chunk or size_left

 			debug("ReceiveFile: Receiving up to %d bytes from the server" % this_chunk)

 			data = http_response.read(this_chunk)

 			debug("ReceiveFile: Writing %d bytes to file '%s'" % (len(data), file.name))

@@ -293,7 +334,7 @@ class S3:

 		return True

 	def compose_uri(self, bucket, object = None, force_uri = False):

-		if AwsConfig.show_uri or force_uri:

+		if self.config.show_uri or force_uri:

 			uri = "s3://" + bucket

 			if object:

 				uri += "/"+object

@@ -9,7 +9,8 @@ import sys

 import logging

 import time

-from optparse import OptionParser

+from copy import copy

+from optparse import OptionParser, Option, OptionValueError

 from logging import debug, info, warning, error

 import elementtree.ElementTree as ET

@@ -20,7 +21,7 @@ def output(message):

 	print message

 def cmd_ls(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	bucket = None

 	if len(args) > 0:

 		isuri, bucket, object = s3.parse_s3_uri(args[0])

@@ -32,7 +33,7 @@ def cmd_ls(args):

 		cmd_buckets_list_all(args)

 def cmd_buckets_list_all(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	response = s3.list_all_buckets()

 	for bucket in response["list"]:

 		output("%s  %s" % (

@@ -41,7 +42,7 @@ def cmd_buckets_list_all(args):

 			))

 def cmd_buckets_list_all_all(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	response = s3.list_all_buckets()

 	for bucket in response["list"]:

@@ -50,7 +51,7 @@ def cmd_buckets_list_all_all(args):

 def cmd_bucket_list(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	isuri, bucket, object = s3.parse_s3_uri(args[0])

 	if not isuri:

 		bucket = args[0]

@@ -64,7 +65,7 @@ def cmd_bucket_list(args):

 		else:

 			raise

 	for object in response["list"]:

-		size, size_coeff = formatSize(object["Size"], AwsConfig.human_readable_sizes)

+		size, size_coeff = formatSize(object["Size"], Config().human_readable_sizes)

 		output("%s  %s%s  %s" % (

 			formatDateTime(object["LastModified"]),

 			str(size).rjust(8), size_coeff.ljust(1),

@@ -72,7 +73,7 @@ def cmd_bucket_list(args):

 			))

 def cmd_bucket_create(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	isuri, bucket, object = s3.parse_s3_uri(args[0])

 	if not isuri:

 		bucket = args[0]

@@ -87,7 +88,7 @@ def cmd_bucket_create(args):

 	output("Bucket '%s' created" % bucket)

 def cmd_bucket_delete(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	isuri, bucket, object = s3.parse_s3_uri(args[0])

 	if not isuri:

 		bucket = args[0]

@@ -102,7 +103,7 @@ def cmd_bucket_delete(args):

 	output("Bucket '%s' removed" % bucket)

 def cmd_object_put(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	s3uri = args.pop()

 	files = args[:]

@@ -111,7 +112,7 @@ def cmd_object_put(args):

 	if not isuri:

 		raise ParameterError("Expecting S3 URI instead of '%s'" % s3uri)

-	if len(files) > 1 and object != "" and not AwsConfig.force:

+	if len(files) > 1 and object != "" and not Config().force:

 		error("When uploading multiple files the last argument must")

 		error("be a S3 URI specifying just the bucket name")

 		error("WITHOUT object name!")

@@ -131,7 +132,7 @@ def cmd_object_put(args):

 			(file, s3.compose_uri(bucket, object_final, force_uri = True), response["size"]))

 def cmd_object_get(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	s3uri = args.pop(0)

 	isuri, bucket, object = s3.parse_s3_uri(s3uri)

 	if not isuri or not bucket or not object:

@@ -139,14 +140,14 @@ def cmd_object_get(args):

 	destination = len(args) > 0 and args.pop(0) or object

 	if os.path.isdir(destination):

 		destination += ("/" + object)

-	if not AwsConfig.force and os.path.exists(destination):

+	if not Config().force and os.path.exists(destination):

 		raise ParameterError("File %s already exists. Use --force to overwrite it" % destination)

 	response = s3.object_get(destination, bucket, object)

 	output("Object %s saved as '%s' (%d bytes)" %

 		(s3uri, destination, response["size"]))

 def cmd_object_del(args):

-	s3 = S3(AwsConfig())

+	s3 = S3(Config())

 	s3uri = args.pop(0)

 	isuri, bucket, object = s3.parse_s3_uri(s3uri)

 	if not isuri or not bucket or not object:

@@ -164,26 +165,35 @@ commands = {

 	"del": ("Delete file from bucket", cmd_object_del, 1),

 	}

+class OptionMimeType(Option):

+	def check_mimetype(option, opt, value):

+		if re.compile("^[a-z0-9]+/[a-z0-9+\.-]+$", re.IGNORECASE).match(value):

+			return value

+		raise OptionValueError("option %s: invalid MIME-Type format: %r" % (opt, value))

+

+	TYPES = Option.TYPES + ("mimetype",)

+	TYPE_CHECKER = copy(Option.TYPE_CHECKER)

+	TYPE_CHECKER["mimetype"] = check_mimetype

+

 if __name__ == '__main__':

 	if float("%d.%d" %(sys.version_info[0], sys.version_info[1])) < 2.5:

 		sys.stderr.write("ERROR: Python 2.5 or higher required, sorry.\n")

 		exit(1)

-	default_verbosity = AwsConfig.verbosity

-	optparser = OptionParser()

+	default_verbosity = Config().verbosity

+	optparser = OptionParser(option_class=OptionMimeType)

+	#optparser.disable_interspersed_args()

 	optparser.set_defaults(config=os.getenv("HOME")+"/.s3cfg")

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

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

 	optparser.set_defaults(verbosity = default_verbosity)

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

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

-	optparser.set_defaults(human_readable = False)

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

-	optparser.set_defaults(force = False)

-	optparser.add_option("-f", "--force", dest="force", action="store_true", help="Force overwrite and other dangerous operations")

-	optparser.set_defaults(show_uri = False)

-	optparser.add_option("-u", "--show-uri", dest="show_uri", action="store_true", help="Show complete S3 URI in listings")

-	optparser.set_defaults(acl_public = False)

-	optparser.add_option("-P", "--acl-public", dest="acl_public", action="store_true", help="Store objects with ACL allowing read by anyone")

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

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

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

+	optparser.add_option("-f", "--force", dest="force", action="store_true", help="Force overwrite and other dangerous operations.")

+	optparser.add_option("-u", "--show-uri", dest="show_uri", action="store_true", help="Show complete S3 URI in listings.")

+	optparser.add_option("-P", "--acl-public", dest="acl_public", action="store_true", help="Store objects with ACL allowing read by anyone.")

+	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")

 	(options, args) = optparser.parse_args()

@@ -192,19 +202,23 @@ if __name__ == '__main__':

 	logging.basicConfig(level=options.verbosity, format='%(levelname)s: %(message)s')

 	## Now finally parse the config file

-	AwsConfig(options.config)

+	Config(options.config)

 	## And again some logging level adjustments

 	## according to configfile and command line parameters

 	if options.verbosity != default_verbosity:

-		AwsConfig.verbosity = options.verbosity

-	logging.root.setLevel(AwsConfig.verbosity)

-

-	## Update AwsConfig with other parameters

-	AwsConfig.human_readable_sizes = options.human_readable

-	AwsConfig.force = options.force

-	AwsConfig.show_uri = options.show_uri

-	AwsConfig.acl_public = options.acl_public

+		Config().verbosity = options.verbosity

+	logging.root.setLevel(Config().verbosity)

+

+	## Update Config with other parameters

+	for parameter in (

+			"human_readable_sizes",

+			"force",

+			"show_uri",

+			"acl_public",):

+		if getattr(options, parameter) != None:

+			debug("Updating %s -> %s" % (parameter, getattr(options, parameter)))

+			setattr(Config, parameter, getattr(options, parameter))

 	if len(args) < 1:

 		error("Missing command. Please run with --help for more information.")