fix in comments

[edumed.git] / catalogue / management / commands / importlessons.py

diff --git a/catalogue/management/commands/importlessons.py b/catalogue/management/commands/importlessons.py
index 4e7a38c..e4c09e6 100755 (executable)
--- a/catalogue/management/commands/importlessons.py
+++ b/catalogue/management/commands/importlessons.py
@@ -4,34 +4,35 @@
 #
 import os
 import sys
 #
 import os
 import sys

-import time

 from optparse import make_option
 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.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 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,
 
 
 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',
         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 = 'Imports lessons from the specified directories.'
     args = 'directory [directory ...]'
 
     )
     help = 'Imports lessons from the specified directories.'
     args = 'directory [directory ...]'
 

-    def import_book(self, file_path, options, attachments):
+    def import_book(self, file_path, options, attachments, ignore_incomplete=False):

         verbose = options.get('verbose')
         iofile = IOFile.from_filename(os.path.join(self.curdir, file_path))
         iofile.attachments = attachments
         verbose = options.get('verbose')
         iofile = IOFile.from_filename(os.path.join(self.curdir, file_path))
         iofile.attachments = attachments

-        lesson = Lesson.publish(iofile)
+        return Lesson.publish(iofile, ignore_incomplete)

 
     @staticmethod
     def all_attachments(path):
 
     @staticmethod
     def all_attachments(path):


@@ -44,27 +45,21 @@ class Command(BaseCommand):
                     read_dir(fullname)
                 else:
                     f = IOFile.from_filename(fullname)
                     read_dir(fullname)
                 else:
                     f = IOFile.from_filename(fullname)

-                    files[name] = f
-                    files.setdefault(name.replace(" ", ""), f)
+                    files[name.decode('utf-8')] = f
+                    files.setdefault(name.replace(" ", "").decode('utf-8'), f)

 
         read_dir(path)
         return files
 
 
         read_dir(path)
         return files
 

-
+    @transaction.atomic

     def handle(self, *directories, **options):
     def handle(self, *directories, **options):

-        from django.db import transaction

 
 

+        levels = set()

         self.style = color_style()
         
         verbose = options.get('verbose')
         self.curdir = os.path.abspath(os.curdir)
 
         self.style = color_style()
         
         verbose = options.get('verbose')
         self.curdir = os.path.abspath(os.curdir)
 

-
-        # Start transaction management.
-        transaction.commit_unless_managed()
-        transaction.enter_transaction_management()
-        transaction.managed(True)
-

         files_imported = 0
         files_skipped = 0
 
         files_imported = 0
         files_skipped = 0
 


@@ -79,6 +74,7 @@ class Command(BaseCommand):
                 # files queue
                 files = sorted(os.listdir(abs_dir))
                 postponed = {}
                 # files queue
                 files = sorted(os.listdir(abs_dir))
                 postponed = {}

+                ignore_incomplete = set()

                 while files:
                     file_name = files.pop(0)
                     file_path = os.path.join(abs_dir, file_name)
                 while files:
                     file_name = files.pop(0)
                     file_path = os.path.join(abs_dir, file_name)


@@ -96,9 +92,9 @@ class Command(BaseCommand):
 
                     # Import book files
                     try:
 
                     # Import book files
                     try:

-                        self.import_book(file_path, options, attachments)
-                        files_imported += 1
-                        transaction.commit()
+                        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.
                     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.


@@ -106,19 +102,33 @@ class Command(BaseCommand):
                                 print self.style.NOTICE('Waiting for missing lessons.')
                             files.append(file_name)
                             postponed[file_name] = files_imported
                                 print self.style.NOTICE('Waiting for missing lessons.')
                             files.append(file_name)
                             postponed[file_name] = files_imported

+                        elif options['ignore_incomplete'] and file_name not in ignore_incomplete:
+                            files.append(file_name)
+                            ignore_incomplete.add(file_name)
+                            postponed[file_name] = files_imported

                         else:
                             # We're in a loop, nothing's being imported - some lesson is really missing.
                             raise e
                         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
                         import traceback
                         traceback.print_exc()
                         files_skipped += 1

+                    else:
+                        files_imported += 1
+                        if hasattr(lesson, 'level'):
+                            levels.add(lesson.level)
+                    finally:
+                        if verbose > 0:
+                            print
+
+        if levels:
+            print "Rebuilding level packages:"
+            for level in levels:
+                print level.name
+                level.build_packages()

 
         # Print results
         print
         print "Results: %d files imported, %d skipped, %d total." % (
             files_imported, files_skipped, files_imported + files_skipped)
         print
 
         # Print results
         print
         print "Results: %d files imported, %d skipped, %d total." % (
             files_imported, files_skipped, files_imported + files_skipped)
         print

-
-        transaction.commit()
-        transaction.leave_transaction_management()