Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions devel/tests/test_reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,18 @@ def test_reports_mismatched_signature(self):
def test_reports_signature_time(self):
response = self.client.get('/devel/reports/signature-time', follow=True)
self.assertEqual(response.status_code, 200)

def test_reports_pkgbases(self):
response = self.client.get('/devel/reports/old/pkgbases/')
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/plain')

def test_reports_pkgbases_with_username(self):
response = self.client.get(
f'/devel/reports/uncompressed-man/{self.user.username}/pkgbases/')
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'text/plain')

def test_reports_pkgbases_invalid_report(self):
response = self.client.get('/devel/reports/nonexistent/pkgbases/')
self.assertEqual(response.status_code, 404)
3 changes: 3 additions & 0 deletions devel/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
path('stats/', views.stats, name='devel-stats'),
path('newuser/', views.new_user_form),
path('profile/', views.change_profile),
re_path(r'^reports/(?P<report_name>.*)/(?P<username>.*)/pkgbases/$',
views.report_pkgbases),
re_path(r'^reports/(?P<report_name>.*)/pkgbases/$', views.report_pkgbases),
re_path(r'^reports/(?P<report_name>.*)/(?P<username>.*)/$', views.report),
re_path(r'^reports/(?P<report_name>.*)/$', views.report),
]
Expand Down
27 changes: 22 additions & 5 deletions devel/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,27 @@ def change_profile(request):
'profile_form': profile_form})


def get_report_packages(report, username):
packages = Package.objects.normal()
if report.slug in ('uncompressed-man', 'uncompressed-info'):
packages = report.packages(packages, username)
else:
packages = report.packages(packages)
Comment thread
jelly marked this conversation as resolved.

return packages


@login_required
def report_pkgbases(request, report_name: str, username: str | None = None) -> HttpResponse:
report = {report.slug: report for report in available_reports()}.get(report_name, None)
if report is None:
raise Http404

packages = get_report_packages(report, username)
pkgbases = sorted({pkg.pkgbase for pkg in packages})
return HttpResponse('\n'.join(pkgbases), content_type='text/plain')


@login_required
def report(request, report_name, username=None):
available = {report.slug: report for report in available_reports()}
Expand All @@ -283,11 +304,7 @@ def report(request, report_name, username=None):
maints = User.objects.filter(id__in=PackageRelation.objects.filter(
type=PackageRelation.MAINTAINER).values('user'))

if report.slug == 'uncompressed-man' or report.slug == 'uncompressed-info':
packages = report.packages(packages, username)
else:
packages = report.packages(packages)

packages = get_report_packages(report, username)
arches = {pkg.arch for pkg in packages}
repos = {pkg.repo for pkg in packages}
context = {
Expand Down
3 changes: 3 additions & 0 deletions templates/devel/packages.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ <h2>{{ title }}{% if maintainer %},
{% if maintainer %}This report only includes packages maintained by
{{ maintainer.get_full_name }} ({{ maintainer.username }}).{% endif %}
</p>
<p>
<a href="pkgbases">Link to list of pkgbases values</a>
</p>

<div class="box filter-criteria">
<h3>Filter Packages</h3>
Expand Down
Loading