platform: comparison src/ldt/ldt/ldt

equal deleted inserted replaced

-:784ebba76424
+:8a881c9593d0
 import lxml.etree
 import mimetypes
 import os
 import urllib2
+from django.views.decorators.csrf import csrf_exempt
 @login_required
 def workspace(request):
 # list of contents
 content_list = Content.objects.all() #@UndefinedVariable
 cleaned_data['videopath'] = settings.STREAM_URL
 # if the source is already http:// or rtmp:// we don't have to add STREAM_URL
 if cleaned_data['src'].startswith("rtmp://") or cleaned_data['src'].startswith("http://"):
 cleaned_data['videopath'] = ''
 media, created = Media.objects.get_or_create(src=cleaned_data['src'], defaults=cleaned_data) #@UndefinedVariable
-elif media_input_type == "url" or  media_input_type == "upload" :
+elif media_input_type == "url" or media_input_type == "upload" :
 # copy file
 #complet src
 destination_file = None
 source_file = None
 try:
 source_file = urllib2.urlopen(url)
 source_filename = source_file.info().get('Content-Disposition', None)
 if not source_filename:
 source_filename = urlparse.urlparse(url).path.rstrip("/").split('/')[-1]
 elif media_input_type == "upload":
-source_file = request.FILES['media-media_file']
+#source_file = request.FILES['media-media_file']
-source_filename = source_file.name
+# At this point the file has already be uploaded thanks to the upload view, and original file name is sent through a post var
+source_filename = request.POST["media-local_file_name"]
 source_filename = ldt_utils_path.sanitize_filename(source_filename)
 destination_filepath = os.path.join(settings.STREAM_PATH, source_filename)
 base_source_filename = source_filename
 extension = base_source_filename.split(".")[-1]
 extension = ""
 base_basename_filename = base_source_filename
 else:
 base_basename_filename = base_source_filename[:-1 * (len(extension) + 1)]
 i = 0
+init_path = destination_filepath
+init_name = source_filename
 while os.path.exists(destination_filepath):
 base_source_filename = "%s.%d.%s" % (base_basename_filename, i, extension)
 destination_filepath = os.path.join(settings.STREAM_PATH, base_source_filename)
 i += 1
+if media_input_type == "url":
+# we upload the file if we are in url case
+destination_file = open(destination_filepath, "wb")
+chunck = source_file.read(2048)
+while chunck:
+destination_file.write(chunck)
+chunck = source_file.read(2048)
-destination_file = open(destination_filepath, "w")
+elif media_input_type == "upload":
+# Since the file names have been 1 iteration too far, we rebuild the existing file name
+if i == 1 :
+base_source_filename = init_name
+destination_filepath = init_path
+else :
+i -= 2
+base_source_filename = "%s.%d.%s" % (base_basename_filename, i, extension)
+destination_filepath = os.path.join(settings.STREAM_PATH, base_source_filename)
 src_prefix = settings.STREAM_SRC_PREFIX.rstrip("/")
 if len(src_prefix) > 0:
 cleaned_data["src"] = src_prefix + "/" + base_source_filename
 else:
 cleaned_data["src"] = base_source_filename
-chunck = source_file.read(2048)
-while chunck:
-destination_file.write(chunck)
-chunck = source_file.read(2048)
 except Exception as inst:
 logging.debug("write_content_base : POST error when processing file:" + str(inst)) #@UndefinedVariable
 form_status = "error"
 #set error for form
 if media_input_type == "url":
 errors = media_form._errors.setdefault("external_src_url", ErrorList())
-errors.append(_("Problem when downloading file from url : ") + str(inst))
+errors.append(_("Problem when downloading file from url : ") + url)
 elif media_input_type == "upload":
 errors = media_form._errors.setdefault("media_file", ErrorList())
 errors.append(_("Problem when uploading file : ") + str(inst))
 finally:
-if destination_file:
+if media_input_type == "url":
-destination_file.close()
+if destination_file:
-if source_file:
+destination_file.close()
-source_file.close()
+if source_file:
+source_file.close()
 if form_status != "error":
 #try:
 del cleaned_data["media_file"]
 if not cleaned_data['videopath']:
 cleaned_data['videopath'] = settings.STREAM_URL
 mimetype = mimetypes.guess_type(cleaned_data['src'])
 cleaned_data['mimetype_field'] = mimetype
 media, created = Media.objects.get_or_create(src=cleaned_data['src'], defaults=cleaned_data) #@UndefinedVariable
 else:
 media = None
 if media and not created:
 for attribute in ('external_id', 'external_permalink', 'external_publication_url', 'external_src_url', 'media_creation_date', 'videopath', 'duration', 'description', 'title'):
 setattr(media, attribute, cleaned_data.get(attribute))
 mimetype = cleaned_data.get('mimetype_field', None)
 if iri_id:
 create_content_action = reverse('ldt.ldt_utils.views.write_content', kwargs={'iri_id':iri_id})
 else:
 create_content_action = reverse('ldt.ldt_utils.views.write_content')
-return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_action': create_content_action, 'iri_id': iri_id}, context_instance=RequestContext(request))
+session_key = request.COOKIES[settings.SESSION_COOKIE_NAME]
+cookie_name = settings.SESSION_COOKIE_NAME
+return render_to_response('ldt/ldt_utils/create_content.html', {'content_form': content_form, 'media_form': media_form, 'form_status': form_status, 'create_content_action': create_content_action, 'iri_id': iri_id, 'session_key':session_key, 'cookie_name':cookie_name}, context_instance=RequestContext(request))
 @login_required
 def prepare_delete_content(request, iri_id=None):
 errors = []
 titles = []
 if not iri_id:
 iri_id = request.REQUEST.get("iri_id", None)
 if iri_id:
 Content.objects.filter(iri_id=iri_id).delete() #@UndefinedVariable
+def upload(request):
+if request.method == 'POST':
+for field_name in request.FILES:
+# We get the file name
+source_file = request.FILES[field_name]
+source_filename = source_file.name
+# We sanitize the file name : no space, only lower case.
+source_filename = ldt_utils_path.sanitize_filename(source_filename)
+destination_filepath = os.path.join(settings.STREAM_PATH, source_filename)
+base_source_filename = source_filename
+extension = base_source_filename.split(".")[-1]
+if extension == base_source_filename:
+extension = ""
+base_basename_filename = base_source_filename
+else:
+base_basename_filename = base_source_filename[:-1 * (len(extension) + 1)]
+i = 0
+# We search if there is already a file with the same name, and rename the target by name.X.ext
+while os.path.exists(destination_filepath):
+base_source_filename = "%s.%d.%s" % (base_basename_filename, i, extension)
+destination_filepath = os.path.join(settings.STREAM_PATH, base_source_filename)
+i += 1
+destination_file = open(destination_filepath, "wb")
+for chunk in source_file.chunks():
+destination_file.write(chunk)
+destination_file.close()
+# indicate that everything is OK for SWFUpload
+return HttpResponse("ok", mimetype="text/plain")
+else:
+return HttpResponse("notok", mimetype="text/plain")

changeset 71	8a881c9593d0
parent 69	784ebba76424
child 75	655b017251fa