Skip to content
Permalink
Browse files
filter CDN-able files into separate lists
  • Loading branch information
ralsina committed May 3, 2015
1 parent 28c7b0e commit cc78e50a629eac222de47f48283a5427365a4e36
Showing with 46 additions and 4 deletions.
  1. +2 −4 nikola/data/themes/bootstrap3/bundles
  2. +44 −0 nikola/plugins/task/bundles.py
@@ -1,4 +1,2 @@
assets/css/all-nocdn.css=bootstrap.css,rst.css,code.css,colorbox.css,theme.css,custom.css
assets/css/all.css=rst.css,code.css,colorbox.css,theme.css,custom.css
assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js,moment-with-locales.min.js,fancydates.js
assets/js/all.js=jquery.colorbox-min.js,moment-with-locales.min.js,fancydates.js
assets/css/all.css=twitter-bootstrap::bootstrap.css,rst.css,code.css,jquery.colorbox::colorbox.css,theme.css,custom.css
assets/js/all.js=jquery,twitter-bootstrap,jquery,jquery.colorbox,moment-js::moment-with-locales.min.js,fancydates.js
@@ -26,6 +26,7 @@

from __future__ import unicode_literals

import json
import os

try:
@@ -43,13 +44,33 @@ class BuildBundles(LateTask):
name = "create_bundles"

def set_site(self, site):
cdnjs_path = os.path.join(os.path.dirname(__file__), 'cdnjsdata.json')
with open(cdnjs_path) as fd:
self.cdnjs = json.load(fd)
self.logger = utils.get_logger('bundles', site.loghandlers)
if webassets is None and site.config['USE_BUNDLES']:
utils.req_missing(['webassets'], 'USE_BUNDLES', optional=True)
self.logger.warn('Setting USE_BUNDLES to False.')
site.config['USE_BUNDLES'] = False
self.cdn_js_urls = []
self.cdn_css_urls = []

super(BuildBundles, self).set_site(site)

def url_from_entry(self, entry):
"""Turn a bundles entry into a URL from cdnjs"""
if entry in self.cdnjs:
url = self.cdnjs[entry]
elif '::' in entry:
# It's like twitter-bootstrap::bootstrap.css
# The 1st part is in cdnjs but the name in the URL is different
key, fname = entry.split('::')
url = self.cdnjs[key]
url = '/'.join(url.split('/')[:-1]) + '/' + fname
else:
url = None
return url

def gen_tasks(self):
"""Bundle assets using WebAssets."""

@@ -61,6 +82,7 @@ def gen_tasks(self):
'themes': self.site.THEMES,
'files_folders': self.site.config['FILES_FOLDERS'],
'code_color_scheme': self.site.config['CODE_COLOR_SCHEME'],
'use_cdn': self.site.config['USE_CDN'],
}

def build_bundle(output, inputs):
@@ -89,6 +111,28 @@ def build_bundle(output, inputs):
if (webassets is not None and self.site.config['USE_BUNDLES'] is not
False):
for name, _files in kw['theme_bundles'].items():

# If using a CDN, remove those files that will be delivered by the CDN
t_files = []
if kw['use_cdn']:
# Using a CDN, move CDN-able files into cdn_*_url lists
for i in _files:
url = self.url_from_entry(i)
if url is None:
t_files.append(i)
else:
if url.endswith('js'):
cdn_js_urls.append(url)
else:
cdn_css_urls.append(url)
else: # No CDN, remove the package::file notation
for i in _files:
if '::' in i:
i = i.split('::')[-1]
t_files.append(i)

_files = t_files

output_path = os.path.join(kw['output_folder'], name)
dname = os.path.dirname(name)
files = []

0 comments on commit cc78e50

Please sign in to comment.