Fix #607: Improve build times drastically

jvican · jvican · commit 5af8db00865d · 2017-02-13T11:10:55.000+01:00
Per @dragos's suggestion, this commit implements a new approach to generate table of contents that uses internally populated Jekyll data structures to speed up listing and matching posts that are from the same category. As categories are only populated by posts and our current tutorials are pages, this commits turns pages into posts and makes sure that their permalinks correspond to the current ones. Build times are now around two minutes, see the following profile information from Jekyll: ``` jvican in /data/rw/code/scala/scala.github.com [11:02:40] > $ bundle exec jekyll serve --profile [±drone-integration ●●●] Configuration file: /data/rw/code/scala/scala.github.com/_config.yml Configuration file: /data/rw/code/scala/scala.github.com/_config.yml Source: /data/rw/code/scala/scala.github.com Destination: /data/rw/code/scala/scala.github.com/_site Incremental build: disabled. Enable with --incremental Generating... Filename | Count | Bytes | Time -------------------------------------------------------------------+-------+-----------+------- _layouts/overview-large.html | 164 | 26568.57K | 92.778 _includes/toc-large.txt | 164 | 23156.00K | 88.934 _layouts/tutorial.html | 199 | 3005.98K | 1.350 _layouts/overview.html | 37 | 1190.86K | 0.953 _includes/tutorial-toc.txt | 199 | 267.11K | 0.455 es/overviews/index.md | 1 | 46.66K | 0.443 _includes/localized-overview-index.txt | 1 | 46.49K | 0.443 _includes/tutorial-tour-list.txt | 200 | 244.89K | 0.432 _includes/header.txt | 439 | 2114.25K | 0.347 _layouts/cheatsheet.html | 6 | 225.08K | 0.217 _includes/cheatsheet-sidebar.txt | 6 | 42.70K | 0.207 style/index.md | 1 | 68.00K | 0.184 _includes/footer.txt | 449 | 855.91K | 0.175 tutorials/index.md | 1 | 54.34K | 0.168 _includes/footerbar.txt | 458 | 767.51K | 0.116 _includes/topbar.txt | 419 | 822.04K | 0.110 _includes/pager.txt | 363 | 27.10K | 0.079 _layouts/sip.html | 29 | 626.83K | 0.079 _layouts/guides-index.html | 4 | 55.73K | 0.069 _includes/disqus.txt | 386 | 324.89K | 0.044 _layouts/sip-landing.html | 10 | 171.17K | 0.038 _includes/toc.txt | 66 | 17.62K | 0.034 _layouts/default.html | 261 | 29198.78K | 0.030 _includes/allsids.txt | 10 | 17.88K | 0.019 _layouts/index.html | 7 | 261.62K | 0.011 _includes/sips-topbar.txt | 39 | 31.73K | 0.008 sips/pending/_posts/2016-01-11-static-members.md | 1 | 10.23K | 0.004 _includes/index-header.txt | 7 | 53.96K | 0.004 _includes/cheatsheet-header.txt | 6 | 57.92K | 0.003 _layouts/contribute.html | 1 | 21.40K | 0.003 _includes/frontpage-footer.txt | 9 | 15.29K | 0.003 sips/sip-list.md | 1 | 3.19K | 0.003 sips/completed/_posts/2016-06-25-trailing-commas.md | 1 | 10.62K | 0.002 _layouts/news-coursera.html | 1 | 26.31K | 0.002 _layouts/frontpage.html | 1 | 13.17K | 0.002 _layouts/page.html | 1 | 14.69K | 0.002 _layouts/glossary.html | 1 | 65.08K | 0.002 _layouts/search.html | 1 | 12.77K | 0.002 _includes/contributing-header.txt | 2 | 12.13K | 0.001 sips/minutes-list.md | 1 | 0.76K | 0.001 ja/overviews/collections/concrete-mutable-collection-classes.md | 1 | 13.02K | 0.001 overviews/collections/concrete-mutable-collection-classes.md | 1 | 11.09K | 0.001 ja/overviews/collections/overview.md | 1 | 8.73K | 0.001 _includes/header-coursera.txt | 1 | 5.21K | 0.001 _includes/frontpage-header.txt | 1 | 4.94K | 0.001 es/overviews/parallel-collections/concrete-parallel-collections.md | 1 | 13.97K | 0.001 overviews/parallel-collections/concrete-parallel-collections.md | 1 | 12.57K | 0.001 sips/sip-template.md | 1 | 4.30K | 0.001 overviews/collections/concrete-immutable-collection-classes.md | 1 | 14.17K | 0.001 _includes/glossary-header.txt | 1 | 10.10K | 0.001 done in 123.422 seconds. ```
diff --git a/_includes/tutorial-tour-list.txt b/_includes/tutorial-tour-list.txt
@@ -1,20 +1,15 @@
-{% for pg in site.pages %}
-  {% if pg.tutorial == "scala-tour" and pg.outof and pg.language == page.language %}
-    {% assign totalPagesTour = pg.outof %}
-  {% endif %}
-{% endfor %}
+{% assign sorted_tour_posts = site.categories.tour | sort: 'num' %}
+{% assign tour_posts_size = sorted_tour_posts | size %}
 
-{% if totalPagesTour %}
+{% if tour_posts_size %}
   <ul>
-  {% for i in (1..totalPagesTour) %}
-    {% for pg in site.pages %}
-      {% if pg.tutorial == "scala-tour" and pg.num and pg.num == i and pg.language == page.language %}
+    {% for pg in sorted_tour_posts %}
+      {% if pg.language == page.language %}
         <li class="tour-of-scala {% if page.title == pg.title %} current-page {% endif %}">
           <a href="{{ pg.url }}">{{ pg.title }}</a>
         </li>
       {% endif %}
     {% endfor %}
-  {% endfor %}
   </ul>
 {% else %} **ERROR**. Couldn't find the total number of pages in this set of tutorial articles. Have you declared the `outof` tag in your YAML front matter?
 {% endif %}
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
@@ -1,5 +1,6 @@
 ---
-layout: default
+layout: post
+permalink: /tutorials/:categories/:title/
 ---
 {% include header.txt %}
 <div class="wrapper">
@@ -10,8 +11,8 @@
 
       <div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>
 
-      {% for pg in site.pages %}
-        {% if pg.tutorial == "scala-tour" and pg.languages %}
+      {% for pg in site.categories.tour %}
+        {% if pg.languages %}
           {% assign languages = pg.languages %}
         {% endif %}
       {% endfor %}
diff --git a/tutorials/tour/_posts/2017-02-13-2017-02-13-abstract-types.md b/tutorials/tour/_posts/2017-02-13-2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Abstract Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 next-page: compound-types
 previous-page: inner-classes
diff --git a/tutorials/tour/_posts/2017-02-13-annotations.md b/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Annotations
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 next-page: default-parameter-values
 previous-page: automatic-closures
diff --git a/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md b/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Anonymous Function Syntax
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 next-page: higher-order-functions
 previous-page: mixin-class-composition
diff --git a/tutorials/tour/_posts/2017-02-13-automatic-closures.md b/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Automatic Type-Dependent Closure Construction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 next-page: annotations
 previous-page: operators
diff --git a/tutorials/tour/_posts/2017-02-13-basics.md b/tutorials/tour/_posts/2017-02-13-basics.md
@@ -5,6 +5,7 @@ title: Basics
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 next-page: unified-types
 previous-page: tour-of-scala
diff --git a/tutorials/tour/_posts/2017-02-13-case-classes.md b/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Case Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 next-page: pattern-matching
 previous-page: currying
diff --git a/tutorials/tour/_posts/2017-02-13-classes.md b/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 next-page: traits
 previous-page: unified-types
diff --git a/tutorials/tour/_posts/2017-02-13-compound-types.md b/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Compound Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 next-page: explicitly-typed-self-references
 previous-page: abstract-types
diff --git a/tutorials/tour/_posts/2017-02-13-currying.md b/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Currying
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 next-page: case-classes
 previous-page: nested-functions
diff --git a/tutorials/tour/_posts/2017-02-13-default-parameter-values.md b/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Default Parameter Values
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 next-page: named-parameters
 previous-page: annotations
diff --git a/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md b/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Explicitly Typed Self References
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 next-page: implicit-parameters
 previous-page: compound-types
diff --git a/tutorials/tour/_posts/2017-02-13-extractor-objects.md b/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Extractor Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 next-page: sequence-comprehensions
 previous-page: regular-expression-patterns
diff --git a/tutorials/tour/_posts/2017-02-13-generic-classes.md b/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Generic Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 next-page: variances
 previous-page: sequence-comprehensions
diff --git a/tutorials/tour/_posts/2017-02-13-higher-order-functions.md b/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Higher-order Functions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 next-page: nested-functions
 previous-page: anonymous-function-syntax
diff --git a/tutorials/tour/_posts/2017-02-13-implicit-conversions.md b/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Implicit Conversions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 next-page: polymorphic-methods
 previous-page: implicit-parameters
diff --git a/tutorials/tour/_posts/2017-02-13-implicit-parameters.md b/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Implicit Parameters
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 next-page: implicit-conversions
 previous-page: explicitly-typed-self-references
diff --git a/tutorials/tour/_posts/2017-02-13-inner-classes.md b/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Inner Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 next-page: abstract-types
 previous-page: lower-type-bounds
diff --git a/tutorials/tour/_posts/2017-02-13-local-type-inference.md b/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Local Type Inference
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 next-page: operators
 previous-page: polymorphic-methods
diff --git a/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md b/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Lower Type Bounds
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 next-page: inner-classes
 previous-page: upper-type-bounds
diff --git a/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md b/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Mixin Class Composition
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 next-page: anonymous-function-syntax
 previous-page: traits
diff --git a/tutorials/tour/_posts/2017-02-13-named-parameters.md b/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Named Parameters
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 34
 previous-page: default-parameter-values
 ---
diff --git a/tutorials/tour/_posts/2017-02-13-nested-functions.md b/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Nested Functions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 next-page: currying
 previous-page: higher-order-functions
diff --git a/tutorials/tour/_posts/2017-02-13-operators.md b/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operators
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 next-page: automatic-closures
 previous-page: local-type-inference
diff --git a/tutorials/tour/_posts/2017-02-13-pattern-matching.md b/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Pattern Matching
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 
 next-page: singleton-objects
diff --git a/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md b/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Polymorphic Methods
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 
 next-page: local-type-inference
diff --git a/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md b/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Regular Expression Patterns
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 
 next-page: extractor-objects
diff --git a/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md b/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Sequence Comprehensions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 next-page: generic-classes
 previous-page: extractor-objects
diff --git a/tutorials/tour/_posts/2017-02-13-singleton-objects.md b/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Singleton Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 
 next-page: xml-processing
diff --git a/tutorials/tour/_posts/2017-02-13-tour-of-scala.md b/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Introduction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 languages: [ba, es, ko, pt-br, pl]
 outof: 34
diff --git a/tutorials/tour/_posts/2017-02-13-traits.md b/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Traits
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 next-page: mixin-class-composition
 previous-page: classes
diff --git a/tutorials/tour/_posts/2017-02-13-unified-types.md b/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Unified Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 next-page: classes
 previous-page: basics
diff --git a/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md b/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Upper Type Bounds
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 next-page: lower-type-bounds
 previous-page: variances
diff --git a/tutorials/tour/_posts/2017-02-13-variances.md b/tutorials/tour/_posts/2017-02-13-variances.md
diff --git a/tutorials/tour/_posts/2017-02-13-xml-processing.md b/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: XML Processing
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 next-page: regular-expression-patterns
 previous-page: singleton-objects
