Jannis Leidel
5f75ac91df
Fixed #17896 -- Added file_hash method to CachedStaticFilesStorage to be able to customize the way the hashed name of a file is created. Thanks to mkai for the initial patch.
2012-05-16 13:21:50 +02:00
Jannis Leidel
1c1a229632
Set the post process cache when finished instead of one by one.
...
This should prevent a race condition if running collectstatic is
canceled or its cache is accessed from other processes, leaving the
cache in a corrupt state.
2012-05-10 18:31:48 +02:00
Claude Paroz
3904b74a3f
Fixed #18013 -- Use the new 'as' syntax for exceptions.
...
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
2012-04-29 20:57:15 +02:00
Claude Paroz
5c53e30607
Fixed #18035 -- Removed deprecated AdminMediaHandler, as per official deprecation timeline. Thanks Jannis Leidel and Ramiro Morales for the review.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-04-08 21:13:32 +00:00
Claude Paroz
9383a2761c
Removed with_statement imports, useless in Python >= 2.6. Refs #17965 . Thanks jonash for the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-30 08:02:08 +00:00
Jannis Leidel
0ee801e360
Fixed #17857 -- Stopped CachedStaticFilesStorage from creating absolute URLs unnecessarily. Thanks, tgecho.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 03:48:11 +00:00
Jannis Leidel
7487c74020
Fixed #17865 -- Strip whitespaces from the paths when using the CachedStaticFilesStorage backend.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17696 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-13 03:48:03 +00:00
Jannis Leidel
3a5f9cd1ae
Fixed #17861 -- Took care of special characters when creating the staticfiles storage cache keys. Many thanks to Preston Holmes.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17688 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-12 20:28:09 +00:00
Jannis Leidel
e88a65660f
Fixed #17806 -- Fixed off-by-n error in the CachedStaticFilesStorage that prevented it from finding files in nested directories. Many thanks to lpetre.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-02 11:29:14 +00:00
Jannis Leidel
1c33c0a02a
Fixed #17737 -- Stopped the collectstatic management command from copying the wrong file in repeated runs. Thanks, pigletto.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-01 23:02:38 +00:00
Jannis Leidel
758a0cd0f1
Fixed #17689 -- Stopped the CachedStaticFilesStorage from trying to hash paths that aren't files.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 14:40:32 +00:00
Jannis Leidel
803de60c08
Stopped the collectstatic management from being wastful with file handlers. Refs r17519.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-14 09:55:09 +00:00
Jannis Leidel
4f1ac8f5f1
Minor bugfixing of the staticfiles app following upstream development in django-staticfiles.
...
- Create the files to ignore during the tests dynamically (.hidden and backup~)
- Refactored the post_processing method of the CachedFilesMixin storage mixin to be less time consuming.
- Refactored handling of fragments in the post_process method.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-13 10:51:17 +00:00
Jannis Leidel
f46c4140ce
Fixed #17656 -- Stopped the collectstatic management command from running the database validation. Thanks, jcspray.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-12 14:49:42 +00:00
Jannis Leidel
46c12d1293
Fixed #17455 -- Extended `CachedStaticFilesStorage` slightly to handle some URLs better that are used to add support for webfonts to IE 6-8. Also ignore `data:` URLs and fragment-only URLs (e.g. `#default#VML`).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17282 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-27 22:49:24 +00:00
Karen Tracey
b045783729
Fixed #17462 : Adjusted staticfiles CachedFilesMixin code so its tests pass on Windows.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-25 19:44:20 +00:00
Jannis Leidel
a82488bf4b
Fixed #16966 -- Stopped CachedStaticFilesStorage from choking on querystrings and path fragments.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17068 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-03 10:51:02 +00:00
Jannis Leidel
0e2c543979
Fixed #16967 -- Made sure CachedStaticFilesStorage repopulates its cache if there was a miss (for example if the cache server went down).
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-11-02 17:45:32 +00:00
Carl Meyer
145a77edc9
Fixed #16360 -- Added WSGI entrypoint to startproject layout, and enabled internal servers (runserver and runfcgi) to use an externally-defined WSGI application. Thanks to Armin Ronacher, Jannis Leidel, Alex Gaynor, ptone, and Jacob Kaplan-Moss.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-10-22 04:30:10 +00:00
Jannis Leidel
c4cc875643
Fixed #16703 -- Raise an exception if the storage location of the DefaultStorageFinder is empty.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16863 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-21 15:58:32 +00:00
Jannis Leidel
eb5df8e98d
Fixed the relative static file resolution of the CachedStaticFilesStorage backend and the post processing of deeply nested static files.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16862 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-09-21 15:58:21 +00:00
Jannis Leidel
cfba246037
Fixed #16631 -- Fixed embarrassing typo introduced in r16617. Thanks, Andi Albrecht.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-15 08:22:22 +00:00
Jannis Leidel
2980f2ab9a
Fixed #16629 -- Relaxed check for STATIC_ROOT and STATIC_URL settings slightly to only raise an exception if really needed.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-14 18:15:04 +00:00
Ramiro Morales
21705bd97a
Added with_statement Python 2.5 compatibility import missed in [16594]. Thanks Julien.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 00:29:34 +00:00
Jannis Leidel
1d32bdd3c9
Fixed #15252 -- Added static template tag and CachedStaticFilesStorage to staticfiles contrib app.
...
Many thanks to Florian Apolloner and Jacob Kaplan-Moss for reviewing and eagle eyeing.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16594 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-11 14:07:39 +00:00
Jannis Leidel
d99b86d6c1
Fixed #16518 -- Fixed collectstatic management command to run on Jython. Thanks, Josh Smeaton.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16553 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-26 08:47:46 +00:00
Alex Gaynor
319b0cfb83
Explicitly close a file in the collectstatic management command.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16525 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-08 09:39:56 +00:00
Jannis Leidel
21e0b3a243
Fixed #16424 -- Fixed regression in collect static management command introduced in r16509 that prevented prefixed collection.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-06 10:28:18 +00:00
Jannis Leidel
94a38dfd0e
Fixed #16161 -- Added `--clear` option to `collectstatic` management command to be able to explicitly clear the files stored in the destination storage before collecting.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16509 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-04 21:34:29 +00:00
Jannis Leidel
a3733967e8
Fixed #15765 -- Stopped showing an odd error message when using the staticfiles enabled runserver management command and trying to serve files from STATIC_URL at the same time.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16503 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-07-04 16:19:54 +00:00
Jannis Leidel
38a2444277
Fixed #16050 -- BACKWARDS-INCOMPATIBLE CHANGE: Moved static files of the admin to conventional file system location.
...
This also removes the need for ADMIN_MEDIA_PREFIX and replaces it with the convention to find admin's static files at STATIC_URL + 'admin/'.
Thanks to Jacob for the review and general help.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-06-30 09:06:19 +00:00
Jannis Leidel
16ad1d951a
Refined exception message to make sure we don't confuse users.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-18 18:46:48 +00:00
Jannis Leidel
f05aab1a43
Modified collectstatic management command to not include STATIC_ROOT in the user prompt since it's misleading when using a non-local storage backend.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-09 12:34:17 +00:00
Chris Beaven
c47b69ba53
Fix the docstring of contrib.staticfiles BaseFinder so it's not misleading.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-07 22:54:55 +00:00
Jannis Leidel
4bb2db0cae
Modified the staticfiles serve view to return a 404 early in the stack.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:45:41 +00:00
Jannis Leidel
64a0a33c33
Fixed the staticfiles management commands collectstatic and findstatic to not raise encoding related exceptions when handlings filenames with non-ASCII characters.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 23:45:32 +00:00
Jannis Leidel
a26034ffbf
Fixes #15270 -- Moved back the serve view to django.views.static due to dependency conflicts with the contrib app staticfiles (reverts parts of r14293). Added a helper function that generates URL patterns for serving static and media files during development. Thanks to Carl for reviewing the patch.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15530 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-14 01:42:26 +00:00
Carl Meyer
77030ccc1e
Fixed a few test docstrings and removed an unused import in staticfiles.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15390 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 20:39:40 +00:00
Jannis Leidel
3bff7ed34c
Preserve order of STATICFILES_DIRS locations in FileSystemFinder.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 20:10:29 +00:00
Jannis Leidel
5cd5612808
Fixed #15190 -- Refactored the collectstatic command to improve the symlink mode and generally straighten out its behavior.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15388 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 19:19:52 +00:00
Carl Meyer
7aad3d3fa8
Fixed #15094 - Added check for forgetting trailing comma in STATICFILES_DIRS tuple. Also reorganized staticfiles settings-checks for better consistency.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15386 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:57:10 +00:00
Carl Meyer
76fb2bb0e2
Fixed some documentation and default-settings.py comments that were misleading about the purpose of STATIC_ROOT, and removed an unused import.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-02-01 14:28:07 +00:00
Jannis Leidel
f3a9c719fe
Added check to the staticfiles app to make sure the STATIC_ROOT setting isn't accidentally added to the STATICFILES_DIRS setting. Thanks for the suggestion, SmileyChris and harijay.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 23:29:31 +00:00
Jannis Leidel
9e81e18929
Uses a SortedDict for memoization of staticfiles finder instances to preserve order during tests.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-30 17:23:36 +00:00
Karen Tracey
ca64a3cb2d
Call superclass init in collectstatic command, otherwise printing error messages for it fails since style has not been set.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15245 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-19 16:36:20 +00:00
Jannis Leidel
645eb2b26b
Stopped staticfiles app from requiring a models module when looking for static files. Also removed a bit of code smell in the prefix handling by saving it in the source file storage.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15219 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-15 23:38:00 +00:00
Jannis Leidel
19ab52f77f
Fixed #15035 -- Fixed collectstatic management command to work with non-local storage backends correctly. Also refactored a bit code smell.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-08 10:03:27 +00:00
Jannis Leidel
465833834c
Fixed a few docstrings and other helper texts in the staticfiles app.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15148 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-05 12:41:40 +00:00
Jannis Leidel
be56f74f93
Fixed #14998 -- Made use of os.path.join to make sure this works on all platforms. Thanks for the pointer, CarlFK.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15128 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:32:17 +00:00
Jannis Leidel
e45d1e2dac
Safely join paths in staticfiles finder.
...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15127 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-01-02 01:31:55 +00:00