Refactor UnploadPollResultFormView

1 files changed, 17 insertions, 22 deletions

diff --git a/webapp/polls/views.py b/webapp/polls/views.py
index 3f8d399..1d41c65 100644
--- a/webapp/polls/views.py
+++ b/webapp/polls/views.py
@@ -360,18 +360,19 @@ class UnploadPollResultFormView(TemplateView):
 
         files = dict(request.FILES.lists()).get('result', [])
 
-        to_json = []
+        if not len(files):
+            msg = u'Necesita seleccionar un archivo.'
+            messages.add_message(self.request, messages.INFO, msg)
+
+        processed_files = []
         existing = []
         not_authored_by_user = []
         poll_not_assigned_to_user = []
         news = []
 
-        # Comprueba que los archvos .poll_result sean archivos validos
-        # tambien comprueba si los archivos ya existían y los excluye
         for file_ in files:
             try:
                 prf = PollResultFile(file_.temporary_file_path())
-                to_json.append(prf.get_data())
                 if prf.exists():
                     existing.append(file_.name)
                 elif not prf.is_authored_by(user):
@@ -404,19 +405,18 @@ class UnploadPollResultFormView(TemplateView):
             )
             messages.add_message(self.request, messages.ERROR, msg)
 
-        if len(news):
-
-            date_time_string = Clock.get_time_string()
-            uploaded_files = [
-                (f.name, f.temporary_file_path()) for f in news
-            ]
-            for name, path in uploaded_files:
-                result_file = PollResultFile(path)
-                result_file.name = name
-                result_file.set_upload_timestamp(date_time_string)
-                result_file.save()
-
-            processed_files = [file_.name for file_ in news]
+        date_time_string = Clock.get_time_string()
+        uploaded_files = [
+            (f.name, f.temporary_file_path()) for f in news
+        ]
+        for name, path in uploaded_files:
+            result_file = PollResultFile(path)
+            result_file.name = name
+            result_file.set_upload_timestamp(date_time_string)
+            result_file.save()
+            processed_files.append(name)
+
+        if len(processed_files):
             messages.add_message(
                 self.request,
                 messages.SUCCESS,
@@ -425,9 +425,4 @@ class UnploadPollResultFormView(TemplateView):
                 %s' % ", ".join(processed_files)
             )
 
-        # si no hay ningún archivo
-        else:
-            msg = u'Necesita seleccionar un archivo.'
-            messages.add_message(self.request, messages.INFO, msg)
-
         return self.render_to_response(context)