Merge pull request #1 from c3woc/feed

Feed

.travis.yml

@@ -7,10 +7,9 @@ cache:
     - $HOME/.cache/pip
 before_install:
   - git lfs pull
-  - make install-sassc
 install:
   - "pip install Lektor"
-  - make sass
+  - make build
 script: "lektor build"
 before_deploy: "echo 'c3woc.de ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC5NslYj+wtriBuKIxJfDRm9E2hnlstWR8durQ6pKvVvP7wjcoXIyAxe41GvJ9SoEhSjF7oVlzlw+zAkzl5WOZ4=' > ~/.ssh/known_hosts"
 deploy:

Makefile

@@ -3,28 +3,32 @@ LEKTOR_SERVER_FLAGS=-h 127.0.0.1
 all: build
 
 sass:
-	./sassc/bin/sassc -t compressed ./assets/sass/main.scss ./assets/css/main.min.css
-	./sassc/bin/sassc -t compressed ./assets/sass/ie9.scss ./assets/css/ie9.min.css
 	lektor clean --yes
-	lektor build
+	lektor server -f jsminify 
-
-sass-uncompressed:
-	./sassc/bin/sassc ./assets/sass/main.scss ./assets/css/main.css
-	./sassc/bin/sassc ./assets/sass/ie9.scss ./assets/css/ie9.css
-	lektor clean --yes
-	lektor build
 
+.ONESHELL:
 install:
-	if hash apt 2>/dev/null; then sudo apt update; sudo apt install imagemagick python3 python3-pip -y; elif hash pacman 2>/dev/null; then sudo pacman -Sy graphicsmagick glibc lib32-glibc python python-pip --noconfirm; elif hash dnf 2>/dev/null; then sudo dnf install -y ImageMagick  python3 python3-pip; else echo -e "Please install Imagemagick, Python3 and Pip!"; fi
+	if hash apt-get 2>/dev/null; then
+	  sudo apt-get update -qq >/dev/null && sudo apt-get install -qq apt-utils imagemagick python3-pip python3-setuptools gcc
+	elif hash pacman 2>/dev/null; then
+	  sudo pacman -Syu imagemagick python-pip glibc lib32-glibc gcc --noconfirm
+	elif hash dnf 2>/dev/null; then
+	  sudo dnf install -y ImageMagick python3-pip gcc
+	else 
+	  echo -e "Please install Imagemagick, python3-pip and gcc"
+	fi
 	pip install lektor --user
-	make install-sassc
+	# pip3 install wheel --user
+	lektor plugin flush-cache
 
 install-sassc:
-	if [ ! -d './sassc' ]; then git clone https://github.com/sass/sassc.git sassc; . sassc/script/bootstrap ; make -C sassc -j4 ; fi
+	lektor plugin flush-cache
+	lektor clean --yes
+	lektor build -f jsminify
 
-build: sass
+build:
-	lektor build
+	lektor clean --yes
+	lektor build -f jsminify 
 
 server:
 	lektor server $(LEKTOR_SERVER_FLAGS)
-

c3woc-podcast.lektorproject

@@ -2,6 +2,7 @@
 name = c3woc-webseite
 url = https://podcast.c3woc.de/
 url_style = absolute
+excluded_assets = sass, sass/*, *.scss
 
 [servers.c3woc]
 name = c3woc
@@ -22,3 +23,5 @@ name = Englisch
 locale = en_US
 url_prefix = /en/
 
+[packages]
+lektor-scsscompile = 1.0.1

configs/scsscompile.ini

@@ -0,0 +1,3 @@
+source_dir = assets/sass/
+output_dir = assets/css/
+output_style = compressed

content/contents.lr

@@ -99,3 +99,5 @@ icons_header_2: Waffel nicht nur schmecken
 icons_text_2: Durch den Waffelpodcast ist es nun endlich auch möglich, die Waffel nicht nur zu sehen, zu fühlen und zu schmecken, sondern auch akustisch vorgestellt zu bekommen.
 ---
 icons_2_url: https://www.ccc.de/de/regional
+---
+mp3feed: yes

databags/nav-bar.ini

@@ -14,4 +14,4 @@ Alle-Beitraege      = '/eisen/'
 RSS-Feed            = '/podcast-he.xml'
 
 [list]
-Blog                = '/eisen/'
+Das heisse Eisen         = '/eisen/'

models/start.ini

@@ -27,6 +27,11 @@ type = string
 label = Start-Hinweis-URL
 type = string
 
+[fields.mp3feed]
+label = Link zum MP3 Feed?
+type = boolean
+
+
 ;------------------------------
 
 [fields.about_header]

templates/feed_podcast-he.xml

@@ -1,35 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
-{%- set baseurl = "https://podcast.c3woc.de/" %}{%
+{%- set baseurl = "https://podcast.c3woc.de" %}
-set search = "eisen" %}
+{%- set search = "eisen" %}
-<feed xmlns="http://www.w3.org/2005/Atom">
+<rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" version="2.0">
-    <title type="text">{%
+  <channel>
-        if bag('translate', this.alt, 'hefeed') %}{{ bag('translate', this.alt, 'hefeed') }}{%
+    <title type="text">
-        else %}Das heisse Eisen{% endif %}</title>
+      {%- if bag('translate', this.alt, 'hefeed') -%}
-  <id>{{ baseurl }}podcast-he.xml</id>
+        {{ bag('translate', this.alt, 'hefeed') }}
+      {%- else -%}
+        Das heisse Eisen
+      {%- endif -%}</title>
+    <link>{{ baseurl }}/</link>
+    <id>{{ baseurl }}/podcast-he.xml</id>
+    <description>
+      {%- if bag('translate', this.alt, 'hefeed_description') -%}
+        {{ bag('translate', this.alt, 'hefeed_description') }}
+      {%- else -%}
+        Der Waffelpodcast: 'Das heisse Eisen'. Mit Venty und L3D.
+      {%- endif -%}
+    </description>
+    <generator>Von Hand als Jinja2 Template von L3D geschrieben</generator>
+    <language>de</language>
+    <copyright>L3D</copyright>
     <updated>{{ none|datetimeformat('YYYY-MM-ddThh:mm:ss') }}Z</updated>
-  <link href="{{ baseurl }}{{ search }}/" />
+      {%- set pages = site.query('/eisen').include_undiscoverable(true).all() -%}
-  <link href="{{ baseurl }}podcast-he.xml" rel="self" />
+      {%- for page in pages -%}
-  <author>
+        {%- if not page._hidden %}
-    <name>{% if this.author %}{{ this.author }}{% else %}Venty und L3D{% endif %}</name>
+{#  #}    <pubDate>2019-</pubDate>
-  </author>{%
+{#  #}    <lastBuildDate>{{ none|datetimeformat('YYYY-MM-ddThh:mm:ss') }}Z</lastBuildDate>
-  set pages = site.query('/eisen').include_undiscoverable(true).all() %}{%
+{#  #}    <itunes:author>L3D</itunes:author>
-  for page in pages %}{% if not page._hidden %}
+{#  #}    <itunes:subtitle>Ventys Podcast</itunes:subtitle>
-  <entry xml:base="{{ baseurl }}{{ search }}/{{ page._id }}/">
+{#  #}    <itunes:summary>
-    <title type="text">{{ page.title }}</title>
+            {%- if bag('translate', this.alt, 'hefeed_description') -%}
-    <id>{{ baseurl }}{{ search }}/{{ page._id }}</id>
+              {{ bag('translate', this.alt, 'hefeed_description') }}
-    <updated>{{ page.pub_date|datetimeformat('YYYY-MM-ddThh:mm:ss') }}Z</updated>
+            {%- else -%}
-    <link href="{{ search }}/{{ page._id }}/" xml:base="{{ baseurl }}" />
+              Der Waffelpodcast: 'Das heisse Eisen'. Mit Venty und L3D.
-    <author>
+            {%- endif -%}
-      <name>{% if page.author %}{{ page.author }}{% else %}L3D{% endif %}</name>
+          </itunes:summary>
+{#  #}    <itunes:keywords>
+            {%- if bag('translate', this.alt, 'hefeed_keywords') -%}
+              {{ bag('translate', this.alt, 'hefeed_keywords') }}
+            {%- else -%}
+              Waffel, C3WOC, CCC, Chaos, Waffle, Waffles, Waffeln, VOC, WOC, Operation, Center
+            {%- endif -%}
+          </itunes:keywords>
+{#  #}    <itunes:explicit>no</itunes:explicit>
+{#  #}    <itunes:owner>
+{#  #}      <itunes:name>L3D</itunes:name>
+{#  #}      <itunes:email>l3d@c3woc.de</itunes:email>
+{#  #}    </itunes:owner>
+{#  #}    <itunes:new-feed-url>{{ baseurl }}/podcast-he.xml</itunes:new-feed-url>
+{#  #}    <itunes:block>no</itunes:block>
+{#  #}    <itunes:category text="Waffel">
+{#  #}    <itunes:category text="Chaos"/>
+{#  #}    <itunes:category text="CCC"/>
+{#  #}    </itunes:category>
+{#  #}    <item>
+{#  #}      <title>{{ page.title }}</title>
+{#  #}      <link>{{ baseurl }}/{{ search }}/{{ page._id }}/</link>
+{#  #}      <author>
+              {%- if page.author -%}
+                {{ page.author }}
+              {%- else -%}
+                L3D und Venty
+              {%- endif -%}
             </author>
-    <content type="{% if page.xml_img %}html{% else %}text{% endif %}">
+{#  #}      <pubDate>{{ page.pub_date|datetimeformat('YYYY-MM-ddThh:mm:ss') }}Z</pubDate>
+{#  #}      <enclosure url="{{ baseurl }}/{{ search }}/{{ page._id }}/{{ page.podcastmp3 }}" length="2307405" type="audio/mpeg"/>
+{#  #}      <guid isPermaLink="false">{{ page._id }}</guid> 
+{#  #}      <itunes:explicit>no</itunes:explicit>
+{#  #}      <content type="{% if page.xml_img %}html{% else %}text{% endif %}">
               {{ page.xml }} 
             {%- if page.xml_img -%}
               &lt;img width=&quot;23%&quot; src=&quot;{{ page.xml_img }}&quot; /&gt;
             {% endif %}
               &lt;br/&gt;&lt;a href="{{ baseurl }}{{ page|url }}{{ page.podcastmp3 }}" class="button special primary" download&gt;{{ page.shorttitle }} - MP3 Downloaded&lt;/a&gt;
             </content>
-	<enclosure url="{{ baseurl }}{{ page|url }}{{ page.podcastmp3 }}" type="audio/mpeg" />
+{#  #}    </item>
-</entry>{% endif %}{%
+        {%- endif -%}
-endfor %}
+      {%- endfor %}
-</feed>
+  </channel>
+</rss>

templates/start.html

@@ -9,6 +9,9 @@
       <h2>{{ this.title }}</h2>
       <p>{{ this.slogan }}</p>
       <p>{{ this.hinweis }} {% if this.hinweis_txt %}<a href="{% if this.hinweis_url %}{{this.hinweis_url }}{% else %}#four{% endif %}">{{ this.hinweis_txt }}</a>{% endif %}</p>
+      {%- if this.mp3feed %}
+      <br/><a href="/podcast-he.xml" class="button special">Podcast RSS Feed</a>
+      {%- endif %}
     </header>
     <span class="image"> 
       <img src="{{ '/images/logo.svg'|url }}" alt="" />