Merge pull request #1214 from getnikola/copy-and-link-listing-sources

Listings should copy "raw" files and link to them
getnikola · Apr 21, 2014 · 8f305c5 · 8f305c5
2 parents 055d497 + 482892e
commit 8f305c5
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 0 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ New in master
 Features
 --------
 
+* Link listings raw sources if COPY_SOURCES is True (Issue #1214)
 * Much more powerful ``nikola plugin`` command (Issue #1189)
 * More powerful console mode allows access to all nikola commands (Issue #830)
 * New ```ROBOTS_EXCLUSIONS``` option listing resources to exclude from sitemap

diff --git a/nikola/data/themes/base-jinja/templates/listing.tmpl b/nikola/data/themes/base-jinja/templates/listing.tmpl
@@ -16,4 +16,8 @@
 {% if code %}
     {{ code }}
 {% endif %}
+{% if source_link %}
+    <p class="sourceline"><a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a></p>
+{% endif %}
 {% endblock %}
+
diff --git a/nikola/data/themes/base/templates/listing.tmpl b/nikola/data/themes/base/templates/listing.tmpl
@@ -16,4 +16,8 @@ ${ui.bar(crumbs)}
 % if code:
     ${code}
 % endif
+% if source_link:
+    <p class="sourceline"><a href="${source_link}" id="sourcelink">${messages("Source")}</a></p>
+% endif
 </%block>
+
diff --git a/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl b/nikola/data/themes/bootstrap-jinja/templates/listing.tmpl
@@ -18,3 +18,11 @@
     {{ code }}
 {% endif %}
 {% endblock %}
+
+{% block sourcelink %}
+{% if source_link %}
+    <li>
+    <a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a>
+    </li>
+{% endif %}
+{% endblock %}
diff --git a/nikola/data/themes/bootstrap/templates/listing.tmpl b/nikola/data/themes/bootstrap/templates/listing.tmpl
@@ -18,3 +18,11 @@ ${ui.bar(crumbs)}
     ${code}
 % endif
 </%block>
+
+<%block name="sourcelink">
+% if source_link:
+    <li>
+    <a href="${source_link}" id="sourcelink">${messages("Source")}</a>
+    </li>
+% endif
+</%block>
diff --git a/nikola/data/themes/bootstrap3-jinja/templates/listing.tmpl b/nikola/data/themes/bootstrap3-jinja/templates/listing.tmpl
@@ -18,3 +18,11 @@
     {{ code }}
 {% endif %}
 {% endblock %}
+
+{% block sourcelink %}
+{% if source_link %}
+    <li>
+    <a href="{{ source_link }}" id="sourcelink">{{ messages("Source") }}</a>
+    </li>
+{% endif %}
+{% endblock %}
diff --git a/nikola/data/themes/bootstrap3/templates/listing.tmpl b/nikola/data/themes/bootstrap3/templates/listing.tmpl
@@ -18,3 +18,11 @@ ${ui.bar(crumbs)}
     ${code}
 % endif
 </%block>
+
+<%block name="sourcelink">
+% if source_link:
+    <li>
+    <a href="${source_link}" id="sourcelink">${messages("Source")}</a>
+    </li>
+% endif
+</%block>
diff --git a/nikola/plugins/task/listings.py b/nikola/plugins/task/listings.py
@@ -84,6 +84,10 @@ def render_listing(in_name, out_name, folders=[], files=[]):
                     os.path.join(
                         kw['output_folder'],
                         kw['listings_folder'])))
+            if self.site.config['COPY_SOURCES']:
+                source_link = permalink[:-5]
+            else:
+                source_link = None
             context = {
                 'code': code,
                 'title': title,
@@ -93,6 +97,7 @@ def render_listing(in_name, out_name, folders=[], files=[]):
                 'folders': natsort.natsorted(folders),
                 'files': natsort.natsorted(files),
                 'description': title,
+                'source_link': source_link,
             }
             self.site.render_template('listing.tmpl', out_name,
                                       context)
@@ -148,6 +153,19 @@ def render_listing(in_name, out_name, folders=[], files=[]):
                     'uptodate': [utils.config_changed(uptodate)],
                     'clean': True,
                 }
+                if self.site.config['COPY_SOURCES']:
+                    out_name = os.path.join(
+                        kw['output_folder'],
+                        root,
+                        f)
+                    yield {
+                        'basename': self.name,
+                        'name': out_name,
+                        'file_dep': [in_name],
+                        'targets': [out_name],
+                        'actions': [(utils.copy_file, [in_name, out_name])],
+                        'clean': True,
+                    }
 
     def listing_path(self, name, lang):
         if not name.endswith('.html'):