From b59e79f3878d59b83c6867eb5c6196f8f003dcd9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 1 May 2012 17:13:33 -0500 Subject: Opensearch enhancements * Add a 64x64 icon as indicated in the Opensearch specification. * Add suggestions capability and a new view providing suggestions based on package name starting with the typed value. Signed-off-by: Dan McGee --- urls.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 0f2e07af..c0ce8c6f 100644 --- a/urls.py +++ b/urls.py @@ -91,6 +91,8 @@ urlpatterns += patterns('', (r'^visualize/', include('visualize.urls')), (r'^opensearch/packages/$', 'packages.views.opensearch', {}, 'opensearch-packages'), + (r'^opensearch/packages/suggest$', 'packages.views.opensearch_suggest', + {}, 'opensearch-packages-suggest'), (r'^todolists/$','todolists.views.public_list'), ) -- cgit v1.2.3 From d5a19db526c0ef95a5166311f845719090d0f487 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 21 Jul 2012 11:06:49 -0500 Subject: Add packages.php URL redirect This was seen in Google webmaster tools. Signed-off-by: Dan McGee --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index c0ce8c6f..75ef7e52 100644 --- a/urls.py +++ b/urls.py @@ -103,6 +103,7 @@ legacy_urls = ( ('^index.php', '/'), ('^logos.php', '/art/'), ('^news.php', '/news/'), + ('^packages.php', '/packages/'), ) for old_url, new_url in legacy_urls: -- cgit v1.2.3 From 590060d1b4f7e82a0c637a5e8dc5d348431651af Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 24 Jul 2012 09:43:20 -0500 Subject: Remove no-longer needed handler imports This was finally fixed upstream in https://code.djangoproject.com/ticket/5350. Signed-off-by: Dan McGee --- urls.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 75ef7e52..65f436d3 100644 --- a/urls.py +++ b/urls.py @@ -1,7 +1,6 @@ import os.path -# Stupid Django. Don't remove these "unused" handler imports -from django.conf.urls import handler500, handler404, include, patterns +from django.conf.urls import include, patterns from django.conf import settings from django.contrib import admin -- cgit v1.2.3 From d68e00f19556be169f303da256c79431e15dd448 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 24 Jul 2012 19:56:22 -0500 Subject: Remove use of deprecated redirect_to function-based generic view We can use the class-based replacement instead. Signed-off-by: Dan McGee --- urls.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 65f436d3..d777b866 100644 --- a/urls.py +++ b/urls.py @@ -1,11 +1,8 @@ -import os.path - -from django.conf.urls import include, patterns -from django.conf import settings +from django.conf.urls import include, patterns, url from django.contrib import admin -from django.views.generic import TemplateView from django.views.decorators.cache import cache_page +from django.views.generic import TemplateView, RedirectView from django.views.i18n import null_javascript_catalog from feeds import PackageFeed, NewsFeed @@ -105,8 +102,7 @@ legacy_urls = ( ('^packages.php', '/packages/'), ) -for old_url, new_url in legacy_urls: - urlpatterns += patterns('django.views.generic.simple', - (old_url, 'redirect_to', {'url': new_url})) +urlpatterns += [url(old_url, RedirectView.as_view(url=new_url)) + for old_url, new_url in legacy_urls] # vim: set ts=4 sw=4 et: -- cgit v1.2.3 From c03b9c5f10b1695c4a099a578f19e09b33c6df10 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 31 Jul 2012 00:16:36 -0500 Subject: feeds: add all arches for repo feed If you wanted to see all updates regardless of architecture for [testing] before, there wasn't really a way to do so. Add one. Signed-off-by: Dan McGee --- urls.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index d777b866..6cbee5dc 100644 --- a/urls.py +++ b/urls.py @@ -27,6 +27,8 @@ feeds_patterns = patterns('', (r'^packages/$', cache_page(300)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/$', cache_page(300)(PackageFeed())), + (r'^packages/all/(?P[A-z0-9\-]+)/$', + cache_page(300)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', cache_page(300)(PackageFeed())), ) -- cgit v1.2.3 From 58ecb90c3f0254cdfab290234d309cad14a17723 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 30 Sep 2012 13:30:09 -0500 Subject: Add caching of sitemaps Upstream Django bug #2713 was fixed in https://github.com/django/django/commit/123f567093, so we can now enable caching of sitemaps. Signed-off-by: Dan McGee --- urls.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 6cbee5dc..f01aeecb 100644 --- a/urls.py +++ b/urls.py @@ -1,5 +1,6 @@ from django.conf.urls import include, patterns, url from django.contrib import admin +from django.contrib.sitemaps import views as sitemap_views from django.views.decorators.cache import cache_page from django.views.generic import TemplateView, RedirectView @@ -34,13 +35,13 @@ feeds_patterns = patterns('', ) # Sitemaps -urlpatterns += patterns('django.contrib.sitemaps.views', - # Thanks Django, we can't cache these longer because of - # https://code.djangoproject.com/ticket/2713 - (r'^sitemap.xml$', 'index', - {'sitemaps': our_sitemaps}), - (r'^sitemap-(?P
.+)\.xml$', 'sitemap', - {'sitemaps': our_sitemaps}), +urlpatterns += patterns('', + (r'^sitemap.xml$', + cache_page(1800)(sitemap_views.index), + {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}), + (r'^sitemap-(?P
.+)\.xml$', + cache_page(1800)(sitemap_views.sitemap), + {'sitemaps': our_sitemaps}, 'sitemaps'), ) # Authentication / Admin -- cgit v1.2.3 From 3e076596220774dcf5e32325b7d387e581e3df28 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 2 Oct 2012 06:39:55 -0500 Subject: Add a few more redirects for old links This covers more .php pages noticed in Google webmaster tools, as well as some links to former documentation. Signed-off-by: Dan McGee --- urls.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index f01aeecb..fd5ff7cf 100644 --- a/urls.py +++ b/urls.py @@ -98,11 +98,21 @@ urlpatterns += patterns('', legacy_urls = ( ('^about.php', '/about/'), ('^changelog.php', '/packages/?sort=-last_update'), + ('^devs.php', '/developers/'), + ('^donations.php', '/donate/'), ('^download.php', '/download/'), ('^index.php', '/'), ('^logos.php', '/art/'), ('^news.php', '/news/'), ('^packages.php', '/packages/'), + ('^people.php', '/developers/'), + + ('^docs/en/guide/install/arch-install-guide.html', + 'https://wiki.archlinux.org/index.php/Installation_Guide'), + ('^docs/en/', + 'https://wiki.archlinux.org/'), + ('^docs/', + 'https://wiki.archlinux.org/'), ) urlpatterns += [url(old_url, RedirectView.as_view(url=new_url)) -- cgit v1.2.3 From 45d81a9578e846062550335495dbceb82f16a1a0 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 13 Nov 2012 10:03:55 -0600 Subject: Move JSON keys view to public/ app This seems like a more appropriate place, and now the visualization is done here anyway so we should move the data backing it. Signed-off-by: Dan McGee --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index fd5ff7cf..1bdf1a58 100644 --- a/urls.py +++ b/urls.py @@ -67,6 +67,7 @@ urlpatterns += patterns('public.views', (r'^donate/$', 'donate', {}, 'page-donate'), (r'^download/$', 'download', {}, 'page-download'), (r'^master-keys/$', 'keys', {}, 'page-keys'), + (r'^master-keys/json/$', 'keys_json', {}, 'pgp-keys-json'), ) urlpatterns += patterns('retro.views', -- cgit v1.2.3 From fbc153ed456f2f4aa730580f942d10d973fd1ea9 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 19 Jan 2013 10:33:03 -0600 Subject: Initial cut of a Releases RSS feed This is our first use of enclosures on the site as well. Signed-off-by: Dan McGee --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 1bdf1a58..82882970 100644 --- a/urls.py +++ b/urls.py @@ -6,7 +6,7 @@ from django.views.decorators.cache import cache_page from django.views.generic import TemplateView, RedirectView from django.views.i18n import null_javascript_catalog -from feeds import PackageFeed, NewsFeed +from feeds import PackageFeed, NewsFeed, ReleaseFeed import sitemaps our_sitemaps = { @@ -32,6 +32,7 @@ feeds_patterns = patterns('', cache_page(300)(PackageFeed())), (r'^packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', cache_page(300)(PackageFeed())), + (r'^releases/$', cache_page(300)(ReleaseFeed())), ) # Sitemaps -- cgit v1.2.3 From a15d0850af0f766cd895b863f62524f1a1b2fe05 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 21 Jan 2013 11:08:35 -0600 Subject: Slight reorganization of urls.py Move some of the not-so-frequently used resources further down in the list of URLs, which will ever so slightly speed up the resolver. Sitemaps don't need to be checked near as often, for instance. Signed-off-by: Dan McGee --- urls.py | 77 ++++++++++++++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 34 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 82882970..97b84a36 100644 --- a/urls.py +++ b/urls.py @@ -21,38 +21,6 @@ our_sitemaps = { admin.autodiscover() urlpatterns = [] -# Feeds patterns, used later -feeds_patterns = patterns('', - (r'^$', 'public.views.feeds', {}, 'feeds-list'), - (r'^news/$', cache_page(300)(NewsFeed())), - (r'^packages/$', cache_page(300)(PackageFeed())), - (r'^packages/(?P[A-z0-9]+)/$', - cache_page(300)(PackageFeed())), - (r'^packages/all/(?P[A-z0-9\-]+)/$', - cache_page(300)(PackageFeed())), - (r'^packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', - cache_page(300)(PackageFeed())), - (r'^releases/$', cache_page(300)(ReleaseFeed())), -) - -# Sitemaps -urlpatterns += patterns('', - (r'^sitemap.xml$', - cache_page(1800)(sitemap_views.index), - {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}), - (r'^sitemap-(?P
.+)\.xml$', - cache_page(1800)(sitemap_views.sitemap), - {'sitemaps': our_sitemaps}, 'sitemaps'), -) - -# Authentication / Admin -urlpatterns += patterns('django.contrib.auth.views', - (r'^login/$', 'login', { - 'template_name': 'registration/login.html'}), - (r'^logout/$', 'logout', { - 'template_name': 'registration/logout.html'}), -) - # Public pages urlpatterns += patterns('public.views', (r'^$', 'index', {}, 'index'), @@ -71,8 +39,18 @@ urlpatterns += patterns('public.views', (r'^master-keys/json/$', 'keys_json', {}, 'pgp-keys-json'), ) -urlpatterns += patterns('retro.views', - (r'^retro/(?P[0-9]{4})/$', 'retro_homepage', {}, 'retro-homepage'), +# Feeds patterns, used below +feeds_patterns = patterns('', + (r'^$', 'public.views.feeds', {}, 'feeds-list'), + (r'^news/$', cache_page(300)(NewsFeed())), + (r'^packages/$', cache_page(300)(PackageFeed())), + (r'^packages/(?P[A-z0-9]+)/$', + cache_page(300)(PackageFeed())), + (r'^packages/all/(?P[A-z0-9\-]+)/$', + cache_page(300)(PackageFeed())), + (r'^packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', + cache_page(300)(PackageFeed())), + (r'^releases/$', cache_page(300)(ReleaseFeed())), ) # Includes and other remaining stuff @@ -97,6 +75,30 @@ urlpatterns += patterns('', (r'^todolists/$','todolists.views.public_list'), ) +# Retro home page views +urlpatterns += patterns('retro.views', + (r'^retro/(?P[0-9]{4})/$', 'retro_homepage', {}, 'retro-homepage'), +) + +# Sitemaps +urlpatterns += patterns('', + (r'^sitemap.xml$', + cache_page(1800)(sitemap_views.index), + {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}), + (r'^sitemap-(?P
.+)\.xml$', + cache_page(1800)(sitemap_views.sitemap), + {'sitemaps': our_sitemaps}, 'sitemaps'), +) + +# Authentication / Admin +urlpatterns += patterns('django.contrib.auth.views', + (r'^login/$', 'login', { + 'template_name': 'registration/login.html'}), + (r'^logout/$', 'logout', { + 'template_name': 'registration/logout.html'}), +) + +# Redirects for older known pages we see in the logs legacy_urls = ( ('^about.php', '/about/'), ('^changelog.php', '/packages/?sort=-last_update'), @@ -120,4 +122,11 @@ legacy_urls = ( urlpatterns += [url(old_url, RedirectView.as_view(url=new_url)) for old_url, new_url in legacy_urls] + +def show_urls(urllist=urlpatterns, depth=0): + for entry in urllist: + print " " * depth, entry.regex.pattern + if hasattr(entry, 'url_patterns'): + show_urls(entry.url_patterns, depth + 1) + # vim: set ts=4 sw=4 et: -- cgit v1.2.3 From 445c242dac8f7c94f5d689fa3597ac573a4863a4 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 4 Feb 2013 23:27:44 -0600 Subject: Add a releases model sitemap Signed-off-by: Dan McGee --- urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 97b84a36..e53d0012 100644 --- a/urls.py +++ b/urls.py @@ -16,6 +16,7 @@ our_sitemaps = { 'package-files': sitemaps.PackageFilesSitemap, 'package-groups': sitemaps.PackageGroupsSitemap, 'split-packages': sitemaps.SplitPackagesSitemap, + 'releases': sitemaps.ReleasesSitemap, } admin.autodiscover() -- cgit v1.2.3 From 7bf9c6e065731b414e3c1733db3b0de9105259fe Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sat, 9 Mar 2013 12:54:44 -0600 Subject: Remove /jsi18n/ view mapping We removed the last non-admin usage of this in commit e65c78055474, so it can be removed. Signed-off-by: Dan McGee --- urls.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index e53d0012..4d9db162 100644 --- a/urls.py +++ b/urls.py @@ -4,7 +4,6 @@ from django.contrib.sitemaps import views as sitemap_views from django.views.decorators.cache import cache_page from django.views.generic import TemplateView, RedirectView -from django.views.i18n import null_javascript_catalog from feeds import PackageFeed, NewsFeed, ReleaseFeed import sitemaps @@ -57,7 +56,6 @@ feeds_patterns = patterns('', # Includes and other remaining stuff urlpatterns += patterns('', # cache this static JS resource for 1 week rather than default 5 minutes - (r'^jsi18n/$', cache_page(604800)(null_javascript_catalog)), (r'^admin/', include(admin.site.urls)), (r'^devel/', include('devel.urls')), (r'^feeds/', include(feeds_patterns)), -- cgit v1.2.3 From 00b9084303ccb27f7937a9392d2a582d25a04288 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 11 Mar 2013 18:23:59 -0500 Subject: Remove public todolists view Replace this with a redirect to the developer todolist index page. Signed-off-by: Dan McGee --- urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 4d9db162..79838ce3 100644 --- a/urls.py +++ b/urls.py @@ -71,7 +71,6 @@ urlpatterns += patterns('', {}, 'opensearch-packages'), (r'^opensearch/packages/suggest$', 'packages.views.opensearch_suggest', {}, 'opensearch-packages-suggest'), - (r'^todolists/$','todolists.views.public_list'), ) # Retro home page views @@ -109,6 +108,7 @@ legacy_urls = ( ('^news.php', '/news/'), ('^packages.php', '/packages/'), ('^people.php', '/developers/'), + ('^todolists/$', '/todo/'), ('^docs/en/guide/install/arch-install-guide.html', 'https://wiki.archlinux.org/index.php/Installation_Guide'), -- cgit v1.2.3