Arch Linux

From 965351e85b25d83c193fcf68e42947b3b22a6b8f Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 13:01:17 -0500 Subject: Add retro_static template tag Unfortunately {% static %} cannot interpret any context variables passed into it, so we need to customize things in order to use it here since our resources are sorted by year. Signed-off-by: Dan McGee --- retro/templatetags/__init__.py | 0 retro/templatetags/retro.py | 13 +++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 retro/templatetags/__init__.py create mode 100644 retro/templatetags/retro.py diff --git a/retro/templatetags/__init__.py b/retro/templatetags/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/retro/templatetags/retro.py b/retro/templatetags/retro.py new file mode 100644 index 00000000..c7fd9f00 --- /dev/null +++ b/retro/templatetags/retro.py @@ -0,0 +1,13 @@ +from django import template +from django.contrib.staticfiles.storage import staticfiles_storage + +register = template.Library() + + +@register.simple_tag +def retro_static(year, path): + """Like the built-in {% static %} tag but with a little extra magic.""" + full_path = "%s/%s" % (year, path) + return staticfiles_storage.url(full_path) + +# vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 99a0e1bc76295243026ffbd41af10d62787b9ec0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 13:08:39 -0500 Subject: Convert retro pages to use {% retro_static %} template tag Signed-off-by: Dan McGee --- retro/templates/retro/index-20020328.html | 8 ++++---- retro/templates/retro/index-20030330.html | 12 ++++++------ retro/templates/retro/index-20040327.html | 24 ++++++++++++------------ retro/templates/retro/index-20050328.html | 26 +++++++++++++------------- retro/templates/retro/index-20060328.html | 24 ++++++++++++------------ retro/templates/retro/index-20070324.html | 18 +++++++++--------- retro/templates/retro/index-20080311.html | 16 ++++++++-------- retro/templates/retro/index-20090327.html | 14 +++++++------- retro/templates/retro/index-20100208.html | 16 ++++++++-------- retro/templates/retro/index-20110212.html | 20 ++++++++++---------- retro/views.py | 4 +--- 11 files changed, 90 insertions(+), 92 deletions(-) diff --git a/retro/templates/retro/index-20020328.html b/retro/templates/retro/index-20020328.html index ca74cb4f..8c8f9d62 100644 --- a/retro/templates/retro/index-20020328.html +++ b/retro/templates/retro/index-20020328.html @@ -1,8 +1,8 @@ - Arch Linux - + @@ -27,7 +27,7 @@ Devel: 0.2 - Arch Logo

@@ -131,7 +131,7 @@ here to use the web interface. <jvinet@zeroflux.org> -

diff --git a/retro/templates/retro/index-20030330.html b/retro/templates/retro/index-20030330.html index 59bb9189..449731af 100644 --- a/retro/templates/retro/index-20030330.html +++ b/retro/templates/retro/index-20030330.html @@ -1,11 +1,11 @@ - +{% load retro_static from retro %} Arch Linux - - + + - + @@ -20,7 +20,7 @@

diff --git a/retro/templates/retro/index-20040327.html b/retro/templates/retro/index-20040327.html index 08588fe5..9c8ea0dd 100644 --- a/retro/templates/retro/index-20040327.html +++ b/retro/templates/retro/index-20040327.html @@ -1,10 +1,10 @@ - +{% load retro_static from retro %} Arch Linux - - - + + + @@ -15,7 +15,7 @@

- + @@ -212,13 +212,13 @@ @@ -243,7 +243,7 @@

Make payments with PayPal - it's fast, free and secure!

All money goes directly to server costs

- + @@ -378,7 +378,7 @@ March 26 20:54

@@ -330,7 +330,7 @@ March 26 20:54

Release Package Lists @@ -360,7 +360,7 @@ March 26 20:54 - +

- + diff --git a/retro/templates/retro/index-20050328.html b/retro/templates/retro/index-20050328.html index 2ac8c580..8b4f9e75 100644 --- a/retro/templates/retro/index-20050328.html +++ b/retro/templates/retro/index-20050328.html @@ -1,10 +1,10 @@ - +{% load retro_static from retro %}Arch Linux - - - + + +

@@ -455,7 +455,7 @@ March 26 20:54 - +

@@ -15,7 +15,7 @@

- + @@ -284,18 +284,18 @@ @@ -320,7 +320,7 @@

All money goes directly to server costs

- + @@ -452,7 +452,7 @@ March 24 05:13

@@ -401,7 +401,7 @@ March 24 05:13

Release Package Lists @@ -434,7 +434,7 @@ March 24 05:13 - +

- + diff --git a/retro/templates/retro/index-20060328.html b/retro/templates/retro/index-20060328.html index 6f39c0ed..f45024df 100644 --- a/retro/templates/retro/index-20060328.html +++ b/retro/templates/retro/index-20060328.html @@ -1,12 +1,12 @@ - +{% load retro_static from retro %}Arch Linux - - + + - +

@@ -578,7 +578,7 @@ You can enab... - +

@@ -17,7 +17,7 @@

- + @@ -317,13 +317,13 @@ @@ -346,7 +346,7 @@

- + @@ -490,7 +490,7 @@ March 27 13:34

@@ -427,7 +427,7 @@ March 27 13:34

Release Package Lists @@ -472,7 +472,7 @@ March 27 13:34 - +

- + diff --git a/retro/templates/retro/index-20070324.html b/retro/templates/retro/index-20070324.html index c4739927..14453726 100644 --- a/retro/templates/retro/index-20070324.html +++ b/retro/templates/retro/index-20070324.html @@ -1,10 +1,10 @@ - +{% load retro_static from retro %} Arch Linux - - - + + + @@ -14,8 +14,8 @@

@@ -51,7 +51,7 @@

@@ -622,7 +622,7 @@ Xorg7 has finally moved into Current. The upgrade is pretty sm... - +

- + @@ -264,7 +264,7 @@

Latest News

@@ -376,7 +376,7 @@ MODULES= in rc.conf - Recent ...

diff --git a/retro/templates/retro/index-20080311.html b/retro/templates/retro/index-20080311.html index d48a632e..89a7de95 100644 --- a/retro/templates/retro/index-20080311.html +++ b/retro/templates/retro/index-20080311.html @@ -1,10 +1,10 @@ - +{% load retro_static from retro %} Arch Linux - - - + + + @@ -14,8 +14,8 @@

@@ -43,7 +43,7 @@

Recent Updates

- + @@ -272,7 +272,7 @@

Latest News

diff --git a/retro/templates/retro/index-20090327.html b/retro/templates/retro/index-20090327.html index 70c64736..e780d78d 100644 --- a/retro/templates/retro/index-20090327.html +++ b/retro/templates/retro/index-20090327.html @@ -1,10 +1,10 @@ - +{% load retro_static from retro %} Arch Linux - - - + + + @@ -42,7 +42,7 @@

Recent Updates

- + @@ -156,7 +156,7 @@

SVN

Projects

@@ -184,7 +184,7 @@

Latest News

diff --git a/retro/templates/retro/index-20100208.html b/retro/templates/retro/index-20100208.html index 1d488248..b30d4cb4 100644 --- a/retro/templates/retro/index-20100208.html +++ b/retro/templates/retro/index-20100208.html @@ -1,10 +1,10 @@ - +{% load retro_static from retro %} Arch Linux - - - + + + @@ -46,7 +46,7 @@

Recent Updates

- + @@ -165,8 +165,8 @@

SVN

Projects

@@ -194,7 +194,7 @@

Latest News

diff --git a/retro/templates/retro/index-20110212.html b/retro/templates/retro/index-20110212.html index e304a727..db4dfa41 100644 --- a/retro/templates/retro/index-20110212.html +++ b/retro/templates/retro/index-20110212.html @@ -1,11 +1,11 @@ - +{% load retro_static from retro %} Arch Linux - - - - + + + + @@ -71,7 +71,7 @@

Latest News (more)

MySQL 5.5 is now in [extra]

@@ -199,7 +199,7 @@ use the proper directories.

Recent Updates (more)

Recent Updates

@@ -413,13 +413,13 @@ use the proper directories.

diff --git a/retro/views.py b/retro/views.py index 5ce6d19d..3bc59e9f 100644 --- a/retro/views.py +++ b/retro/views.py @@ -1,4 +1,3 @@ -from django.conf import settings from django.http import Http404 from django.views.decorators.cache import cache_page from django.views.generic.simple import direct_to_template @@ -24,9 +23,8 @@ def retro_homepage(request, year): template = RETRO_YEAR_MAP.get(year, None) if template is None: raise Http404 - static_url = '%s%d/' % (settings.STATIC_URL, year) context = { - 'RETRO_STATIC_URL': static_url, + 'year': year, } return direct_to_template(request, 'retro/%s' % template, context) -- cgit v1.2.3-2-g168b From 5888bdf0db3aaa38f35f4630af86edf4b07f65e2 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 13:12:02 -0500 Subject: Use staticfiles_storage in jQuery tag To get the local URL to the jQuery JS file. Signed-off-by: Dan McGee --- main/templatetags/cdn.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main/templatetags/cdn.py b/main/templatetags/cdn.py index f290a524..ab5d881a 100644 --- a/main/templatetags/cdn.py +++ b/main/templatetags/cdn.py @@ -1,8 +1,10 @@ from django import template from django.conf import settings +from django.contrib.staticfiles.storage import staticfiles_storage register = template.Library() + @register.simple_tag def jquery(): version = '1.4.4' @@ -11,8 +13,8 @@ def jquery(): link = 'https://ajax.googleapis.com/ajax/libs/jquery/' \ '%s/jquery.min.js' % version else: - static_url = getattr(settings, 'STATIC_URL', '/static/') - link = '%sjquery-%s.min.js' % (static_url, version) + filename = 'jquery-%s.min.js' % version + link = staticfiles_storage.url(filename) return '' % link # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 48aec1534324ef17755a3edd2c379ff141c2b993 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 17:10:22 -0500 Subject: Revert "Add some dev dashboard info regarding signed package count" This reverts commit 797185faed0555efb88a1e6a18e447548a9935fd. Now that all packages in the Arch repos are signed, this column isn't very useful as it just reflects the total package count. Conflicts: packages/views.py -> packages/views/search.py Signed-off-by: Dan McGee --- main/models.py | 4 ---- packages/views/search.py | 8 -------- templates/devel/index.html | 5 ----- 3 files changed, 17 deletions(-) diff --git a/main/models.py b/main/models.py index 7d017242..289cbb84 100644 --- a/main/models.py +++ b/main/models.py @@ -74,10 +74,6 @@ class PackageManager(models.Manager): """Used by dev dashboard.""" return self.filter(flag_date__isnull=False) - def signed(self): - """Used by dev dashboard.""" - return self.filter(pgp_signature__isnull=False) - def normal(self): return self.select_related('arch', 'repo') diff --git a/packages/views/search.py b/packages/views/search.py index 65fcddb3..1431893d 100644 --- a/packages/views/search.py +++ b/packages/views/search.py @@ -44,9 +44,6 @@ class PackageSearchForm(forms.Form): flagged = forms.ChoiceField( choices=[('', 'All')] + make_choice(['Flagged', 'Not Flagged']), required=False) - signed = forms.ChoiceField( - choices=[('', 'All')] + make_choice(['Signed', 'Unsigned']), - required=False) limit = LimitTypedChoiceField( choices=make_choice([50, 100, 250]) + [('all', 'All')], coerce=coerce_limit_value, @@ -97,11 +94,6 @@ def parse_form(form, packages): elif form.cleaned_data['flagged'] == 'Not Flagged': packages = packages.filter(flag_date__isnull=True) - if form.cleaned_data['signed'] == 'Signed': - packages = packages.filter(pgp_signature__isnull=False) - elif form.cleaned_data['signed'] == 'Unsigned': - packages = packages.filter(pgp_signature__isnull=True) - if form.cleaned_data['last_update']: lu = form.cleaned_data['last_update'] packages = packages.filter(last_update__gte= diff --git a/templates/devel/index.html b/templates/devel/index.html index 02019366..63d18193 100644 --- a/templates/devel/index.html +++ b/templates/devel/index.html @@ -183,7 +183,6 @@ - @@ -196,8 +195,6 @@ - - {% endfor %} @@ -216,7 +213,6 @@ - @@ -229,7 +225,6 @@ - {% endfor %} -- cgit v1.2.3-2-g168b From fd1c992472ea259111a2f4930b73a805c07ee068 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 24 Mar 2012 17:21:09 -0500 Subject: Use bulk_create() when inserting mirror log entries Signed-off-by: Dan McGee --- mirrors/management/commands/mirrorcheck.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mirrors/management/commands/mirrorcheck.py b/mirrors/management/commands/mirrorcheck.py index c2928e67..7ffb7773 100644 --- a/mirrors/management/commands/mirrorcheck.py +++ b/mirrors/management/commands/mirrorcheck.py @@ -137,8 +137,7 @@ class MirrorCheckPool(object): logger.debug("joining on all threads") self.tasks.join() logger.debug("processing log entries") - for log in self.logs: - log.save() + MirrorLog.objects.bulk_create(self.logs) logger.debug("log entries saved") def check_current_mirrors(): -- cgit v1.2.3-2-g168b

Arch	# Packages	# Flagged	# Signed
{{ arch.packages.flagged.count }} packages	{{ arch.packages.signed.count }} packages
Repository	# Packages	# Flagged	# Signed
{{ repo.packages.flagged.count }} packages	{{ repo.packages.signed.count }} packages