summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-02-22 15:29:08 -0600
committerDan McGee <dan@archlinux.org>2011-02-22 15:29:10 -0600
commitb9fdcd06222c674d5fabcf5a4ab6bc55f268c757 (patch)
tree25a831e55a792b452526cfd035486230ff0b9102 /urls.py
parent330048eab6cf9bacf2d7bb436a101a3b7469aca7 (diff)
downloadarchweb-b9fdcd06222c674d5fabcf5a4ab6bc55f268c757.tar.gz
archweb-b9fdcd06222c674d5fabcf5a4ab6bc55f268c757.zip
Modularize URLs
Make some additional URL config files that can be included so we aren't trying to do so much in the top level config. This also allows us to branch a bit more rather than go linear down the rather lengthy list. Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py65
1 files changed, 24 insertions, 41 deletions
diff --git a/urls.py b/urls.py
index f18500fd..da937666 100644
--- a/urls.py
+++ b/urls.py
@@ -17,47 +17,24 @@ sitemaps = {
}
admin.autodiscover()
-
-urlpatterns = patterns('packages.views',
- (r'^groups/$', 'groups'),
- (r'^groups/(?P<arch>[A-z0-9]+)/$', 'groups'),
- (r'^groups/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$',
- 'group_details'),
-
- (r'^opensearch/packages/$', 'opensearch', {}, 'opensearch-packages'),
-)
-
-urlpatterns += patterns('todolists.views',
- (r'^todolists/$', 'public_list'),
-)
-
-urlpatterns += patterns('mirrors.views',
- (r'^mirrors/status/$', 'status', {}, 'mirror-status'),
- (r'^mirrors/status/json/$', 'status_json', {}, 'mirror-status-json'),
-
- (r'^mirrors/$', 'mirrors', {}, 'mirrors-list'),
- (r'^mirrors/(?P<name>[\.\-\w]+)/$', 'mirror_details'),
-
- (r'^mirrorlist/$', 'generate_mirrorlist', {}, 'mirrorlist'),
- (r'^mirrorlist/all/$', 'find_mirrors', {'countries': ['all']}),
- (r'^mirrorlist/all/ftp/$', 'find_mirrors',
- {'countries': ['all'], 'protocols': ['ftp']}),
- (r'^mirrorlist/all/http/$', 'find_mirrors',
- {'countries': ['all'], 'protocols': ['http']}),
-)
-
-# Feeds and sitemaps
-urlpatterns += patterns('',
- (r'^feeds/$', 'public.views.feeds', {}, 'feeds-list'),
- (r'^feeds/news/$', NewsFeed()),
- (r'^feeds/packages/$', PackageFeed()),
- (r'^feeds/packages/(?P<arch>[A-z0-9]+)/$',
+urlpatterns = []
+
+# Feeds patterns, used later
+feeds_patterns = patterns('',
+ (r'^$', 'public.views.feeds', {}, 'feeds-list'),
+ (r'^news/$', NewsFeed()),
+ (r'^packages/$', PackageFeed()),
+ (r'^packages/(?P<arch>[A-z0-9]+)/$',
PackageFeed()),
- (r'^feeds/packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
+ (r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
PackageFeed()),
- (r'^sitemap.xml$', 'django.contrib.sitemaps.views.index',
+)
+
+# Sitemaps
+urlpatterns += patterns('django.contrib.sitemaps.views',
+ (r'^sitemap.xml$', 'index',
{'sitemaps': sitemaps}),
- (r'^sitemap-(?P<section>.+)\.xml$', 'django.contrib.sitemaps.views.sitemap',
+ (r'^sitemap-(?P<section>.+)\.xml$', 'sitemap',
{'sitemaps': sitemaps}),
)
@@ -88,13 +65,19 @@ urlpatterns += patterns('public.views',
# Includes and other remaining stuff
urlpatterns += patterns('',
- (r'^admin/', include(admin.site.urls)),
- (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'),
-
+ (r'^jsi18n/$', 'django.views.i18n.null_javascript_catalog'),
+ (r'^admin/', include(admin.site.urls)),
(r'^devel/', include('devel.urls')),
+ (r'^feeds/', include(feeds_patterns)),
+ (r'^groups/', include('packages.urls_groups')),
+ (r'^mirrorlist/',include('mirrors.urls_mirrorlist')),
+ (r'^mirrors/', include('mirrors.urls')),
(r'^news/', include('news.urls')),
(r'^packages/', include('packages.urls')),
(r'^todo/', include('todolists.urls')),
+ (r'^opensearch/packages/$', 'packages.views.opensearch',
+ {}, 'opensearch-packages'),
+ (r'^todolists/$','todolists.views.public_list'),
)
if settings.DEBUG == True: