Minor club fixes.

[wolnelektury.git] / src / catalogue / management / commands / checkintegrity.py

diff --git a/src/catalogue/management/commands/checkintegrity.py b/src/catalogue/management/commands/checkintegrity.py
index 6ae2b9a..e7d5ffd 100644 (file)
--- a/src/catalogue/management/commands/checkintegrity.py
+++ b/src/catalogue/management/commands/checkintegrity.py
@@ -1,46 +1,48 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from optparse import make_option

 from django.core.management.base import BaseCommand
 from django.core.management.base import BaseCommand

-
+from librarian import ParseError

 from catalogue.models import Book
 
 
 class Command(BaseCommand):
 from catalogue.models import Book
 
 
 class Command(BaseCommand):

-    option_list = BaseCommand.option_list + (
-        make_option('-q', '--quiet', action='store_false', dest='verbose', default=True,
-            help='Suppress output'),
-        make_option('-d', '--dry-run', action='store_true', dest='dry_run', default=False,
-            help="Just check for problems, don't fix them"),
-    )

     help = 'Checks integrity of catalogue data.'
 
     help = 'Checks integrity of catalogue data.'
 

+    def add_arguments(self, parser):
+        parser.add_argument(
+                '-q', '--quiet', action='store_false', dest='verbose',
+                default=True, help='Suppress output')
+        parser.add_argument(
+                '-d', '--dry-run', action='store_true', dest='dry_run',
+                default=False, help="Just check for problems, don't fix them")
+

     def handle(self, **options):
         from django.db import transaction
 
         verbose = options['verbose']
 
     def handle(self, **options):
         from django.db import transaction
 
         verbose = options['verbose']
 

-        with transaction.commit_on_success():
+        with transaction.atomic():

             for book in Book.objects.all().iterator():
                 try:
                     info = book.wldocument().book_info
             for book in Book.objects.all().iterator():
                 try:
                     info = book.wldocument().book_info

-                except:
+                except ParseError:

                     if verbose:
                     if verbose:

-                        print "ERROR! Bad XML for book:", book.slug
-                        print "To resolve: republish."
-                        print
+                        print("ERROR! Bad XML for book:", book.slug)
+                        print("To resolve: republish.")
+                        print()

                 else:
                     should_be = [p.slug for p in info.parts]
                     is_now = [p.slug for p in book.children.all().order_by('parent_number')]
                     if should_be != is_now:
                         if verbose:
                 else:
                     should_be = [p.slug for p in info.parts]
                     is_now = [p.slug for p in book.children.all().order_by('parent_number')]
                     if should_be != is_now:
                         if verbose:

-                            print "ERROR! Wrong children for book:", book.slug
-                            print "Is:       ", is_now
-                            print "Should be:", should_be
-                            print "To resolve: republish parent book."
-                            print
+                            print("ERROR! Wrong children for book:", book.slug)
+                            # print("Is:       ", is_now)
+                            # print("Should be:", should_be)
+                            from difflib import ndiff
+                            print('\n'.join(ndiff(is_now, should_be)))
+                            print("To resolve: republish parent book.")
+                            print()

 
                 # Check for ancestry.
                 parents = []
 
                 # Check for ancestry.
                 parents = []


@@ -51,14 +53,14 @@ class Command(BaseCommand):
                 ancestors = list(book.ancestor.all())
                 if set(ancestors) != set(parents):
                     if options['verbose']:
                 ancestors = list(book.ancestor.all())
                 if set(ancestors) != set(parents):
                     if options['verbose']:

-                        print "Wrong ancestry for book:", book
-                        print "Is:       ", ", ".join(ancestors)
-                        print "Should be:", ", ".join(parents)
+                        print("Wrong ancestry for book:", book)
+                        print("Is:       ", ", ".join(ancestors))
+                        print("Should be:", ", ".join(parents))

                     if not options['dry_run']:
                         book.repopulate_ancestors()
                         if options['verbose']:
                     if not options['dry_run']:
                         book.repopulate_ancestors()
                         if options['verbose']:

-                            print "Fixed."
+                            print("Fixed.")

                     if options['verbose']:
                     if options['verbose']:

-                        print
+                        print()

 
                 # TODO: check metadata tags, reset counters
 
                 # TODO: check metadata tags, reset counters