from django.core.management.base import BaseCommand
from django.core.management.color import color_style
from django.core.files import File
-from catalogue.utils import trim_query_log
from librarian.picture import ImageStore
from wolnelektury_core.management.profile import profile
from catalogue.models import Book
from picture.models import Picture
-from search import Index
+from search.index import Index
class Command(BaseCommand):
for ebook_format in Book.ebook_formats:
if os.path.isfile(file_base + '.' + ebook_format):
getattr(book, '%s_file' % ebook_format).save(
- '%s.%s' % (book.slug, ebook_format),
+ '%s.%s' % (book.slug, ebook_format),
File(file(file_base + '.' + ebook_format)),
save=False
)
image_store = ImageStore(os.path.dirname(file_path))
picture = Picture.from_xml_file(file_path, image_store=image_store, overwrite=options.get('force'))
except Exception, ex:
- if continue_on_error:
+ if continue_on_error:
print "%s: %s" % (file_path, ex)
return
else:
from django.db import transaction
self.style = color_style()
-
+
verbose = options.get('verbose')
- force = options.get('force')
- show_traceback = options.get('traceback', False)
import_picture = options.get('import_picture')
wait_until = None
raise e
# Start transaction management.
- transaction.commit_unless_managed()
- transaction.enter_transaction_management()
- transaction.managed(True)
-
- files_imported = 0
- files_skipped = 0
-
- for dir_name in directories:
- if not os.path.isdir(dir_name):
- print self.style.ERROR("%s: Not a directory. Skipping." % dir_name)
- else:
- # files queue
- files = sorted(os.listdir(dir_name))
- postponed = {}
- while files:
- trim_query_log(0)
- file_name = files.pop(0)
- file_path = os.path.join(dir_name, file_name)
- file_base, ext = os.path.splitext(file_path)
-
- # Skip files that are not XML files
- if not ext == '.xml':
- continue
-
- if verbose > 0:
- print "Parsing '%s'" % file_path
- else:
- sys.stdout.write('.')
- sys.stdout.flush()
-
- # Import book files
- try:
- if import_picture:
- self.import_picture(file_path, options)
- else:
- self.import_book(file_path, options)
-
- files_imported += 1
- transaction.commit()
-
- except (Book.AlreadyExists, Picture.AlreadyExists):
- print self.style.ERROR('%s: Book or Picture already imported. Skipping. To overwrite use --force.' %
- file_path)
- files_skipped += 1
-
- except Book.DoesNotExist, e:
- if file_name not in postponed or postponed[file_name] < files_imported:
- # push it back into the queue, maybe the missing child will show up
- if verbose:
- print self.style.NOTICE('Waiting for missing children')
- files.append(file_name)
- postponed[file_name] = files_imported
+ with transaction.atomic():
+
+ files_imported = 0
+ files_skipped = 0
+
+ for dir_name in directories:
+ if not os.path.isdir(dir_name):
+ print self.style.ERROR("%s: Not a directory. Skipping." % dir_name)
+ else:
+ # files queue
+ files = sorted(os.listdir(dir_name))
+ postponed = {}
+ while files:
+ file_name = files.pop(0)
+ file_path = os.path.join(dir_name, file_name)
+ file_base, ext = os.path.splitext(file_path)
+
+ # Skip files that are not XML files
+ if not ext == '.xml':
+ continue
+
+ if verbose > 0:
+ print "Parsing '%s'" % file_path
else:
- # we're in a loop, nothing's being imported - some child is really missing
- raise e
-
- # Print results
- print
- print "Results: %d files imported, %d skipped, %d total." % (
- files_imported, files_skipped, files_imported + files_skipped)
- print
-
- if wait_until:
- print 'Waiting...'
- try:
- time.sleep(wait_until - time.time())
- except IOError:
- print "it's already too late"
-
- transaction.commit()
- transaction.leave_transaction_management()
+ sys.stdout.write('.')
+ sys.stdout.flush()
+
+ # Import book files
+ try:
+ if import_picture:
+ self.import_picture(file_path, options)
+ else:
+ self.import_book(file_path, options)
+
+ files_imported += 1
+
+ except (Book.AlreadyExists, Picture.AlreadyExists):
+ print self.style.ERROR('%s: Book or Picture already imported. Skipping. To overwrite use --force.' %
+ file_path)
+ files_skipped += 1
+
+ except Book.DoesNotExist, e:
+ if file_name not in postponed or postponed[file_name] < files_imported:
+ # push it back into the queue, maybe the missing child will show up
+ if verbose:
+ print self.style.NOTICE('Waiting for missing children')
+ files.append(file_name)
+ postponed[file_name] = files_imported
+ else:
+ # we're in a loop, nothing's being imported - some child is really missing
+ raise e
+
+ # Print results
+ print
+ print "Results: %d files imported, %d skipped, %d total." % (
+ files_imported, files_skipped, files_imported + files_skipped)
+ print
+
+ if wait_until:
+ print 'Waiting...'
+ try:
+ time.sleep(wait_until - time.time())
+ except IOError:
+ print "it's already too late"
fnp / wolnelektury.git / blobdiff