Move (again) to WebM for being more web friendly

6 files changed, 10 insertions, 13 deletions

diff --git a/_includes/feed.atom b/_includes/feed.atom
index 628cd2c..83187d7 100644
--- a/_includes/feed.atom
+++ b/_includes/feed.atom
@@ -55,7 +55,7 @@
         {% if is_audio %}
           <enclosure url="{{ entry.url | replace: ".html", ".ogg"         | absolute_url | xml_escape }}" type="audio/ogg" />
         {% elsif is_video %}
-          <enclosure url="{{ entry.url | replace: ".html", ".mkv.torrent" | absolute_url | xml_escape }}" type="application/x-bittorrent" />
+          <enclosure url="{{ entry.url | replace: ".html", ".webm.torrent" | absolute_url | xml_escape }}" 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 bff2f55..afa66df 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -29,15 +29,15 @@ layout: default
     {% endif %}
 
     {% if page.video %}
-      {% assign mkv=page.url | replace_first: "/", "" | replace: ".html", ".mkv" %}
+      {% assign webm=page.url | replace_first: "/", "" | replace: ".html", ".webm" %}
       {% if site.flags.direct-video %}
         <video width="320" height="240" controls>
-          <source src="{% link {{ mkv }} %}" type="video/x-matroska">
+          <source src="{% link {{ webm }} %}" type="video/webm">
         </video>
       {% endif %}
 
       <div class="torrent-link">
-        {% capture torrent-file %}{{ mkv | absolute_url | append: ".torrent" }}{% endcapture %}
+        {% capture torrent-file %}{{ webm | absolute_url | append: ".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-media-permalink.rb b/_plugins/generate-media-permalink.rb
index db49286..ae635bd 100644
--- a/_plugins/generate-media-permalink.rb
+++ b/_plugins/generate-media-permalink.rb
@@ -4,7 +4,7 @@ module Jekyll
 
     MEDIA_EXTENSION = {
       'podcasts' => 'ogg',
-      'screencasts' => 'mkv'
+      'screencasts' => 'webm'
     }
 
     def generate(site)
diff --git a/_plugins/generate-torrent.rb b/_plugins/generate-torrent.rb
index 1de9870..fd38d85 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 f986191..aa568bb 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
@@ -143,7 +143,7 @@ module Jekyll
 
     MEDIA_EXTENSION = {
       'podcasts' => 'flac',
-      'screencasts' => 'mkv'
+      'screencasts' => 'webm'
     }
 
     def assert_media_metadata(site)
@@ -187,8 +187,6 @@ module Jekyll
                 check_metadata_cmd = "mediainfo '#{file}' | grep 'Movie name'"
                 raise "Missing metadata entry 'title' in '#{file}'.\nAdd it with:\n\n#{add_metadata_cmd}\n\nCheck with:\n  #{check_metadata_cmd}"
               end
-              # mkvpropedit dbg.mkv -e info -s album="The album"
-              # p document
             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 04a5c2f..0000000
--- a/resources/screencasts/2020-12-24-sample-screencast.mkv
+++ /dev/null
@@ -1 +0,0 @@
-../../.git/annex/objects/XJ/fk/SHA256E-s2501872--b5a44f69c541820c1173b1318435d99a64fb804961476fd5e6af7a719549bd32.mkv/SHA256E-s2501872--b5a44f69c541820c1173b1318435d99a64fb804961476fd5e6af7a719549bd32.mkv
\ No newline at end of file