Simplify ical for now

Author: JesperDramsch

_layouts/calendar-deadlines.ics

@@ -3,52 +3,53 @@ METHOD:PUBLISH
 VERSION:2.0
 PRODID:-//{{ site.url }}//{{ site.github_repo }}//EN
 X-PUBLISHED-TTL:PT1H{% for conf in site.data.conferences %}
-{%- if conf.cfp_ext -%}{%- assign cfp = conf.cfp_ext -%}{%- assign extended = "(extended)" -%}{%- else -%}{%- assign cfp = conf.cfp -%}{%- endif -%}
+{%- if conf.cfp_ext -%}
+    {%- assign cfp = conf.cfp_ext -%}
+    {%- assign extended = "(extended)" -%}
+{%- else -%}
+    {%- assign cfp = conf.cfp -%}
+{%- endif -%}
+{%- if conf.timezone contains "UTC" -%}
+    {%- assign tz = conf.timezone | split: "UTC" -%}
+    {%- if tz[1] contains "-" -%}
+        {%- assign tz = tz[1] | replace: "-", "+" -%}
+    {%- elsif tz[1] contains "+" -%}
+        {%- assign tz = tz[1] | replace: "+", "-" -%}
+    {%- else -%}
+        {%- assign tz = tz[1] -%}
+    {%- endif -%}
+{%- else -%}
+    {%- assign tz = "+0" -%}
+{%- endif -%}
 {%- capture desc -%}<a href="{{conf.link}}">{{ conf.conference }} {{ conf.year }}</a> found on <a href="https://pythondeadlin.es">PythonDeadlin.es</a>.{%- endcapture -%}
 {% if conf.workshop_deadline and conf.workshop_deadline != "TBA" %}
 BEGIN:VEVENT
 SUMMARY:{{ conf.conference }} {{ conf.year }} Workshop Deadline
-UID:{{conf.conference | slugify: "latin"}}-{{conf.year}}-workshop {%- if conf.timezone contains "UTC" -%} {%- assign tz = conf.timezone | split: "UTC" -%} {%- if tz[1] contains "-" -%} {%- assign tz = tz[1] | replace: "-", "+" -%} {%- else if tz[1] contains "+" -%} {%- assign tz = tz[1] | replace: "+", "-" -%} {%- else assign tz = tz[1] -%} {%- endif -%}
-ORGANIZER:pythondeadlin.es
-{%- capture desc -%}<a href="{{conf.link}}">{{ conf.conference }} {{ conf.year }}</a> found on <a href="https://pythondeadlin.es">PythonDeadlin.es</a>.{%- endcapture -%}
-{{ desc | prepend: "DESCRIPTION:" | normalize_whitespace | wrap_lines }}
-DTSTAMP:{{ site.time | date: "%Y%m%dT%H%M%SZ" }}
-DTSTART;TZID=/Etc/GMT{{ tz }}:{{ conf.workshop_deadline | date: "%Y%m%dT%H%M%S" }}
-{% else %}
+UID:{{conf.conference | slugify: "latin"}}-{{conf.year}}-workshop
 ORGANIZER:pythondeadlin.es
 {{ desc | prepend: "DESCRIPTION:" | normalize_whitespace | wrap_lines }}
 DTSTAMP:{{ site.time | date: "%Y%m%dT%H%M%SZ" }}
-DTSTART;TZID=/{{ conf.timezone | default: "Etc/GMT+12" }}:{{ conf.workshop_deadline | date: "%Y%m%dT%H%M%S" }}
-{% endif %}END:VEVENT
+DTSTART;TZID=GMT{{ tz }}:{{ conf.workshop_deadline | date: "%Y%m%dT%H%M%S" }}
+END:VEVENT
 {%- endif -%}
 {% if conf.tutorial_deadline and conf.tutorial_deadline != "TBA" %}
 BEGIN:VEVENT
 SUMMARY:{{ conf.conference }} {{ conf.year }} Tutorial Deadline
-UID:{{conf.conference | slugify: "latin"}}-{{conf.year}}-tutorial {%- if conf.timezone contains "UTC" -%} {%- assign tz = conf.timezone | split: "UTC" -%} {%- if tz[1] contains "-" -%} {%- assign tz = tz[1] | replace: "-", "+" -%} {%- else if tz[1] contains "+" -%} {%- assign tz = tz[1] | replace: "+", "-" -%} {%- else assign tz = tz[1] -%} {%- endif -%}
+UID:{{conf.conference | slugify: "latin"}}-{{conf.year}}-tutorial
 ORGANIZER:pythondeadlin.es
 {{ desc | prepend: "DESCRIPTION:" | normalize_whitespace | wrap_lines }}
 DTSTAMP:{{ site.time | date: "%Y%m%dT%H%M%SZ" }}
-DTSTART;TZID=/Etc/GMT{{ tz }}:{{ conf.tutorial_deadline | date: "%Y%m%dT%H%M%S" }}
-{% else %}
-ORGANIZER:pythondeadlin.es
-{{ desc | prepend: "DESCRIPTION:" | normalize_whitespace | wrap_lines }}
-DTSTAMP:{{ site.time | date: "%Y%m%dT%H%M%SZ" }}
-DTSTART;TZID=/{{ conf.timezone | default: "Etc/GMT+12" }}:{{ conf.tutorial_deadline | date: "%Y%m%dT%H%M%S" }}
-{% endif %}END:VEVENT
+DTSTART;TZID=GMT{{ tz }}:{{ conf.tutorial_deadline | date: "%Y%m%dT%H%M%S" }}
+END:VEVENT
 {%- endif -%}
-{% if cfp != "TBA" %}
+{% if cfp != "TBA" and cfp != "None" and cfp != "Cancelled" %}
 BEGIN:VEVENT
 SUMMARY:{{ conf.conference }} {{ conf.year }} Deadline {{ extended }}
-UID:{{conf.conference | slugify: "latin"}}-{{conf.year}} {%- if conf.timezone contains "UTC" -%} {%- assign tz = conf.timezone | split: "UTC" -%} {%- if tz[1] contains "-" -%} {%- assign tz = tz[1] | replace: "-", "+" -%} {%- else if tz[1] contains "+" -%} {%- assign tz = tz[1] | replace: "+", "-" -%} {%- else assign tz = tz[1] -%} {%- endif -%}
-ORGANIZER:pythondeadlin.es
-{{ desc | prepend: "DESCRIPTION:" | normalize_whitespace | wrap_lines }}
-DTSTAMP:{{ site.time | date: "%Y%m%dT%H%M%SZ" }}
-DTSTART;TZID=/Etc/GMT{{ tz }}:{{ cfp | date: "%Y%m%dT%H%M%S" }}
-{% else %}
+UID:{{conf.conference | slugify: "latin"}}-{{conf.year}}
 ORGANIZER:pythondeadlin.es
 {{ desc | prepend: "DESCRIPTION:" | normalize_whitespace | wrap_lines }}
 DTSTAMP:{{ site.time | date: "%Y%m%dT%H%M%SZ" }}
-DTSTART;TZID=/{{ conf.timezone | default: "Etc/GMT+12" }}:{{ cfp | date: "%Y%m%dT%H%M%S" }}
-{% endif %}END:VEVENT
+DTSTART;TZID=GMT{{ tz }}:{{ cfp | date: "%Y%m%dT%H%M%S" }}
+END:VEVENT
 {%- endif -%}{% endfor %}
 END:VCALENDAR