From 38ac26255ccec2acbee58f2f630c8068ca68e366 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 6 Mar 2014 18:49:58 +0100 Subject: [PATCH] regression --- .../management/commands/teleforma-import-seminar-media.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/teleforma/management/commands/teleforma-import-seminar-media.py b/teleforma/management/commands/teleforma-import-seminar-media.py index 7e67509b..6d4b71e3 100644 --- a/teleforma/management/commands/teleforma-import-seminar-media.py +++ b/teleforma/management/commands/teleforma-import-seminar-media.py @@ -7,7 +7,6 @@ from telemeta.models import * from telemeta.util.unaccent import unaccent from teleforma.models import * from django.core.urlresolvers import reverse -from django.conf import settings import logging import os, sys, time, datetime @@ -29,7 +28,7 @@ class Logger: class Command(BaseCommand): help = "Import seminars from a media directory for a special period.name" admin_email = 'webmaster@parisson.com' - args = 'organization period_name log_file' + args = 'organization period_name log_file media_dir' spacer = '_-_' original_format = 'webm' transcoded_formats = ['mp4', 'ogg', 'mp3'] @@ -91,7 +90,7 @@ class Command(BaseCommand): organization_name = args[0] period_name = args[1] log_file = args[2] - media_dir = settings.MEDIA_ROOT + media_dir = args[3] logger = Logger(log_file) organization = Organization.objects.get(name=organization_name) @@ -187,7 +186,7 @@ class Command(BaseCommand): files = os.listdir(root) for file in files: - r_path = root + os.sep + file + r_path = dir + os.sep + file filename, extension = os.path.splitext(file) if extension[1:] in self.image_formats: related, c = MediaItemRelated.objects.get_or_create(item=item, file=r_path) -- 2.39.5