From b6b98ecaf16db9431ed3aa8ce0edabd4e09ac284 Mon Sep 17 00:00:00 2001 From: petercat12 Date: Fri, 28 Apr 2017 16:14:09 -0500 Subject: [PATCH 1/2] add csv download url --- django_version_viewer/pip_viewer.py | 15 ++++++++++++ .../templates/version_viewer.html | 3 ++- django_version_viewer/urls.py | 1 + django_version_viewer/views.py | 23 +++++++++++++++++-- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/django_version_viewer/pip_viewer.py b/django_version_viewer/pip_viewer.py index f217da3..c42a0fd 100644 --- a/django_version_viewer/pip_viewer.py +++ b/django_version_viewer/pip_viewer.py @@ -3,6 +3,21 @@ def list_package_versions(): + """ + Returns a dict of installed pip packages + + {'package_name': "django", 'package_version': "1.8.18"} + """ installed_packages = pip.get_installed_distributions() results = [{"package_name": i.key, "package_version": i.version} for i in installed_packages] return sorted(results, key=itemgetter('package_name')) + + +def get_pip_packages_csv(writer): + """ + Takes a csv writer and writes installed pip packages to it. + """ + installed_packages = pip.get_installed_distributions() + for i in installed_packages: + writer.writerow([i.key, i.version]) + return writer diff --git a/django_version_viewer/templates/version_viewer.html b/django_version_viewer/templates/version_viewer.html index 8c66b1b..2d7a7bc 100644 --- a/django_version_viewer/templates/version_viewer.html +++ b/django_version_viewer/templates/version_viewer.html @@ -15,6 +15,7 @@

Versions

+ Download CSV
@@ -38,7 +39,7 @@

Versions

var packages; $.ajax({ type: "GET", - url: {% url "django_version_viewer" %}, + url: "{% url 'django_version_viewer' %}", csrfmiddlewaretoken: '{{ csrf_token }}', success: function(data){ packages = data; diff --git a/django_version_viewer/urls.py b/django_version_viewer/urls.py index ea076e5..30bef84 100644 --- a/django_version_viewer/urls.py +++ b/django_version_viewer/urls.py @@ -9,4 +9,5 @@ urlpatterns = [ url(r'^$', views.DjangoVersionViewer.as_view(), name='django_version_viewer'), + url(r'^csv/$', views.DjangoVersionViewerCSV.as_view(), name='django_version_viewer_csv') ] diff --git a/django_version_viewer/views.py b/django_version_viewer/views.py index e72e49d..f8b85f8 100644 --- a/django_version_viewer/views.py +++ b/django_version_viewer/views.py @@ -1,11 +1,14 @@ +import json +import csv + from pydoc import locate from django.http import HttpResponse from django.conf import settings from django.core.exceptions import PermissionDenied -from pip_viewer import list_package_versions from django.views.generic import View -import json + +from pip_viewer import list_package_versions, get_pip_packages_csv accessor_class = locate( getattr(settings, 'ACCESSOR_CLASS_PATH', 'django_version_viewer.mixins.Accessor')) @@ -19,3 +22,19 @@ def get(self, request, *args, **kwargs): raise PermissionDenied packages = list_package_versions() return HttpResponse(json.dumps(packages), status=200, content_type="application/json") + + +class DjangoVersionViewerCSV(View): + + def get(self, request, *args, **kwargs): + if not accessor.allow_access(request): + raise PermissionDenied + response = HttpResponse(content_type='text/csv') + response['Content-Disposition'] = 'attachment; filename="pip_package_versions.csv"' + + fieldnames = ['Package Name', 'Package Version'] + writer = csv.writer(response) + + writer.writerow(fieldnames) + get_pip_packages_csv(writer) + return response From d8ceae74eb556fe046a292e74eb4ba506797f816 Mon Sep 17 00:00:00 2001 From: petercat12 Date: Fri, 28 Apr 2017 16:35:34 -0500 Subject: [PATCH 2/2] extend base_site instead. --- example18/templates/admin/base.html | 92 ------------------------ example18/templates/admin/base_site.html | 11 +++ 2 files changed, 11 insertions(+), 92 deletions(-) delete mode 100644 example18/templates/admin/base.html create mode 100644 example18/templates/admin/base_site.html diff --git a/example18/templates/admin/base.html b/example18/templates/admin/base.html deleted file mode 100644 index f60f3d5..0000000 --- a/example18/templates/admin/base.html +++ /dev/null @@ -1,92 +0,0 @@ -{% load i18n admin_static pip_version_viewer_tags %} -{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} - - -{% block title %}{% endblock %} - - -{% block extrastyle %}{% endblock %} - -{% if LANGUAGE_BIDI %}{% endif %} - - - - -{% block extrahead %}{% endblock %} -{% block blockbots %}{% endblock %} - -{% load i18n %} - - - - -
- {% if not is_popup %} - - - - {% block breadcrumbs %} -
- {% trans 'Home' %} - {% if title %} › {{ title }}{% endif %} -
- {% endblock %} - {% endif %} - - {% block messages %} - {% if messages %} -
    {% for message in messages %} - {{ message|capfirst }} - {% endfor %}
- {% endif %} - {% endblock messages %} - - -
- {% block pretitle %}{% show_pip_package_versions %}{% endblock %} - {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} - {% block content %} - {% block object-tools %}{% endblock %} - {{ content }} - {% endblock %} - {% block sidebar %}{% endblock %} -
-
- - - {% block footer %}{% endblock %} -
- - - - diff --git a/example18/templates/admin/base_site.html b/example18/templates/admin/base_site.html new file mode 100644 index 0000000..5a012bd --- /dev/null +++ b/example18/templates/admin/base_site.html @@ -0,0 +1,11 @@ +{% extends "admin/base.html" %} +{% load i18n pip_version_viewer_tags %} + +{% block extrahead %} + + + +{% endblock %} +{% block pretitle %} + {% show_pip_package_versions %} +{% endblock %}