Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: django-compressor/django-compressor
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: GoodCloud/django_compressor
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 21, 2011

  1. Added richeland's patch, so compress runs.

    @skoczen
    skoczen committed Oct 21, 2011
    Copy the full SHA
    a5a7c79 View commit details

Commits on May 4, 2012

  1. Merge remote-tracking branch 'trunk/master' into develop

    @skoczen
    skoczen committed May 4, 2012
    Copy the full SHA
    edea627 View commit details

  2. storing offline manifest in cache on first access, ignoring silly mac… 

    … files
    @skoczen
    skoczen committed May 4, 2012
    Copy the full SHA
    8071150 View commit details
Showing with 14 additions and 5 deletions.
  1. +2 −1 .gitignore
  2. +12 −4 compressor/cache.py
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -11,4 +11,5 @@ MANIFEST
docs/_build/
.coverage
htmlcov
.sass-cache
.sass-cache
.DS_Store
16 changes: 12 additions & 4 deletions compressor/cache.py
View file
Original file line number Diff line number Diff line change
@@ -63,12 +63,20 @@ def get_offline_manifest_filename():


def get_offline_manifest():
filename = get_offline_manifest_filename()
if default_storage.exists(filename):
return simplejson.load(default_storage.open(filename))
else:
manifest = cache.get(simple_cachekey("manifest"))
if manifest is None:
filename = get_offline_manifest_filename()
if default_storage.exists(filename):
manifest = simplejson.load(default_storage.open(filename))
if manifest is not None:
cache.set(simple_cachekey("manifest"), manifest)
return manifest

return {}

return manifest



def write_offline_manifest(manifest):
filename = get_offline_manifest_filename()