dynamise analytics and fix SEO for site with no album output

_config.yml

@@ -1,6 +1,10 @@
+title : 徒 setto セット
+description: 'Set, Party, Gang! #Cybersoul.'
+
 url: "https://setto.basspistol.com" # the base hostname & protocol for your site
 permalink: /:categories/:title/
 
+## jekyll excludes
 exclude:
   - changelog.md
   - '*.*~'
@@ -10,9 +14,7 @@ exclude:
   - Gemfile.lock
   - README.md
   - LICENCE
-
+## SEO
-title : 徒 setto セット
-description: 'Set, Party, Gang! #Cybersoul.'
 geo: 
   timezone: "Europe/Switzerland"
   lat: '46.203918'
@@ -52,6 +54,10 @@ collections:
     permalink: /albums/:path/
   authors:
     output: false
+
+## Matomo
+matomo_site_id: 11
+matomo_container:
       
 # defaults
 
@@ -71,14 +77,6 @@ defaults:
       lang: en
       seo:
         type: "AudioObject"
-  - scope:
-      path: ""
-      type: "albums"
-    values:
-      layout: "album"
-      lang: en
-      seo:
-        type: "AudioObject"
   - scope:
       path: ""
       type: "pages"

_includes/analytics.js

@@ -11,7 +11,7 @@
   (function() {
     var u="https://terminalnetwork.matomo.cloud/";
     _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '11']);
+    _paq.push(['setSiteId', '{{ site.matomo_site_id }}']);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
     g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
   })();
@@ -26,7 +26,7 @@
   var _mtm = _mtm || [];
   _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
   var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-  g.type='text/javascript'; g.async=true; g.defer=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/container_kJUGWiO2.js'; s.parentNode.insertBefore(g,s);
+  g.type='text/javascript'; g.async=true; g.defer=true; g.src='https://cdn.matomo.cloud/terminalnetwork.matomo.cloud/container_{{ site.matomo_container }}.js'; s.parentNode.insertBefore(g,s);
 
 //* End Matomo Tag Manager *//
 {% endif %}

_includes/matomo.html

@@ -1,17 +0,0 @@
-<!-- Matomo -->
-<script type="text/javascript">
-  var _paq = window._paq || [];
-  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-  _paq.push(["disableCookies"]);
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="https://terminalnetwork.matomo.cloud/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '11']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<!-- End Matomo Code -->

_includes/matomo.js

@@ -7,7 +7,7 @@ _paq.push(['enableLinkTracking']);
 (function() {
   var u="https://terminalnetwork.matomo.cloud/";
   _paq.push(['setTrackerUrl', u+'matomo.php']);
-  _paq.push(['setSiteId', '11']);
+  _paq.push(['setSiteId', '{{ site.matomo_site_id }}']);
   var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
   g.type='text/javascript'; g.async=true; g.defer=true; g.src='//cdn.matomo.cloud/terminalnetwork.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
 })();

_includes/seo.html

@@ -77,15 +77,18 @@
 <meta name="twitter:image" content="{{ site.mediaurl }}/{{ page.slug }}.jpeg" />
 
 
-{% elsif page.collection == 'albums' %}
+{% elsif page.collection == 'posts' %}
+{% if page.category == 'releases' %}
 
+{% for album in site.albums %}
+{% if album.slug == page.album %}
 <!-- BEGIN seo.html -->
-{% capture namelist %}{% for art in page.artists %}{{ art }}{% unless forloop.last %}, {% endunless %}{% endfor %}{% endcapture %}
+{% capture namelist %}{% for art in album.artists %}{{ art }}{% unless forloop.last %}, {% endunless %}{% endfor %}{% endcapture %}
 {% capture artist %}{{ namelist }}{% endcapture %}
 
-<title>Play &quot;{{ page.name }}&quot; by {{ artist | uniq }} | {{ site.title }}</title>
+<title>Play &quot;{{ album.name }}&quot; by {{ artist | uniq }} | {{ site.title }}</title>
-<meta name="title" content="Play &quot;{{ page.name | strip_html }}&quot; by {{ artist | uniq }}" />
+<meta name="title" content="Play &quot;{{ album.name | strip_html }}&quot; by {{ artist | uniq }}" />
-<meta name="description" content="A release by {{ artist | uniq }} named &quot;{{ page.name | strip_html }}&quot; published on {{ site.title }}" />
+<meta name="description" content="A release by {{ artist | uniq }} named &quot;{{ album.name | strip_html }}&quot; published on {{ site.title }}" />
 <meta name="dc.date.modified" scheme="ISO8601" content="{{ page.last_modified_at | date_to_xmlschema }}" />
 <meta name="robots" content="index" />
 
@@ -107,34 +110,31 @@
 <meta name="dcterms.Type" content="text/html" />
 <meta name="dcterms.Coverage" content="{{ site.url }}/" />
 <meta name="dcterms.Rights" content="Copyright &copy;{{ site.time | date: '%Y' }} {{ site.title }}." />
-<meta name="dcterms.Subject" content="A release by {{ artist | uniq }} named &quot;{{ page.name | strip_html }}&quot; published on {{ site.title }}" />
+<meta name="dcterms.Subject" content="A release by {{ artist | uniq }} named &quot;{{ album.name | strip_html }}&quot; published on {{ site.title }}" />
-<meta name="dcterms.Title" content="Play &quot;{{ page.name | strip_html }}&quot; by {{ artist | uniq }}" />
+<meta name="dcterms.Title" content="Play &quot;{{ album.name | strip_html }}&quot; by {{ artist | uniq }}" />
 <meta name="dcterms.Contributor" content="{{ site.title }}" />
 <meta name="dcterms.Date" content="{{ page.last_modified_at | date: '%Y-%m-%d' }}" />
-<meta name="dcterms.Description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ page.name | strip_html }}&quot; and support your remote artist!" />
+<meta name="dcterms.Description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ album.name | strip_html }}&quot; and support your remote artist!" />
 
 <!-- Facebook -->
 
-<meta property="og:title" content="{{ page.name }} by {{ artist | uniq }}" />
+<meta property="og:title" content="{{ album.name }} by {{ artist | uniq }}" />
 <meta property="og:locale" content="en" />
-<meta property="og:description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ page.name | strip_html }}&quot; and support your remote artist!" />
+<meta property="og:description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ album.name | strip_html }}&quot; and support your remote artist!" />
-<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
+<meta property="og:url" content="{{ site.url }}{{ album.url }}" />
 <meta property="og:site_name" content="{{ site.title }}" />
 <meta property="og:type" content="music:album" />
-{% for track in page.tracks %}<meta property="og:audio" content="{{ site.mediaurl }}/{{ track.albumSlug }}/{{ track.trackSlug }}.mp3" />
+{% for track in album.tracks %}<meta property="og:audio" content="{{ site.mediaurl }}/{{ track.albumSlug }}/{{ track.trackSlug }}.mp3" />{% endfor %}
-{% endfor %}
 <meta property="article:published_time" content="{{ page.last_modified_at | date_to_xmlschema }}" />
-<meta property="og:image" content="{{ site.mediaurl }}/{{ page.tracks[0].slug }}.jpeg" />
+<meta property="og:image" content="{{ site.mediaurl }}/{{ album.tracks[0].slug }}.jpeg" />
+
 <!-- Twitter Card -->
 
 <meta name="twitter:card" content="summary" />
-<meta name="twitter:title" content="{{ page.name }} | {{ site.title }}" />
+<meta name="twitter:title" content="{{ album.name }} | {{ site.title }}" />
-<meta name="twitter:description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ page.name | strip_html }}&quot; and support your remote artist!" />
+<meta name="twitter:description" content="Listen and to a release by {{ artist | uniq }} named &quot;{{ album.name | strip_html }}&quot; and support your remote artist!" />
-<meta name="twitter:image" content="{{ site.mediaurl }}/{{ page.tracks[0].slug }}.jpeg" />
+<meta name="twitter:image" content="{{ site.mediaurl }}/{{ album.tracks[0].slug }}.jpeg" />
-
+{% endif %}{% endfor %}{% else %}
-
-
-{% else %}
 <!-- BEGIN seo.html -->
 
 <title>{{ page.title }} | {{ site.title }}</title>
@@ -209,7 +209,7 @@
     }
   }
 </script>
-
+{% endif %}
 {% endif %}
 
 <link rel="alternate" type="application/rss+xml" href="{{ site.url}}/feed.xml" title="{{ site.title }}" />