Skip to content

gargantext
gargantext
Commit c7372987 authored by PkSM3's avatar PkSM3
Browse files
Options

[BUGFIX] long name of uploadedfile

parent 28f3ff7e
Hide whitespace changes
Inline Side-by-side
Showing with 168 additions and 104 deletions
gargantext_web/views.py
View file @ c7372987
...@@ -183,22 +183,14 @@ def handle_uploaded_file(f): ...@@ -183,22 +183,14 @@ def handle_uploaded_file(f):
# for formexample.html # for formexample.html
def formexample(request): def formexample(request):
# if this is a POST request we need to process the form data
if request.method == 'POST': if request.method == 'POST':
# create a form instance and populate it with data from the request:
form = CustomForm(request.POST, request.FILES)#NameForm(request.POST) form = CustomForm(request.POST, request.FILES)#NameForm(request.POST)
# check whether it's valid:
if form.is_valid(): if form.is_valid():
# process the data in form.cleaned_data as required
# ...
# redirect to a new URL:
name = form.cleaned_data['name'] name = form.cleaned_data['name']
thefile = form.cleaned_data['file'] thefile = form.cleaned_data['file']
handle_uploaded_file(request.FILES['file']) handle_uploaded_file(request.FILES['file'])
return render(request, "tests/formexample.html" , {'form':form , 'msg':("form received! "+name)}) return render(request, "tests/formexample.html" , {'form':form , 'msg':("form received! "+name)})
# if a GET (or any other method) we'll create a blank form
else: else:
form = CustomForm() form = CustomForm()
...@@ -272,81 +264,172 @@ def project(request, project_id): ...@@ -272,81 +264,172 @@ def project(request, project_id):
if request.method == 'POST': if request.method == 'POST':
#form = CorpusForm(request.POST, request.FILES) print("original file:")
#print(str(request.POST)) print(request.FILES)
name = str(request.POST['name'])
try: form = CustomForm(request.POST, request.FILES)
resource_type = ResourceType.objects.get(id=str(request.POST['type'])) if form.is_valid():
except Exception as error:
print(error)
resource_type = None name = form.cleaned_data['name']
thefile = form.cleaned_data['file']
try: resource_type = ResourceType.objects.get(id=str( form.cleaned_data['type'] ))
file = request.FILES['file']
except Exception as error: print("-------------")
print(error) print(name,"|",resource_type,"|",thefile)
file = None print("-------------")
#if name != "" and resource_type is not None and file is not None:
try:
parent = Node.objects.get(id=project_id)
node_type = NodeType.objects.get(name='Corpus')
if resource_type.name == "europress_french":
language = Language.objects.get(iso2='fr')
elif resource_type.name == "europress_english":
language = Language.objects.get(iso2='en')
print("new file:")
print(thefile)
try: try:
corpus = Node( parent = Node.objects.get(id=project_id)
user=request.user, node_type = NodeType.objects.get(name='Corpus')
parent=parent,
type=node_type, if resource_type.name == "europress_french":
language=language, language = Language.objects.get(iso2='fr')
name=name, elif resource_type.name == "europress_english":
) language = Language.objects.get(iso2='en')
except:
corpus = Node( try:
corpus = Node(
user=request.user,
parent=parent,
type=node_type,
language=language,
name=name,
)
except:
corpus = Node(
user=request.user,
parent=parent,
type=node_type,
name=name,
)
corpus.save()
print(request.user, resource_type , thefile )
print(corpus.language)
corpus.add_resource(
user=request.user, user=request.user,
parent=parent, type=resource_type,
type=node_type, file=thefile
name=name,
) )
corpus.save() try:
#corpus.parse_and_extract_ngrams()
#corpus.parse_and_extract_ngrams.apply_async((), countdown=3)
if DEBUG is True:
corpus.workflow()
else:
corpus.workflow.apply_async((), countdown=3)
print(request.user, resource_type , file ) except Exception as error:
print(corpus.language) print(error)
corpus.add_resource(
user=request.user,
type=resource_type,
file=file
)
try: return HttpResponseRedirect('/project/' + str(project_id))
#corpus.parse_and_extract_ngrams()
#corpus.parse_and_extract_ngrams.apply_async((), countdown=3)
if DEBUG is True:
corpus.workflow()
else:
corpus.workflow.apply_async((), countdown=3)
except Exception as error: except Exception as error:
print(error) print('ee', error)
form = CorpusForm(request=request)
formResource = ResourceForm()
else:
print("bad form, bad form")
return render(request, 'project.html', {
'form' : form,
'user' : user,
'date' : date,
'project' : project,
'donut' : donut,
'list_corpora' : list_corpora,
'whitelists' : whitelists,
'blacklists' : blacklists,
'cooclists' : cooclists,
'number' : number,
})
else:
form = CustomForm()
return HttpResponseRedirect('/project/' + str(project_id))
except Exception as error:
print('ee', error)
form = CorpusForm(request=request)
formResource = ResourceForm()
else: # if request.method == 'POST':
form = CorpusForm(request=request) # #form = CorpusForm(request.POST, request.FILES)
formResource = ResourceForm() # #print(str(request.POST))
# name = str(request.POST['name'])
# try:
# resource_type = ResourceType.objects.get(id=str(request.POST['type']))
# except Exception as error:
# print(error)
# resource_type = None
# try:
# file = request.FILES['file']
# except Exception as error:
# print(error)
# file = None
# #if name != "" and resource_type is not None and file is not None:
# try:
# parent = Node.objects.get(id=project_id)
# node_type = NodeType.objects.get(name='Corpus')
# if resource_type.name == "europress_french":
# language = Language.objects.get(iso2='fr')
# elif resource_type.name == "europress_english":
# language = Language.objects.get(iso2='en')
# try:
# corpus = Node(
# user=request.user,
# parent=parent,
# type=node_type,
# language=language,
# name=name,
# )
# except:
# corpus = Node(
# user=request.user,
# parent=parent,
# type=node_type,
# name=name,
# )
# corpus.save()
# print(request.user, resource_type , file )
# print(corpus.language)
# corpus.add_resource(
# user=request.user,
# type=resource_type,
# file=file
# )
# try:
# #corpus.parse_and_extract_ngrams()
# #corpus.parse_and_extract_ngrams.apply_async((), countdown=3)
# if DEBUG is True:
# corpus.workflow()
# else:
# corpus.workflow.apply_async((), countdown=3)
# except Exception as error:
# print(error)
# return HttpResponseRedirect('/project/' + str(project_id))
# except Exception as error:
# print('ee', error)
# form = CorpusForm(request=request)
# formResource = ResourceForm()
# else:
# form = CorpusForm(request=request)
# formResource = ResourceForm()
return render(request, 'project.html', { return render(request, 'project.html', {
'form' : form, 'form' : form,
'formResource' : formResource,
'user' : user, 'user' : user,
'date' : date, 'date' : date,
'project' : project, 'project' : project,
......
node/admin.py
View file @ c7372987
...@@ -95,14 +95,20 @@ class ResourceForm(ModelForm): ...@@ -95,14 +95,20 @@ class ResourceForm(ModelForm):
# for formexample.html # for formexample.html
from django import forms from django import forms
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
class CustomForm(forms.Form): class CustomForm(forms.Form):
name = forms.CharField( label='Your name', max_length=5 ) name = forms.CharField( label='Your name', max_length=5 , required=True)
parsing_options = ResourceType.objects.all().values_list('id', 'name')
type = forms.IntegerField( widget=forms.Select( choices= parsing_options) , required=True )
file = forms.FileField() file = forms.FileField()
# Description: clean_file() # Description: clean_file()
""" """
* file_.content_type - list containing allowed content_types. Example: ['application/pdf', 'image/jpeg'] * file_.content_type - Example: ['application/pdf', 'image/jpeg']
* len(file_) - a number indicating the maximum file size allowed for upload. * len(file_) - file size.
2.5MB - 2621440 2.5MB - 2621440
5MB - 5242880 5MB - 5242880
10MB - 10485760 10MB - 10485760
...@@ -114,19 +120,19 @@ class CustomForm(forms.Form): ...@@ -114,19 +120,19 @@ class CustomForm(forms.Form):
""" """
def clean_file(self): def clean_file(self):
file_ = self.cleaned_data.get('file') file_ = self.cleaned_data.get('file')
#Filename length #Filename length
if len(file_.name)>30: if len(file_.name)>30:
raise forms.ValidationError(_('Come on dude, name too long.')) from datetime import datetime
file_.name = str(datetime.now().microsecond)
# raise forms.ValidationError(_('Come on dude, name too long. Now is:'+file_.name))
#File size #File size
if len(file_)>104857600: if len(file_)>104857600:
raise forms.ValidationError(_('File to heavy! (<100MB svp mec).')) raise forms.ValidationError(_('File to heavy! (<100MB svp mec).'))
## File type: ## File type:
# if file_.content_type == "application/zip": # if file_.content_type == "application/zip":
# raise forms.ValidationError(_('We need a zip pls.')) # raise forms.ValidationError(_('We need a zip pls.'))
return self.cleaned_data.get('file', '') return file_
class CorpusForm(ModelForm): class CorpusForm(ModelForm):
......
node/models.py
View file @ c7372987
...@@ -129,33 +129,10 @@ class Node(CTENode): ...@@ -129,33 +129,10 @@ class Node(CTENode):
return Resource.objects.select_related('node_resource').filter(node_resource__node = self) return Resource.objects.select_related('node_resource').filter(node_resource__node = self)
def add_resource(self, **kwargs): def add_resource(self, **kwargs):
# print("printing arguments for add_resource():")
# print(kwargs)
# from django.core.files.storage import default_storage
# from django.core.files.base import ContentFile
# import os
# thefile = kwargs["file"]
# path = default_storage.save('tmp/somename.zip', ContentFile(thefile.read()))
# tmp_file = os.path.join(MEDIA_ROOT, path)
# print(tmp_file)
# kwargs["file"] = tmp_file
# print("final kwargs:")
# print(kwargs)
# only for tests # only for tests
resource = Resource(guid=str(time()), digest=str(time()), **kwargs ) resource = Resource(guid=str(time()), digest=str(time()), **kwargs )
#resource = Resource(**kwargs) #resource = Resource(**kwargs)
resource.save() resource.save()
print("printing rresource.file:")
print(resource.file)
# print("printing the resource 01____:")
# print(resource.file)
# print("printing the resource 02____: asdasdasd")
# User # User
if 'user' not in kwargs and 'user_id' not in kwargs: if 'user' not in kwargs and 'user_id' not in kwargs:
...@@ -193,8 +170,6 @@ class Node(CTENode): ...@@ -193,8 +170,6 @@ class Node(CTENode):
'europress_french' : EuropressFileParser, 'europress_french' : EuropressFileParser,
'europress_english' : EuropressFileParser, 'europress_english' : EuropressFileParser,
})[resource.type.name]() })[resource.type.name]()
print("parse_resources:")
print(resource.file)
metadata_list += parser.parse(str(resource.file)) metadata_list += parser.parse(str(resource.file))
# retrieve info from the database # retrieve info from the database
type_id = NodeType.objects.get(name='Document').id type_id = NodeType.objects.get(name='Document').id
......
templates/tests/formexample.html
View file @ c7372987
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<form action="/formexample/" enctype="multipart/form-data" method="post"> <form action="/formexample/" enctype="multipart/form-data" method="post">
{% csrf_token %} {% csrf_token %}
{{ form }} {{ form.as_p }}
<input type="submit" value="OK"> <input type="submit" value="OK">
</form> </form>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment