Skip to content

Commit 26f5f5e

Browse files
committed
Report correct type for tar.gz downloads
Signed-off-by: Michal Čihař <michal@cihar.com>
1 parent c23f698 commit 26f5f5e

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

files/models.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,14 @@ def get_alternate_url(self):
273273
def archive(self):
274274
return self.filename.rsplit('.', 1)[-1]
275275

276+
@property
277+
def composer_type(self):
278+
ext = self.filename.rsplit('.', 1)[-1]
279+
if ext == 'zip':
280+
return 'zip'
281+
else:
282+
return 'tar'
283+
276284

277285
class Theme(models.Model):
278286
name = models.CharField(max_length=50)

pmaweb/templates/version/packages.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
"name": "phpmyadmin/phpmyadmin",
77
"version": "{{ release.version }}",
88
"dist": {
9-
"url": "{{ release.simpledownload.get_absolute_url }}",
10-
"type": "zip"
9+
{% with release.simpledownload as download %}
10+
"url": "{{ download.get_absolute_url }}",
11+
"type": "{{ download.composer_type }}"
12+
{% endwith %}
1113
}
1214
},
1315
{% endfor %}

0 commit comments

Comments
 (0)