Use WebM over MKV

8 files changed, 14 insertions, 11 deletions

diff --git a/.ignore b/.ignore
index cfb0025..dfd9e7b 100644
--- a/.ignore
+++ b/.ignore
@@ -1,2 +1,2 @@
-/vendor/reveal.js/
-/locale/
\ No newline at end of file
+/vendor/
+/locale/
diff --git a/TODOs.org b/TODOs.org
index cb8f592..fe17ea2 100644
--- a/TODOs.org
+++ b/TODOs.org
@@ -63,11 +63,14 @@ CLOSED: [2020-12-24 jeu. 14:25]
 :END:
 - State "DONE"       from "TODO"       [2020-12-24 jeu. 14:25]
 - State "TODO"       from              [2020-12-24 jeu. 11:09]
-** DONE Use =.mkv= over =.webm= for embedding subtitles
+** CANCELLED Use =.mkv= over =.webm= for embedding subtitles
 CLOSED: [2020-12-24 jeu. 18:49]
 :PROPERTIES:
 :CUSTOM_ID: 6587304c-ee0d-4f40-b046-48de94d00629
 :END:
+- State "CANCELLED"  from "DONE"       [2020-12-28 lun. 11:01] \\
+  WebM is more web friendly than MKV. Right now there is no support for subtitles,
+  only translated screencasts.
 - State "DONE"       from "TODO"       [2020-12-24 jeu. 18:49]
 - State "TODO"       from              [2020-12-24 jeu. 13:15]
 ** TODO Make media path the same as the show notes path
diff --git a/_includes/feed.atom b/_includes/feed.atom
index f28ef45..0d1e0a4 100644
--- a/_includes/feed.atom
+++ b/_includes/feed.atom
@@ -55,7 +55,7 @@
         {% if is_audio %}
           <enclosure url="{{ '/' | absolute_url | xml_escape }}resources/podcasts/{{ entry.date | date: "%Y-%m-%d" }}-{{ entry.ref }}.ogg" type="audio/ogg" />
         {% elsif is_video %}
-          <enclosure url="{{ '/' | absolute_url | xml_escape }}resources/screencasts/{{ entry.date | date: "%Y-%m-%d" }}-{{ entry.ref }}.mkv.torrent" type="application/x-bittorrent" />
+          <enclosure url="{{ '/' | absolute_url | xml_escape }}resources/screencasts/{{ entry.date | date: "%Y-%m-%d" }}-{{ entry.ref }}.webm.torrent" type="application/x-bittorrent" />
         {% endif %}
         <category>EuAndreh</category>
         <pubDate>{{ entry.date | date_to_xmlschema }}</pubDate>
diff --git a/_layouts/post.html b/_layouts/post.html
index 1ba6d6e..cdd9b93 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -31,12 +31,12 @@ layout: default
     {% if page.video %}
       {% if site.flags.direct-video %}
         <video controls>
-          <source src="{% link /resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.mkv %}" type="video/x-matroska">
+          <source src="{% link /resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.webm %}" type="video/webm">
         </video>
       {% endif %}
 
       <div class="torrent-link">
-        {% capture torrent-file %}{{ site.url }}/resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.mkv.torrent{% endcapture %}
+        {% capture torrent-file %}{{ site.url }}/resources/screencasts/{{ page.date | date: "%Y-%m-%d" }}-{{ page.slug }}.webm.torrent{% endcapture %}
         <a href="{{ torrent-file }}">torrent</a>
         |
         <a href="/torrent.html?torrent={{ torrent-file | uri_escape }}">online webtorrent</a>
diff --git a/_plugins/generate-torrent.rb b/_plugins/generate-torrent.rb
index a2077bc..0c4cd72 100644
--- a/_plugins/generate-torrent.rb
+++ b/_plugins/generate-torrent.rb
@@ -6,7 +6,7 @@ module Jekyll
 
     MEDIA_EXTENSION = {
       'podcasts' => 'ogg',
-      'screencasts' => 'mkv'
+      'screencasts' => 'webm'
     }
 
     def generate(site)
diff --git a/_plugins/linter.rb b/_plugins/linter.rb
index c0059c9..94ebc67 100644
--- a/_plugins/linter.rb
+++ b/_plugins/linter.rb
@@ -107,9 +107,9 @@ module Jekyll
       end
 
       if name == 'screencasts' then
-        mkv = "resources/screencasts/#{date}-#{slug}.mkv"
-        unless File.exist? mkv then
-          raise "Missing MKV file '#{mkv}'"
+        webm = "resources/screencasts/#{date}-#{slug}.webm"
+        unless File.exist? webm then
+          raise "Missing WebM file '#{webm}'"
         end
       end
     end
diff --git a/resources/screencasts/2020-12-24-sample-screencast.mkv b/resources/screencasts/2020-12-24-sample-screencast.mkv
deleted file mode 120000
index 57b8a0c..0000000
--- a/resources/screencasts/2020-12-24-sample-screencast.mkv
+++ /dev/null
@@ -1 +0,0 @@
-../../.git/annex/objects/XJ/2W/SHA256E-s2501872--37c770199944f7136a10ee0862d619a8784a6b62aea81416736e920114f2fb14.mkv/SHA256E-s2501872--37c770199944f7136a10ee0862d619a8784a6b62aea81416736e920114f2fb14.mkv
\ No newline at end of file
diff --git a/resources/screencasts/2020-12-24-sample-screencast.webm b/resources/screencasts/2020-12-24-sample-screencast.webm
new file mode 120000
index 0000000..e40affa
--- /dev/null
+++ b/resources/screencasts/2020-12-24-sample-screencast.webm
@@ -0,0 +1 @@
+../../.git/annex/objects/xq/MV/SHA256E-s2351466--a274b864e045445324f0d81b71b610cd85f2f4e8e23fd6db7b08a108ec4a7cd8.webm/SHA256E-s2351466--a274b864e045445324f0d81b71b610cd85f2f4e8e23fd6db7b08a108ec4a7cd8.webm
\ No newline at end of file