Skip to content

fix: better handle "entered" agendas #7721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 2 commits into from
Aug 7, 2024
Merged

fix: better handle "entered" agendas #7721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
271a5f2
fix: don't assume file has open method
jennifer-richards Jul 20, 2024
873f6ca
refactor: better upload/enter agenda abstraction
jennifer-richards Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions ietf/meeting/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ def save_session_minutes_revision(session, file, ext, request, encoding=None, ap
def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=None):
"""Accept an uploaded materials file

This function takes a file object, a filename and a meeting object and subdir as string.
This function takes a _binary mode_ file object, a filename and a meeting object and subdir as string.
It saves the file to the appropriate directory, get_materials_path() + subdir.
If the file is a zip file, it creates a new directory in 'slides', which is the basename of the
zip file and unzips the file in the new directory.
Expand All @@ -748,9 +748,18 @@ def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=N
pass # if the file is already gone, so be it

with (path / filename).open('wb+') as destination:
# prep file for reading
if hasattr(file, "chunks"):
chunks = file.chunks()
else:
try:
file.seek(0)
except AttributeError:
pass
chunks = [file.read()] # pretend we have chunks

if filename.suffix in settings.MEETING_VALID_MIME_TYPE_EXTENSIONS['text/html']:
file.open()
text = file.read()
text = b"".join(chunks)
if encoding:
try:
text = text.decode(encoding)
Expand All @@ -777,11 +786,8 @@ def handle_upload_file(file, filename, meeting, subdir, request=None, encoding=N
f"please check the resulting content. "
))
else:
if hasattr(file, 'chunks'):
for chunk in file.chunks():
destination.write(chunk)
else:
destination.write(file.read())
for chunk in chunks:
destination.write(chunk)

# unzip zipfile
if is_zipfile:
Expand Down
29 changes: 14 additions & 15 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.core.exceptions import ValidationError
from django.core.files.uploadedfile import SimpleUploadedFile
from django.core.validators import URLValidator
from django.urls import reverse,reverse_lazy
from django.db.models import F, Max, Q
Expand Down Expand Up @@ -2804,6 +2805,17 @@ def require_field(f):
elif submission_method == "enter":
require_field("content")

def get_file(self):
"""Get content as a file-like object"""
if self.cleaned_data.get("submission_method") == "upload":
return self.cleaned_data["file"]
else:
return SimpleUploadedFile(
name="uploaded.md",
content=self.cleaned_data["content"].encode("utf-8"),
content_type="text/markdown;charset=utf-8",
)

def upload_session_agenda(request, session_id, num):
# num is redundant, but we're dragging it along an artifact of where we are in the current URL structure
session = get_object_or_404(Session,pk=session_id)
Expand All @@ -2824,21 +2836,8 @@ def upload_session_agenda(request, session_id, num):
if request.method == 'POST':
form = UploadOrEnterAgendaForm(show_apply_to_all_checkbox,request.POST,request.FILES)
if form.is_valid():
submission_method = form.cleaned_data['submission_method']
if submission_method == "upload":
file = request.FILES['file']
_, ext = os.path.splitext(file.name)
else:
if agenda_sp:
doc = agenda_sp.document
_, ext = os.path.splitext(doc.uploaded_filename)
else:
ext = ".md"
fd, name = tempfile.mkstemp(suffix=ext, text=True)
os.close(fd)
with open(name, "w") as file:
file.write(form.cleaned_data['content'])
file = open(name, "rb")
file = form.get_file()
_, ext = os.path.splitext(file.name)
apply_to_all = session.type.slug == 'regular'
if show_apply_to_all_checkbox:
apply_to_all = form.cleaned_data['apply_to_all']
Expand Down