X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/e785f561e82f8230697ffe100139eb1270eb1311..cb6c9228e7b05a7c0913956ecdc08c9047fb4690:/catalogue/management/commands/importlessons.py diff --git a/catalogue/management/commands/importlessons.py b/catalogue/management/commands/importlessons.py index 3bd05ad..e4c09e6 100755 --- a/catalogue/management/commands/importlessons.py +++ b/catalogue/management/commands/importlessons.py @@ -4,27 +4,26 @@ # import os import sys -import time from optparse import make_option -from django.conf import settings + from django.core.management.base import BaseCommand from django.core.management.color import color_style -from django.core.files import File +from django.db import transaction -from librarian import IOFile from catalogue.models import Lesson, Section +from librarian import IOFile -#from search import Index +# from search import Index class Command(BaseCommand): option_list = BaseCommand.option_list + ( make_option('-q', '--quiet', action='store_false', dest='verbose', default=True, - help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'), + help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'), make_option('-a', '--attachments', dest='attachments', metavar="PATH", default='materialy', - help='Attachments dir path.'), + help='Attachments dir path.'), make_option('--ignore-incomplete', action='store_true', dest='ignore_incomplete', default=False, - help='Attachments dir path.'), + help='Attachments dir path.'), ) help = 'Imports lessons from the specified directories.' args = 'directory [directory ...]' @@ -52,9 +51,8 @@ class Command(BaseCommand): read_dir(path) return files - + @transaction.atomic def handle(self, *directories, **options): - from django.db import connection, transaction levels = set() self.style = color_style() @@ -62,17 +60,6 @@ class Command(BaseCommand): verbose = options.get('verbose') self.curdir = os.path.abspath(os.curdir) - - # Start transaction management. - # SQLite will choke on generating thumbnails - use_transaction = not connection.features.autocommits_when_autocommit_is_off - if use_transaction: - transaction.commit_unless_managed() - transaction.enter_transaction_management() - transaction.managed(True) - else: - print 'WARNING: Not using transaction management.' - files_imported = 0 files_skipped = 0 @@ -105,8 +92,9 @@ class Command(BaseCommand): # Import book files try: - lesson = self.import_book(file_path, options, attachments, - ignore_incomplete=file_name in ignore_incomplete) + lesson = self.import_book( + file_path, options, attachments, + ignore_incomplete=file_name in ignore_incomplete) except Section.IncompleteError, e: if file_name not in postponed or postponed[file_name] < files_imported: # Push it back into the queue, maybe the missing lessons will show up. @@ -121,21 +109,18 @@ class Command(BaseCommand): else: # We're in a loop, nothing's being imported - some lesson is really missing. raise e - except BaseException, e: + except BaseException: import traceback traceback.print_exc() files_skipped += 1 else: files_imported += 1 - if use_transaction: - transaction.commit() if hasattr(lesson, 'level'): levels.add(lesson.level) finally: if verbose > 0: print - if levels: print "Rebuilding level packages:" for level in levels: @@ -147,7 +132,3 @@ class Command(BaseCommand): print "Results: %d files imported, %d skipped, %d total." % ( files_imported, files_skipped, files_imported + files_skipped) print - - if use_transaction: - transaction.commit() - transaction.leave_transaction_management()