datenspuren mitschnitte: import the other formats from media.ccc.de

This commit is contained in:
Astro 2015-10-26 00:36:56 +01:00
parent faf20cc7a5
commit a90d6994c1
4 changed files with 13 additions and 12 deletions

View File

@ -272,17 +272,16 @@ build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(DATESTAMP)
# Datenspuren
# As of 2015-10-25 all these feeds contain just .mp4 files:
DS_FEEDS=datenspuren-2015-mp4.xml #datenspuren-2015-webm.xml datenspuren-2015-opus.xml datenspuren-2015-mp3.xml
DS_FEEDS=datenspuren-2015-mp4.xml datenspuren-2015-webm.xml datenspuren-2015-opus.xml datenspuren-2015-mp3.xml
datenspuren-2015-mp4.xml:
$(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/mp4
#datenspuren-2015-webm.xml:
# $(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/webm
#datenspuren-2015-opus.xml:
# $(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/opus
#datenspuren-2015-mp3.xml:
# $(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/mp3
datenspuren-2015-webm.xml:
$(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/webm
datenspuren-2015-opus.xml:
$(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/opus
datenspuren-2015-mp3.xml:
$(WGET) -O $@ https://media.ccc.de/podcast/conferences%2Fdatenspuren%2F2015/mp3
build/datenspuren/$(DS_YEAR)/schedule-%.raw.xml: content/static/datenspuren/$(DS_YEAR)/fahrplan/schedule/%.html scripts/hyphenate.sed $(DATESTAMP)
scripts/hyphenate.sed < $< > $@

View File

@ -26,9 +26,9 @@
</p>
<include-feeds>
<feed>../../datenspuren-2015-mp4.xml</feed>
<!-- <feed>../../datenspuren-2015-webm.xml</feed> -->
<!-- <feed>../../datenspuren-2015-opus.xml</feed> -->
<!-- <feed>../../datenspuren-2015-mp3.xml</feed> -->
<feed>../../datenspuren-2015-webm.xml</feed>
<feed>../../datenspuren-2015-opus.xml</feed>
<feed>../../datenspuren-2015-mp3.xml</feed>
</include-feeds>
<p title="Datenspuren 2014" id="ds2014">

View File

@ -248,9 +248,10 @@ a[href$="mitschnitte-rss.xml"]:before {
.resource .links li {
display: inline-block;
font-size: 80%;
padding: 0 0.5em;
}
.resource .links li .size {
padding: 0 1em 0 0.4em;
padding: 0 0 0 0.4em;
color: #777;
}

View File

@ -720,6 +720,7 @@
<xsl:when test="@type='video/ogg'">Ogg</xsl:when>
<xsl:when test="@type='video/avi'">AVI</xsl:when>
<xsl:when test="@type='video/x-flv'">FLV</xsl:when>
<xsl:when test="@type = 'audio/opus'">Opus</xsl:when>
<xsl:when test="@type='application/x-bittorrent'">BitTorrent</xsl:when>
<xsl:otherwise><xsl:value-of select="@type"/></xsl:otherwise>
</xsl:choose>