diff --git a/spa/management/commands/azure_util.py b/spa/management/commands/azure_util.py index 32139be..a0d2df8 100644 --- a/spa/management/commands/azure_util.py +++ b/spa/management/commands/azure_util.py @@ -4,13 +4,15 @@ from django.core.management.base import NoArgsCommand from django.utils.encoding import smart_str from dss.storagesettings import AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY, AZURE_CONTAINER from spa.models import Mix - +from django.db.models import Count class Command(NoArgsCommand): def handle_noargs(self, **options): try: blob_service = BlobService(AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY) mixes = Mix.objects.filter(archive_updated=False) + c = len(mixes) + i = 1 for mix in mixes: try: blob_name = "%s.%s" % (mix.uid, mix.filetype) @@ -24,7 +26,8 @@ class Command(NoArgsCommand): x_ms_blob_content_type='application/octet-stream', x_ms_blob_content_disposition='attachment;filename="%s"' % (download_name) ) - print "Processed: %s" % mix.uid + print "Processed: %s (%d of %d)" % (mix.uid, i, c) + i = i + 1 mix.archive_updated = True mix.save() else: diff --git a/static/js/lib/backbone.marionette.js b/static/js/lib/backbone.marionette.js index 6cbd61a..2f5f2f7 100644 --- a/static/js/lib/backbone.marionette.js +++ b/static/js/lib/backbone.marionette.js @@ -1,22 +1,3 @@ -// MarionetteJS (Backbone.Marionette) -// ---------------------------------- -// v2.1.0 -// -// Copyright (c)2014 Derick Bailey, Muted Solutions, LLC. -// Distributed under MIT license -// -// http://marionettejs.com - - -/*! - * Includes BabySitter - * https://github.com/marionettejs/backbone.babysitter/ - * - * Includes Wreqr - * https://github.com/marionettejs/backbone.wreqr/ - */ - - (function(root, factory) { if (typeof define === 'function' && define.amd) { @@ -3427,4 +3408,4 @@ return Marionette; -})); \ No newline at end of file +}));