[gimp-web/wip/Jehan/gimp-versions] pelicanconf, themes: process the ordered gimp_versions.json properly.
- From: Jehan <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp-web/wip/Jehan/gimp-versions] pelicanconf, themes: process the ordered gimp_versions.json properly.
- Date: Sun, 26 Jan 2020 11:38:34 +0000 (UTC)
commit 57cd91cd1b117cd8e595e20b5f1e055a32cf4c2b
Author: Jehan <jehan girinstud io>
Date: Sun Jan 26 12:37:49 2020 +0100
pelicanconf, themes: process the ordered gimp_versions.json properly.
Cf. previous commit.
pelicanconf.local.py | 60 +++++++++++-----------
pelicanconf.py | 60 +++++++++++-----------
pelicanconf.testing.py | 46 ++++++++---------
.../newgimp/templates/downloads-development.html | 4 +-
themes/newgimp/templates/downloads-oldstable.html | 4 +-
themes/newgimp/templates/downloads.html | 14 ++---
6 files changed, 94 insertions(+), 94 deletions(-)
---
diff --git a/pelicanconf.local.py b/pelicanconf.local.py
index 3712abbe..ba7120f3 100644
--- a/pelicanconf.local.py
+++ b/pelicanconf.local.py
@@ -167,32 +167,32 @@ if 'STABLE' in GIMP:
except NameError:
WINDOWS_VER = version
WINDOWS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
- WINDOWS_FILE = info['windows'].keys()[0]
- if 'sha256' in info['windows'].values()[0]:
+ WINDOWS_FILE = info['windows'][0]['filename']
+ if 'sha256' in info['windows'][0]:
WINDOWS_HASH_FUN = 'sha256'
- elif 'sha512' in info['windows'].values()[0]:
+ elif 'sha512' in info['windows'][0]:
WINDOWS_HASH_FUN = 'sha512'
- elif 'md5' in info['windows'].values()[0]:
+ elif 'md5' in info['windows'][0]:
WINDOWS_HASH_FUN = 'md5'
- WINDOWS_HASH = info['windows'].values()[0][WINDOWS_HASH_FUN]
- if 'min-support' in info['windows'].values()[0]:
- WINDOWS_MIN_SUPPORT = info['windows'].values()[0]["min-support"]
+ WINDOWS_HASH = info['windows'][0][WINDOWS_HASH_FUN]
+ if 'min-support' in info['windows'][0]:
+ WINDOWS_MIN_SUPPORT = info['windows'][0]["min-support"]
if 'macos' in info:
try:
MACOS_FILE
except NameError:
MACOS_VER = version
MACOS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
- MACOS_FILE = info['macos'].keys()[0]
- if 'sha256' in info['macos'].values()[0]:
+ MACOS_FILE = info['macos'][0]['filename']
+ if 'sha256' in info['macos'][0]:
MACOS_HASH_FUN = 'sha256'
- elif 'sha512' in info['macos'].values()[0]:
+ elif 'sha512' in info['macos'][0]:
MACOS_HASH_FUN = 'sha512'
- elif 'md5' in info['macos'].values()[0]:
+ elif 'md5' in info['macos'][0]:
MACOS_HASH_FUN = 'md5'
- MACOS_HASH = info['macos'].values()[0][MACOS_HASH_FUN]
- if 'min-support' in info['macos'].values()[0]:
- MACOS_MIN_SUPPORT = info['macos'].values()[0]["min-support"]
+ MACOS_HASH = info['macos'][0][MACOS_HASH_FUN]
+ if 'min-support' in info['macos'][0]:
+ MACOS_MIN_SUPPORT = info['macos'][0]["min-support"]
else:
print 'STABLE not defined'
@@ -216,16 +216,16 @@ if 'OLDSTABLE' in GIMP:
except NameError:
WINDOWS_VER_OLDSTABLE = version
WINDOWS_MAJOR_MINOR_VER_OLDSTABLE = version[:version.index('.', version.index('.') + 1)]
- WINDOWS_FILE_OLDSTABLE = info['windows'].keys()[0]
- WINDOWS_HASH_OLDSTABLE = info['windows'].values()[0]
+ WINDOWS_FILE_OLDSTABLE = info['windows'][0]['filename']
+ WINDOWS_HASH_OLDSTABLE = info['windows'][0]['md5']
if 'macos' in info:
try:
MACOS_FILE_OLDSTABLE
except NameError:
MACOS_VER_OLDSTABLE = version
MACOS_MAJOR_MINOR_VER_OLDSTABLE= version[:version.index('.', version.index('.') + 1)]
- MACOS_FILE_OLDSTABLE = info['macos'].keys()[0]
- MACOS_HASH_OLDSTABLE = info['macos'].values()[0]
+ MACOS_FILE_OLDSTABLE = info['macos'][0]['filename']
+ MACOS_HASH_OLDSTABLE = info['macos'][0]['md5']
else:
print 'OLDSTABLE not defined'
@@ -244,27 +244,27 @@ if 'DEVELOPMENT' in GIMP:
WINDOWS_FILE_DEVELOPMENT
except NameError:
WINDOWS_VER_DEVELOPMENT = version
- WINDOWS_FILE_DEVELOPMENT = info['windows'].keys()[0]
- if 'sha256' in info['windows'].values()[0]:
+ WINDOWS_FILE_DEVELOPMENT = info['windows'][0]['filename']
+ if 'sha256' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'sha256'
- elif 'sha512' in info['windows'].values()[0]:
+ elif 'sha512' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'sha512'
- elif 'md5' in info['windows'].values()[0]:
+ elif 'md5' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'md5'
- WINDOWS_HASH_DEVELOPMENT = info['windows'].values()[0][WINDOWS_HASH_FUN_DEVELOPMENT]
+ WINDOWS_HASH_DEVELOPMENT = info['windows'][0][WINDOWS_HASH_FUN_DEVELOPMENT]
if 'macos' in info:
try:
MACOS_FILE_DEVELOPMENT
except NameError:
MACOS_VER_DEVELOPMENT = version
- MACOS_FILE_DEVELOPMENT = info['macos'].keys()[0]
- if 'sha256' in info['macos'].values()[0]:
+ MACOS_FILE_DEVELOPMENT = info['macos'][0]['filename']
+ if 'sha256' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'sha256'
- elif 'sha512' in info['macos'].values()[0]:
+ elif 'sha512' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'sha512'
- elif 'md5' in info['macos'].values()[0]:
+ elif 'md5' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'md5'
- MACOS_HASH_DEVELOPMENT = info['macos'].values()[0][MACOS_HASH_FUN_DEVELOPMENT]
+ MACOS_HASH_DEVELOPMENT = info['macos'][0][MACOS_HASH_FUN_DEVELOPMENT]
if 'flatpak' in info:
try:
FLATPAK_FILE_DEVELOPMENT
@@ -273,8 +273,8 @@ if 'DEVELOPMENT' in GIMP:
FLATPAK_FILE_DEVELOPMENT = {}
FLATPAK_HASH_DEVELOPMENT = {}
for arch, package in info['flatpak'].iteritems() :
- FLATPAK_FILE_DEVELOPMENT[arch] = package.keys()[0]
- FLATPAK_HASH_DEVELOPMENT[arch] = package.values()[0]
+ FLATPAK_FILE_DEVELOPMENT[arch] = package[0]['filename']
+ FLATPAK_HASH_DEVELOPMENT[arch] = package[0]['md5']
else:
print 'DEVELOPMENT not defined'
diff --git a/pelicanconf.py b/pelicanconf.py
index ba785724..6dd2f145 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -154,32 +154,32 @@ if 'STABLE' in GIMP:
except NameError:
WINDOWS_VER = version
WINDOWS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
- WINDOWS_FILE = info['windows'].keys()[0]
- if 'sha256' in info['windows'].values()[0]:
+ WINDOWS_FILE = info['windows'][0]['filename']
+ if 'sha256' in info['windows'][0]:
WINDOWS_HASH_FUN = 'sha256'
- elif 'sha512' in info['windows'].values()[0]:
+ elif 'sha512' in info['windows'][0]:
WINDOWS_HASH_FUN = 'sha512'
- elif 'md5' in info['windows'].values()[0]:
+ elif 'md5' in info['windows'][0]:
WINDOWS_HASH_FUN = 'md5'
- WINDOWS_HASH = info['windows'].values()[0][WINDOWS_HASH_FUN]
- if 'min-support' in info['windows'].values()[0]:
- WINDOWS_MIN_SUPPORT = info['windows'].values()[0]["min-support"]
+ WINDOWS_HASH = info['windows'][0][WINDOWS_HASH_FUN]
+ if 'min-support' in info['windows'][0]:
+ WINDOWS_MIN_SUPPORT = info['windows'][0]["min-support"]
if 'macos' in info:
try:
MACOS_FILE
except NameError:
MACOS_VER = version
MACOS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
- MACOS_FILE = info['macos'].keys()[0]
- if 'sha256' in info['macos'].values()[0]:
+ MACOS_FILE = info['macos'][0]['filename']
+ if 'sha256' in info['macos'][0]:
MACOS_HASH_FUN = 'sha256'
- elif 'sha512' in info['macos'].values()[0]:
+ elif 'sha512' in info['macos'][0]:
MACOS_HASH_FUN = 'sha512'
- elif 'md5' in info['macos'].values()[0]:
+ elif 'md5' in info['macos'][0]:
MACOS_HASH_FUN = 'md5'
- MACOS_HASH = info['macos'].values()[0][MACOS_HASH_FUN]
- if 'min-support' in info['macos'].values()[0]:
- MACOS_MIN_SUPPORT = info['macos'].values()[0]["min-support"]
+ MACOS_HASH = info['macos'][0][MACOS_HASH_FUN]
+ if 'min-support' in info['macos'][0]:
+ MACOS_MIN_SUPPORT = info['macos'][0]["min-support"]
else:
print 'STABLE not defined'
@@ -202,16 +202,16 @@ if 'OLDSTABLE' in GIMP:
except NameError:
WINDOWS_VER_OLDSTABLE = version
WINDOWS_MAJOR_MINOR_VER_OLDSTABLE = version[:version.index('.', version.index('.') + 1)]
- WINDOWS_FILE_OLDSTABLE = info['windows'].keys()[0]
- WINDOWS_HASH_OLDSTABLE = info['windows'].values()[0]
+ WINDOWS_FILE_OLDSTABLE = info['windows'][0]['filename']
+ WINDOWS_HASH_OLDSTABLE = info['windows'][0]['md5']
if 'macos' in info:
try:
MACOS_FILE_OLDSTABLE
except NameError:
MACOS_VER_OLDSTABLE = version
MACOS_MAJOR_MINOR_VER_OLDSTABLE= version[:version.index('.', version.index('.') + 1)]
- MACOS_FILE_OLDSTABLE = info['macos'].keys()[0]
- MACOS_HASH_OLDSTABLE = info['macos'].values()[0]
+ MACOS_FILE_OLDSTABLE = info['macos'][0]['filename']
+ MACOS_HASH_OLDSTABLE = info['macos'][0]['md5']
else:
print 'OLDSTABLE not defined'
@@ -230,27 +230,27 @@ if 'DEVELOPMENT' in GIMP:
WINDOWS_FILE_DEVELOPMENT
except NameError:
WINDOWS_VER_DEVELOPMENT = version
- WINDOWS_FILE_DEVELOPMENT = info['windows'].keys()[0]
- if 'sha256' in info['windows'].values()[0]:
+ WINDOWS_FILE_DEVELOPMENT = info['windows'][0]['filename']
+ if 'sha256' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'sha256'
- elif 'sha512' in info['windows'].values()[0]:
+ elif 'sha512' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'sha512'
- elif 'md5' in info['windows'].values()[0]:
+ elif 'md5' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'md5'
- WINDOWS_HASH_DEVELOPMENT = info['windows'].values()[0][WINDOWS_HASH_FUN_DEVELOPMENT]
+ WINDOWS_HASH_DEVELOPMENT = info['windows'][0][WINDOWS_HASH_FUN_DEVELOPMENT]
if 'macos' in info:
try:
MACOS_FILE_DEVELOPMENT
except NameError:
MACOS_VER_DEVELOPMENT = version
- MACOS_FILE_DEVELOPMENT = info['macos'].keys()[0]
- if 'sha256' in info['macos'].values()[0]:
+ MACOS_FILE_DEVELOPMENT = info['macos'][0]['filename']
+ if 'sha256' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'sha256'
- elif 'sha512' in info['macos'].values()[0]:
+ elif 'sha512' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'sha512'
- elif 'md5' in info['macos'].values()[0]:
+ elif 'md5' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'md5'
- MACOS_HASH_DEVELOPMENT = info['macos'].values()[0][MACOS_HASH_FUN_DEVELOPMENT]
+ MACOS_HASH_DEVELOPMENT = info['macos'][0][MACOS_HASH_FUN_DEVELOPMENT]
if 'flatpak' in info:
try:
FLATPAK_FILE_DEVELOPMENT
@@ -259,8 +259,8 @@ if 'DEVELOPMENT' in GIMP:
FLATPAK_FILE_DEVELOPMENT = {}
FLATPAK_HASH_DEVELOPMENT = {}
for arch, package in info['flatpak'].iteritems() :
- FLATPAK_FILE_DEVELOPMENT[arch] = package.keys()[0]
- FLATPAK_HASH_DEVELOPMENT[arch] = package.values()[0]
+ FLATPAK_FILE_DEVELOPMENT[arch] = package[0]['filename']
+ FLATPAK_HASH_DEVELOPMENT[arch] = package[0]['md5']
else:
print 'DEVELOPMENT not defined'
diff --git a/pelicanconf.testing.py b/pelicanconf.testing.py
index 4e7cb716..b923bd4d 100644
--- a/pelicanconf.testing.py
+++ b/pelicanconf.testing.py
@@ -155,15 +155,15 @@ if 'STABLE' in GIMP:
WINDOWS_VER = version
WINDOWS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
WINDOWS_FILE = info['windows'].keys()[0]
- if 'sha256' in info['windows'].values()[0]:
+ if 'sha256' in info['windows'][0]:
WINDOWS_HASH_FUN = 'sha256'
- elif 'sha512' in info['windows'].values()[0]:
+ elif 'sha512' in info['windows'][0]:
WINDOWS_HASH_FUN = 'sha512'
- elif 'md5' in info['windows'].values()[0]:
+ elif 'md5' in info['windows'][0]:
WINDOWS_HASH_FUN = 'md5'
- WINDOWS_HASH = info['windows'].values()[0][WINDOWS_HASH_FUN]
- if 'min-support' in info['windows'].values()[0]:
- WINDOWS_MIN_SUPPORT = info['windows'].values()[0]["min-support"]
+ WINDOWS_HASH = info['windows'][0][WINDOWS_HASH_FUN]
+ if 'min-support' in info['windows'][0]:
+ WINDOWS_MIN_SUPPORT = info['windows'][0]["min-support"]
if 'macos' in info:
try:
MACOS_FILE
@@ -171,15 +171,15 @@ if 'STABLE' in GIMP:
MACOS_VER = version
MACOS_MAJOR_MINOR_VER = version[:version.index('.', version.index('.') + 1)]
MACOS_FILE = info['macos'].keys()[0]
- if 'sha256' in info['macos'].values()[0]:
+ if 'sha256' in info['macos'][0]:
MACOS_HASH_FUN = 'sha256'
- elif 'sha512' in info['macos'].values()[0]:
+ elif 'sha512' in info['macos'][0]:
MACOS_HASH_FUN = 'sha512'
- elif 'md5' in info['macos'].values()[0]:
+ elif 'md5' in info['macos'][0]:
MACOS_HASH_FUN = 'md5'
- MACOS_HASH = info['macos'].values()[0][MACOS_HASH_FUN]
- if 'min-support' in info['macos'].values()[0]:
- MACOS_MIN_SUPPORT = info['macos'].values()[0]["min-support"]
+ MACOS_HASH = info['macos'][0][MACOS_HASH_FUN]
+ if 'min-support' in info['macos'][0]:
+ MACOS_MIN_SUPPORT = info['macos'][0]["min-support"]
else:
print 'STABLE not defined'
@@ -203,7 +203,7 @@ if 'OLDSTABLE' in GIMP:
WINDOWS_VER_OLDSTABLE = version
WINDOWS_MAJOR_MINOR_VER_OLDSTABLE = version[:version.index('.', version.index('.') + 1)]
WINDOWS_FILE_OLDSTABLE = info['windows'].keys()[0]
- WINDOWS_HASH_OLDSTABLE = info['windows'].values()[0]
+ WINDOWS_HASH_OLDSTABLE = info['windows'][0]['md5']
if 'macos' in info:
try:
MACOS_FILE_OLDSTABLE
@@ -211,7 +211,7 @@ if 'OLDSTABLE' in GIMP:
MACOS_VER_OLDSTABLE = version
MACOS_MAJOR_MINOR_VER_OLDSTABLE= version[:version.index('.', version.index('.') + 1)]
MACOS_FILE_OLDSTABLE = info['macos'].keys()[0]
- MACOS_HASH_OLDSTABLE = info['macos'].values()[0]
+ MACOS_HASH_OLDSTABLE = info['macos'][0]['md5']
else:
print 'OLDSTABLE not defined'
@@ -231,26 +231,26 @@ if 'DEVELOPMENT' in GIMP:
except NameError:
WINDOWS_VER_DEVELOPMENT = version
WINDOWS_FILE_DEVELOPMENT = info['windows'].keys()[0]
- if 'sha256' in info['windows'].values()[0]:
+ if 'sha256' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'sha256'
- elif 'sha512' in info['windows'].values()[0]:
+ elif 'sha512' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'sha512'
- elif 'md5' in info['windows'].values()[0]:
+ elif 'md5' in info['windows'][0]:
WINDOWS_HASH_FUN_DEVELOPMENT = 'md5'
- WINDOWS_HASH_DEVELOPMENT = info['windows'].values()[0][WINDOWS_HASH_FUN_DEVELOPMENT]
+ WINDOWS_HASH_DEVELOPMENT = info['windows'][0][WINDOWS_HASH_FUN_DEVELOPMENT]
if 'macos' in info:
try:
MACOS_FILE_DEVELOPMENT
except NameError:
MACOS_VER_DEVELOPMENT = version
MACOS_FILE_DEVELOPMENT = info['macos'].keys()[0]
- if 'sha256' in info['macos'].values()[0]:
+ if 'sha256' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'sha256'
- elif 'sha512' in info['macos'].values()[0]:
+ elif 'sha512' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'sha512'
- elif 'md5' in info['macos'].values()[0]:
+ elif 'md5' in info['macos'][0]:
MACOS_HASH_FUN_DEVELOPMENT = 'md5'
- MACOS_HASH_DEVELOPMENT = info['macos'].values()[0][MACOS_HASH_FUN_DEVELOPMENT]
+ MACOS_HASH_DEVELOPMENT = info['macos'][0][MACOS_HASH_FUN_DEVELOPMENT]
if 'flatpak' in info:
try:
FLATPAK_FILE_DEVELOPMENT
@@ -260,7 +260,7 @@ if 'DEVELOPMENT' in GIMP:
FLATPAK_HASH_DEVELOPMENT = {}
for arch, package in info['flatpak'].iteritems() :
FLATPAK_FILE_DEVELOPMENT[arch] = package.keys()[0]
- FLATPAK_HASH_DEVELOPMENT[arch] = package.values()[0]
+ FLATPAK_HASH_DEVELOPMENT[arch] = package[0]['md5']
else:
print 'DEVELOPMENT not defined'
diff --git a/themes/newgimp/templates/downloads-development.html
b/themes/newgimp/templates/downloads-development.html
index 5ab13cf3..d46230ba 100644
--- a/themes/newgimp/templates/downloads-development.html
+++ b/themes/newgimp/templates/downloads-development.html
@@ -259,8 +259,8 @@
{% set ver = version.split('.') %}
{% if 'source' in values %}
<p>
- <a href="//download.gimp.org/mirror/pub/gimp/v{{ ver[0] }}.{{ ver[1] }}/{{
values['source'].keys()[0] }}"><strong>{{ values['source'].keys()[0] }}</strong></a><br>
- <kbd>{{ values['source'].values()[0] }}</kbd>
+ <a href="//download.gimp.org/mirror/pub/gimp/v{{ ver[0] }}.{{ ver[1] }}/{{
values['source'][0]['filename'] }}"><strong>{{ values['source'][0]['filename'] }}</strong></a><br>
+ <kbd>{{ values['source'][0]['md5'] }}</kbd>
</p>
{% endif %}
{% endfor %}
diff --git a/themes/newgimp/templates/downloads-oldstable.html
b/themes/newgimp/templates/downloads-oldstable.html
index 2bcd82d9..504b06b8 100644
--- a/themes/newgimp/templates/downloads-oldstable.html
+++ b/themes/newgimp/templates/downloads-oldstable.html
@@ -293,8 +293,8 @@
{% for values in GIMP.OLDSTABLE %}
{% if 'source' in values %}
<p>
- <strong>{{ values['source'].keys()[0] }}</strong><br>
- <kbd>{{ values['source'].values()[0] }}</kbd>
+ <strong>{{ values['source'][0]['filename'] }}</strong><br>
+ <kbd>{{ values['source'][0]['md5'] }}</kbd>
</p>
{% endif %}
{% endfor %}
diff --git a/themes/newgimp/templates/downloads.html b/themes/newgimp/templates/downloads.html
index f2dbb0c7..d08c83b2 100644
--- a/themes/newgimp/templates/downloads.html
+++ b/themes/newgimp/templates/downloads.html
@@ -389,16 +389,16 @@
<dl>
{% for values in GIMP.STABLE %}
{% if 'source' in values %}
- <dt><strong>{{ values['source'].keys()[0] }}</strong>
- {% if 'sha256' in values['source'].values()[0] %}
+ <dt><strong>{{ values['source'][0]['filename'] }}</strong>
+ {% if 'sha256' in values['source'][0] %}
(sha256): </dt>
- <dd><kbd>{{ values['source'].values()[0]['sha256'] }}</kbd></dd>
- {% elif 'sha512' in values['source'].values()[0] %}
+ <dd><kbd>{{ values['source'][0]['sha256'] }}</kbd></dd>
+ {% elif 'sha512' in values['source'][0] %}
(sha512): </dt>
- <dd><kbd>{{ values['source'].values()[0]['sha512'] }}</kbd></dd>
- {% elif 'md5' in values['source'].values()[0] %}
+ <dd><kbd>{{ values['source'][0]['sha512'] }}</kbd></dd>
+ {% elif 'md5' in values['source'][0] %}
(md5): </dt>
- <dd><kbd>{{ values['source'].values()[0]['md5'] }}</kbd></dd>
+ <dd><kbd>{{ values['source'][0]['md5'] }}</kbd></dd>
{% endif %}
{% endif %}
{% endfor %}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
