Merge lp:~dholbach/developer-ubuntu-com/fix-consistency-command into lp:developer-ubuntu-com

[Daniel Holbach]

Traceback (most recent call last):
  File "manage.py", line 10, in <module>
    execute_from_command_line(sys.argv)
  File "/usr/local/lib/python2.7/dist-packages/django/core/management/__init__.py", line 354, in execute_from_command_line
    utility.execute()
  File "/usr/local/lib/python2.7/dist-packages/django/core/management/__init__.py", line 346, in execute
    self.fetch_command(subcommand).run_from_argv(self.argv)
  File "/usr/local/lib/python2.7/dist-packages/django/core/management/base.py", line 394, in run_from_argv
    self.execute(*args, **cmd_options)
  File "/usr/local/lib/python2.7/dist-packages/django/core/management/base.py", line 445, in execute
    output = self.handle(*args, **options)
  File "/srv/devportal-app-0/code/182/developer_portal/management/commands/check-consistency.py", line 52, in handle
    pages = find_duplicates_pages()
  File "/srv/devportal-app-0/code/182/developer_portal/management/commands/check-consistency.py", line 14, in find_duplicates_pages
    urls = [p.get_absolute_url() for p in Page.objects.all()]
  File "/usr/local/lib/python2.7/dist-packages/cms/models/pagemodel.py", line 160, in get_absolute_url
    return reverse('pages-details-by-slug', kwargs={"slug": path})
  File "/usr/local/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 578, in reverse
    return force_text(iri_to_uri(resolver._reverse_with_prefix(view, prefix, *args, **kwargs)))
  File "/usr/local/lib/python2.7/dist-packages/django/core/urlresolvers.py", line 495, in _reverse_with_prefix
    (lookup_view_s, args, kwargs, len(patterns), patterns))
django.core.urlresolvers.NoReverseMatch: Reverse for 'pages-details-by-slug' with arguments '()' and keyword arguments '{'slug': ''}' not found. 1 pattern(s) tried: [u'None/(?P<slug>[0-9A-Za-z-_.//]+)/$']
Traceback (most recent call last):
  File "./run.py", line 30, in <module>
    subprocess.check_call(' '.join(sys.argv[1:]), env=env, shell=True)
  File "/usr/lib/python2.7/subprocess.py", line 540, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command 'python manage.py check-consistency' returned non-zero exit status 1

[lp:~dholbach/developer-ubuntu-com/fix-consistency-command]

226. By Daniel Holbach on 2016-05-25

fix order of delete/print to make sense

227. By Daniel Holbach on 2016-06-02

use new argparse-style api

228. By Daniel Holbach on 2016-06-03

only recommend --delete if actual broken pages were found

229. By Daniel Holbach on 2016-06-03

be more careful about finding URLs, make pep8 happy

230. By Daniel Holbach on 2016-06-06

re-use determined value for url

231. By Daniel Holbach on 2016-06-06

add divider lines, when looking for duplicate pages, separate drafts and public pages

232. By Daniel Holbach on 2016-06-06

fix delete_pages part

Unmerged revisions

232. By Daniel Holbach on 2016-06-06

fix delete_pages part

231. By Daniel Holbach on 2016-06-06

add divider lines, when looking for duplicate pages, separate drafts and public pages

230. By Daniel Holbach on 2016-06-06

re-use determined value for url

229. By Daniel Holbach on 2016-06-03

be more careful about finding URLs, make pep8 happy

228. By Daniel Holbach on 2016-06-03

only recommend --delete if actual broken pages were found

227. By Daniel Holbach on 2016-06-02

use new argparse-style api

226. By Daniel Holbach on 2016-05-25

fix order of delete/print to make sense

225. By Daniel Holbach on 2016-05-25

find pages with broken slugs, ie '', which let p.get_absolute_url() explode

=== modified file 'developer_portal/management/commands/check-consistency.py'
--- developer_portal/management/commands/check-consistency.py	2016-05-19 20:23:16 +0000
+++ developer_portal/management/commands/check-consistency.py	2016-06-06 14:12:57 +0000
@@ -1,6 +1,5 @@
-from optparse import make_option
-
 from django.core.management.base import BaseCommand
+from django.core.urlresolvers import NoReverseMatch
 
 from cms.models import Page
 
@@ -10,23 +9,47 @@
             if not hasattr(p, 'publisher_draft')]
 
 
-def find_duplicates_pages():
-    urls = [p.get_absolute_url() for p in Page.objects.all()]
-    return [p for p in Page.objects.all()
-            if urls.count(p.get_absolute_url()) == 2]
+def find_pages_with_broken_slugs():
+    page_ids = set()
+    for p in Page.objects.all():
+        try:
+            url = p.get_absolute_url()
+        except NoReverseMatch:
+            page_ids.add(p.pk)
+    return Page.objects.filter(pk__in=page_ids)
+
+
+def find_duplicates_pages(draft=False):
+    urls = []
+    for p in Page.objects.filter(publisher_is_draft=draft):
+        try:
+            url = p.get_absolute_url()
+        except NoReverseMatch:
+            url = p.get_slug()
+        urls += [url]
+    return [p for p in Page.objects.filter(publisher_is_draft=draft)
+            if urls.count(url) == 2]
 
 
 def print_pages(pages):
     for p in pages:
-        print('{} ({})'.format
-              (p.get_absolute_url(),
+        try:
+            url = p.get_absolute_url()
+        except NoReverseMatch:
+            url = p.get_slug()
+        print('{}: {} ({})'.format
+              (p.pk, url,
                'Draft' if p.publisher_is_draft else 'Public'))
 
 
 def delete_pages(pages):
     for p in pages:
+        try:
+            url = p.get_absolute_url()
+        except NoReverseMatch:
+            url = p.get_slug()
         print('Deleting page: {} ({})'.format
-              (p.get_absolute_url(),
+              (url,
                'Draft' if p.publisher_is_draft else 'Public'))
         p.delete()
 
@@ -34,28 +57,53 @@
 class Command(BaseCommand):
     help = "Make sure the CMS database is consistent."
 
-    option_list = BaseCommand.option_list + (
-        make_option(
-            '--delete', action='store_true', dest='delete',
-            default=True, help='Delete broken and inconsistent entries.'),
-    )
+    def add_arguments(self, parser):
+        parser.add_argument(
+            '--delete',
+            action='store_true',
+            dest='delete',
+            default=False,
+            help='Delete broken and inconsistent entries.')
 
     def handle(self, *args, **options):
+        print('-----------------------------')
+        found = False
         pages = find_pages_without_publisher_draft()
         print('Pages without .publisher_draft: {}'.format(len(pages)))
         if pages:
-            if options['delete']:
-                print_pages(pages)
-            else:
-                delete_pages(pages)
-
-        pages = find_duplicates_pages()
-        print('Duplicate pages: {}'.format(len(pages)))
-        if pages:
-            print_pages(pages)
-            if options['delete']:
-                print('Please remove them manually.')
-
-        if not options['delete']:
+            found = True
+            if options['delete']:
+                delete_pages(pages)
+            else:
+                print_pages(pages)
+
+        print('-----------------------------')
+        pages = find_pages_with_broken_slugs()
+        print('Pages with broken slugs: {}'.format(len(pages)))
+        if pages:
+            found = True
+            if options['delete']:
+                delete_pages(pages)
+            else:
+                print_pages(pages)
+
+        print('-----------------------------')
+        pages = find_duplicates_pages(draft=False)
+        print('Duplicate public pages: {}'.format(len(pages)))
+        if pages:
+            print_pages(pages)
+            if options['delete']:
+                print('Please remove them manually.')
+
+        print('-----------------------------')
+        pages = find_duplicates_pages(draft=True)
+        print('Duplicate draft pages: {}'.format(len(pages)))
+        if pages:
+            print_pages(pages)
+            if options['delete']:
+                print('Please remove them manually.')
+
+        if found and not options['delete']:
+            print('-----------------------------')
             print('If you want any inconsistencies fixed, please re-run this '
                   'command with the --delete option.')