mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-22 16:22:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #18050 -- Fixed a rather glaring bug in the handling of @import statements when using the cached staticfiles storage.

Browse source
This commit is contained in:
Jannis Leidel 2012-07-08 18:17:53 +02:00
parent effc2cad95
commit 3047981517
3 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
django/contrib/staticfiles/storage.py
View file

@ -45,10 +45,11 @@ class StaticFilesStorage(FileSystemStorage):
class CachedFilesMixin(object):
default_template = """url("%s")"""
patterns = (
("*.css", (
br"""(url\(['"]{0,1}\s*(.*?)["']{0,1}\))""",
br"""(@import\s*["']\s*(.*?)["'])""",
(br"""(@import\s*["']\s*(.*?)["'])""", """@import url("%s")"""),
)),
)
@ -62,8 +63,12 @@ class CachedFilesMixin(object):
self._patterns = SortedDict()
for extension, patterns in self.patterns:
for pattern in patterns:
if isinstance(pattern, (tuple, list)):
pattern, template = pattern
else:
template = self.default_template
compiled = re.compile(pattern)
self._patterns.setdefault(extension, []).append(compiled)
self._patterns.setdefault(extension, []).append((compiled, template))
def file_hash(self, name, content=None):
"""
@ -140,10 +145,13 @@ class CachedFilesMixin(object):
return unquote(final_url)
def url_converter(self, name):
def url_converter(self, name, template=None):
"""
Returns the custom URL converter for the given file name.
"""
if template is None:
template = self.default_template
def converter(matchobj):
"""
Converts the matched URL depending on the parent level (`..`)
@ -178,7 +186,8 @@ class CachedFilesMixin(object):
relative_url = '/'.join(url.split('/')[:-1] + file_name)
# Return the hashed version to the file
return 'url("%s")' % unquote(relative_url)
return template % unquote(relative_url)
return converter
def post_process(self, paths, dry_run=False, **options):
@ -229,9 +238,9 @@ class CachedFilesMixin(object):
# ..to apply each replacement pattern to the content
if name in adjustable_paths:
content = original_file.read().decode(settings.FILE_CHARSET)
converter = self.url_converter(name)
for patterns in self._patterns.values():
for pattern in patterns:
for pattern, template in patterns:
converter = self.url_converter(name, template)
content = pattern.sub(converter, content)
if hashed_file_exists:
self.delete(hashed_name)