summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--releng/admin.py3
-rw-r--r--releng/management/commands/syncisos.py11
2 files changed, 9 insertions, 5 deletions
diff --git a/releng/admin.py b/releng/admin.py
index 3d3e7c0b..be5e211f 100644
--- a/releng/admin.py
+++ b/releng/admin.py
@@ -9,7 +9,8 @@ class IsoAdmin(admin.ModelAdmin):
list_filter = ('active',)
class TestAdmin(admin.ModelAdmin):
- list_display = ('user_name', 'user_email', 'created', 'ip_address', 'iso', 'success')
+ list_display = ('user_name', 'user_email', 'created', 'ip_address',
+ 'iso', 'success')
list_filter = ('success', 'iso')
diff --git a/releng/management/commands/syncisos.py b/releng/management/commands/syncisos.py
index 247b01cd..ba174131 100644
--- a/releng/management/commands/syncisos.py
+++ b/releng/management/commands/syncisos.py
@@ -19,7 +19,7 @@ class IsoListParser(HTMLParser):
for name, value in attrs:
if name == "href":
if value != '../' and self.url_re.search(value) != None:
- self.hyperlinks.append(value[:len(value)-1])
+ self.hyperlinks.append(value[:-1])
def parse(self, url):
try:
@@ -38,11 +38,14 @@ class Command(BaseCommand):
def handle(self, *args, **options):
parser = IsoListParser()
isonames = Iso.objects.values_list('name', flat=True)
- new_isos = parser.parse(settings.ISO_LIST_URL)
+ active_isos = parser.parse(settings.ISO_LIST_URL)
- for iso in new_isos:
+ # create any names that don't already exist
+ for iso in active_isos:
if iso not in isonames:
- new = Iso(name=iso)
+ new = Iso(name=iso, active=True)
new.save()
+ # and then mark all other names as no longer active
+ Iso.objects.exclude(name__in=active_isos).update(active=False)
# vim: set ts=4 sw=4 et: