Martinvlba/evorepo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor code to use new signoff model

Browse Source 
This moves signoff creation and display to the new packages.Signoff
model.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-07-06 12:05:19 -05:00
parent 4876a12580
commit f95abca269
4 changed files with 113 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/models.py
View File

@ -6,6 +6,7 @@
from main.utils import cache_function, make_choice
from packages.models import PackageRelation
from packages.models import Signoff as PackageSignoff
from datetime import datetime
from itertools import groupby
@ -206,16 +207,13 @@ def maintainers(self):
@property
def signoffs(self):
if 'signoffs_cache' in dir(self):
return self.signoffs_cache
self.signoffs_cache = list(Signoff.objects.filter(
pkg=self,
pkgver=self.pkgver,
pkgrel=self.pkgrel))
return self.signoffs_cache
return PackageSignoff.objects.select_related('user').filter(
pkgbase=self.pkgbase, pkgver=self.pkgver, pkgrel=self.pkgrel,
epoch=self.epoch, arch=self.arch, repo=self.repo)
def approved_for_signoff(self):
return len(self.signoffs) >= 2
count = self.signoffs.filter(revoked__isnull=True).count()
return count >= PackageSignoff.REQUIRED
@cache_function(300)
def applicable_arches(self):

2
packages/models.py
View File

@ -55,6 +55,8 @@ class Signoff(models.Model):
revoked = models.DateTimeField(null=True)
comments = models.TextField(null=True, blank=True)
REQUIRED = 2
@property
def packages(self):
# TODO: delayed import to avoid circular reference

116
packages/views.py
View File

@ -8,7 +8,7 @@
from django.core.serializers.json import DjangoJSONEncoder
from django.db.models import Q
from django.http import HttpResponse, Http404
from django.shortcuts import get_object_or_404, redirect
from django.shortcuts import get_object_or_404, get_list_or_404, redirect
from django.template import loader, Context
from django.utils import simplejson
from django.views.decorators.cache import never_cache
@ -18,15 +18,16 @@
from django.views.generic.simple import direct_to_template
from datetime import datetime
from operator import attrgetter
import string
from urllib import urlencode
from main.models import Package, PackageFile
from main.models import Arch, Repo, Signoff
from main.utils import make_choice
from main.models import Package, PackageFile, Arch, Repo
from main.utils import make_choice, groupby_preserve_order, PackageStandin
from mirrors.models import MirrorUrl
from .models import PackageRelation, PackageGroup
from .utils import get_group_info, get_differences_info, get_wrong_permissions
from .models import PackageRelation, PackageGroup, Signoff
from .utils import (get_group_info, get_differences_info,
get_wrong_permissions, get_current_signoffs)
class PackageJSONEncoder(DjangoJSONEncoder):
pkg_attributes = [ 'pkgname', 'pkgbase', 'repo', 'arch', 'pkgver',
@ -349,38 +350,101 @@ def unflag_all(request, name, repo, arch):
pkgs.update(flag_date=None)
return redirect(pkg)
class PackageSignoffGroup(object):
'''Encompasses all packages in testing with the same pkgbase.'''
def __init__(self, packages, target_repo=None, signoffs=None):
if len(packages) == 0:
raise Exception
self.packages = packages
self.target_repo = target_repo
self.signoffs = signoffs
first = packages[0]
self.pkgbase = first.pkgbase
self.arch = first.arch
self.repo = first.repo
self.version = ''
version = first.full_version
if all(version == pkg.full_version for pkg in packages):
self.version = version
@property
def package(self):
'''Try and return a relevant single package object representing this
group. Start by seeing if there is only one package, then look for the
matching package by name, finally falling back to a standin package
object.'''
if len(self.packages) == 1:
return self.packages[0]
same_pkgs = [p for p in self.packages if p.pkgname == p.pkgbase]
if same_pkgs:
return same_pkgs[0]
return PackageStandin(self.packages[0])
def find_signoffs(self, all_signoffs):
'''Look through a list of Signoff objects for ones matching this
particular group and store them on the object.'''
if self.signoffs is None:
self.signoffs = []
for s in all_signoffs:
if s.pkgbase != self.pkgbase:
continue
if self.version and not s.full_version == self.version:
continue
if s.arch_id == self.arch.id and s.repo_id == self.repo.id:
self.signoffs.append(s)
def approved(self):
if self.signoffs:
good_signoffs = [s for s in self.signoffs if not s.revoked]
return len(good_signoffs) >= Signoff.REQUIRED
return False
@permission_required('main.change_package')
@never_cache
def signoffs(request):
packages = Package.objects.select_related('arch', 'repo', 'signoffs').filter(repo__testing=True).order_by("pkgname")
package_list = []
test_pkgs = Package.objects.normal().filter(repo__testing=True)
packages = test_pkgs.order_by('pkgname')
q_pkgname = Package.objects.filter(repo__testing=True).values('pkgname').distinct().query
package_repos = Package.objects.values('pkgname', 'repo__name').exclude(repo__testing=True).filter(pkgname__in=q_pkgname)
pkgtorepo = dict()
for pr in package_repos:
pkgtorepo[pr['pkgname']] = pr['repo__name']
# Collect all pkgbase values in testing repos
q_pkgbase = test_pkgs.values('pkgbase')
package_repos = Package.objects.order_by().values_list(
'pkgbase', 'repo__name').filter(
repo__testing=False, repo__staging=False,
pkgbase__in=q_pkgbase).distinct()
pkgtorepo = dict(package_repos)
# Collect all existing signoffs for these packages
signoffs = get_current_signoffs()
same_pkgbase_key = lambda x: (x.repo.name, x.arch.name, x.pkgbase)
grouped = groupby_preserve_order(packages, same_pkgbase_key)
signoff_groups = []
for group in grouped:
signoff_group = PackageSignoffGroup(group)
signoff_group.target_repo = pkgtorepo.get(signoff_group.pkgbase,
"Unknown")
signoff_group.find_signoffs(signoffs)
signoff_groups.append(signoff_group)
signoff_groups.sort(key=attrgetter('pkgbase'))
for package in packages:
if package.pkgname in pkgtorepo:
repo = pkgtorepo[package.pkgname]
else:
repo = "Unknown"
package_list.append((package, repo))
return direct_to_template(request, 'packages/signoffs.html',
{'packages': package_list})
{'signoff_groups': signoff_groups})
@permission_required('main.change_package')
@never_cache
def signoff_package(request, name, repo, arch):
pkg = get_object_or_404(Package,
pkgname=name, repo__name__iexact=repo, arch__name=arch)
packages = get_list_or_404(Package, pkgbase=name,
arch__name=arch, repo__name__iexact=repo, repo__testing=True)
pkg = packages[0]
signoff, created = Signoff.objects.get_or_create(
pkg=pkg,
pkgver=pkg.pkgver,
pkgrel=pkg.pkgrel,
packager=request.user)
pkgbase=pkg.pkgbase, pkgver=pkg.pkgver, pkgrel=pkg.pkgrel,
epoch=pkg.epoch, arch=pkg.arch, repo=pkg.repo, user=request.user)
if request.is_ajax():
data = {

25
templates/packages/signoffs.html
View File

@ -7,13 +7,15 @@
<h2>Package Signoffs</h2>
<p>{{ packages|length }} package{{ packages|pluralize }} found.</p>
<p>{{ signoff_groups|length }} signoff group{{ signoff_groups|pluralize }} found.
A "signoff group" consists of packages grouped by pkgbase, architecture, and repository.</p>
<table id="signoffs" class="results">
<thead>
<tr>
<th>Arch</th>
<th>Package</th>
<th>Package Base</th>
<th># of Packages</th>
<th>Version</th>
<th>Last Updated</th>
<th>Target Repo</th>
@ -22,28 +24,31 @@ <h2>Package Signoffs</h2>
</tr>
</thead>
<tbody>
{% for pkg,target in packages %}
{% for group in signoff_groups %}
{% with group.package as pkg %}
<tr class="{% cycle 'odd' 'even' %}">
<td>{{ pkg.arch.name }}</td>
<td><a href="{{ pkg.get_absolute_url }}"
title="View package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
<td>{{ group.packages|length }}</td>
<td>{{ pkg.full_version }}</td>
<td>{{ pkg.last_update|date }}</td>
<td>{{ target }}</td>
<td class="signoff-{{pkg.approved_for_signoff|yesno}}">
{{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
<td>{{ group.target_repo }}</td>
<td class="signoff-{{group.approved|yesno}}">
{{ group.approved|yesno:"Yes,No" }}</td>
<td>
<ul>
<li><a class="signoff-link" href="{{ pkg.get_absolute_url }}signoff/"
title="Signoff {{pkg.pkgname}} for {{pkg.arch}}">Signoff</a>
title="Signoff {{ pkg.pkgname }} for {{ pkg.arch }}">Signoff</a>
</li>
{% for signoff in pkg.signoffs %}
<li class="signed-username" title="Signed off by {{signoff.packager}}">
{{signoff.packager}}</li>
{% for signoff in group.signoffs %}
<li class="signed-username" title="Signed off by {{ signoff.user }}">
{{ signoff.user }}{% if signoff.revoked %} (revoked){% endif %}</li>
{% endfor %}
</ul>
</td>
</tr>
{% endwith %}
{% endfor %}
</tbody>
</table>