openstack/swift
Code Issues Proposed changes

Merge from trunk

Browse Source
This commit is contained in:
gholt
2010-11-30 08:01:05 -08:00
parent 76edfbc94c bbbf38324d
commit 6a2a4cf554
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
etc/mime.types-sample Normal file
View File

@@ -0,0 +1,10 @@
#########################################################
# A nice place to put custom Mime-Types for Swift #
# Please enter Mime-Types in standard mime.types format #
# Mime-Type Extension ex. image/jpeg jpg #
#########################################################
#EX. Mime-Type Extension
# foo/bar foo

2
swift/proxy/server.py
View File

@@ -1326,6 +1326,8 @@ class BaseApplication(object):
self.account_ring = account_ring or \ self.account_ring = account_ring or \
Ring(os.path.join(swift_dir, 'account.ring.gz')) Ring(os.path.join(swift_dir, 'account.ring.gz'))
self.memcache = memcache self.memcache = memcache
mimetypes.init(mimetypes.knownfiles +
[os.path.join(swift_dir, 'mime.types')])
def get_controller(self, path): def get_controller(self, path):
""" """

15
test/unit/proxy/test_server.py
View File

@@ -29,6 +29,7 @@ from shutil import rmtree
from time import time from time import time
from urllib import unquote, quote from urllib import unquote, quote
from hashlib import md5 from hashlib import md5
from tempfile import mkdtemp
import eventlet import eventlet
from eventlet import sleep, spawn, TimeoutError, util, wsgi, listen from eventlet import sleep, spawn, TimeoutError, util, wsgi, listen
@@ -362,6 +363,20 @@ class TestObjectController(unittest.TestCase):
'text/html', 'text/html'])) 'text/html', 'text/html']))
test_content_type('test.css', iter(['', '', '', 'text/css', test_content_type('test.css', iter(['', '', '', 'text/css',
'text/css', 'text/css'])) 'text/css', 'text/css']))
def test_custom_mime_types_files(self):
swift_dir = mkdtemp()
try:
with open(os.path.join(swift_dir, 'mime.types'), 'w') as fp:
fp.write('foo/bar foo\n')
ba = proxy_server.BaseApplication({'swift_dir': swift_dir},
FakeMemcache(), NullLoggingHandler(), FakeRing(), FakeRing(),
FakeRing())
self.assertEquals(proxy_server.mimetypes.guess_type('blah.foo')[0],
'foo/bar')
self.assertEquals(proxy_server.mimetypes.guess_type('blah.jpg')[0],
'image/jpeg')
finally:
rmtree(swift_dir, ignore_errors=True)
def test_PUT(self): def test_PUT(self):
with save_globals(): with save_globals():