Commit f34a5dd0 by Andreas Pelme

Merge branch 'master' of git://github.com/paltman/django-compress

parents 9a0fe623 bb57b2d3
......@@ -9,6 +9,7 @@ or just made django-compress more awesome.
* Alexander Pugachev <alexander.pugachev@gmail.com>
* Sander Smits <jhmsmits@gmail.com>
* Remco Wendt <remco@maykinmedia.nl>
* Patrick Altman <paltman@gmail.com>
The Python-version of jsmin (http://www.crockford.com/javascript/jsmin.html)
is included in django-compress. It was translated from to Python by Baruch
......
......@@ -81,6 +81,9 @@ def max_mtime(files):
return int(max([os.stat(media_root(f)).st_mtime for f in files]))
def save_file(filename, contents):
dirname = os.path.dirname(media_root(filename))
if not os.path.exists(dirname):
os.makedirs(dirname)
fd = open(media_root(filename), 'wb+')
fd.write(contents)
fd.close()
......@@ -104,12 +107,13 @@ def get_version_from_file(path, filename):
def remove_files(path, filename, verbosity=0):
regex = re.compile(r'^%s$' % (os.path.basename(get_output_filename(settings.COMPRESS_VERSION_PLACEHOLDER.join([re.escape(part) for part in filename.split(settings.COMPRESS_VERSION_PLACEHOLDER)]), r'[A-Za-z0-9]+'))))
for f in os.listdir(path):
if regex.match(f):
if verbosity >= 1:
print "Removing outdated file %s" % f
os.unlink(os.path.join(path, f))
if os.path.exists(path):
for f in os.listdir(path):
if regex.match(f):
if verbosity >= 1:
print "Removing outdated file %s" % f
os.unlink(os.path.join(path, f))
def filter_common(obj, verbosity, filters, attr, separator, signal):
output = concat(obj['source_filenames'], separator)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment