Use collectstatic on media/, without collecting user files
#4502
Conversation
This doesn't change the STATICFILES_ROOT yet, in an attempt to avoid making any breaking changes. This is a port of #4489 that we'll merge before azure migration
| os.path.join(SITE_ROOT, 'media'), | ||
| ] | ||
| STATICFILES_FINDERS = [ | ||
| 'readthedocs.core.static.SelectiveFileSystemFinder', |
There was a problem hiding this comment.
I didn't know you could do that. Seems useful!
| STATICFILES_DIRS = [os.path.join(SITE_ROOT, 'readthedocs', 'static')] | ||
| STATICFILES_DIRS = [ | ||
| os.path.join(SITE_ROOT, 'readthedocs', 'static'), | ||
| os.path.join(SITE_ROOT, 'media'), |
There was a problem hiding this comment.
This still seems a bit weird to me to collect files from a path (/media) and put them in a subdirectory (/media/static) but I guess it's ok with the SelectiveFileSystemFinder.
There was a problem hiding this comment.
Yeah agreed. I only worry that there are some deep parts requiring the media path, as this pattern goes back to early django I believe. If we run into any weirdness here, I think we can probably justify taking on work to separate static.
readthedocs/core/static.py
Outdated
| """ | ||
|
|
||
| def list(self, ignore_patterns): | ||
| ignore_patterns.extend(['epub', 'pdf', 'htmlzip', 'json', 'man']) |
There was a problem hiding this comment.
We need static here (and hopefully there's no side effects). Otherwise when you run collectstatic multiple times, you end up with media/static/static/static/....
There was a problem hiding this comment.
I was on the fence whether to add this -- as we also (unfortunately) have a static/ in readthedocs/ that I was curious if we'd skip. I'll give a test here.
There was a problem hiding this comment.
And it looks like you can't do static/static...
There was a problem hiding this comment.
The other answer is we use --clear in dev at least.
There was a problem hiding this comment.
Yup, you're right, multiple runs makes a nest of static/ paths. I still see the files collected that I was worried about, so I think we're safe.
This doesn't change the STATICFILES_ROOT yet, in an attempt to avoid making any
breaking changes. This is a port of #4489 that we'll merge before azure
migration