diff options
author | Rogelio Mita <rogeliomita@activitycentral.com> | 2013-10-03 04:26:03 (GMT) |
---|---|---|
committer | Rogelio Mita <rogeliomita@activitycentral.com> | 2013-10-03 04:26:03 (GMT) |
commit | b159caecef1bd90e07273cf80f7c60314400416e (patch) | |
tree | 0d7c465624c067ab79bc7dbe46cc9443b63e51d6 /webapp/polls/views.py | |
parent | c018e3ce50a172f06c91bad4c048a8a826bb64b6 (diff) |
Group client logic
Diffstat (limited to 'webapp/polls/views.py')
-rw-r--r-- | webapp/polls/views.py | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/webapp/polls/views.py b/webapp/polls/views.py index 42bc84c..c3af980 100644 --- a/webapp/polls/views.py +++ b/webapp/polls/views.py @@ -361,35 +361,29 @@ class UnploadPollResultFormView(TemplateView): files = dict(request.FILES.lists()).get('result', []) to_json = [] - valid_files = [] + existing = [] + news = [] - # genera una lista de dict python en to_json + # Comprueba que los archvos .poll_result sean archivos validos + # tambien comprueba si los archivos ya existían y los excluye for file_ in files: - path = file_.temporary_file_path() try: - prf = PollResultFile(path) + prf = PollResultFile(file_.temporary_file_path()) to_json.append(prf.get_data()) - valid_files.append(file_) + exists = prf.exists() or not prf.validate() + existing.append(file_.name) if exists else news.append(file_) except ValueError: fname = file_.name msg = u'{0}: No es un .poll_result válido.'.format(fname) messages.add_message(self.request, messages.ERROR, msg) - # comprueba si los archivos ya existían y los excluye - existing = [] - new_files = [] - for file_ in valid_files: - prf = PollResultFile(file_.temporary_file_path()) - exists = prf.exists() or not prf.validate() - existing.append(file_.name) if exists else new_files.append(file_) - if len(existing): msg = u'Los siguientes resultados ya se encuentran \ publicados: %s y no serán procesados.' % (", ".join(existing)) messages.add_message(self.request, messages.INFO, msg) # si se subió algún archivo: - if len(new_files): + if len(news): # Esto hace todo # revisa si el primero de los archivos es del usuario actual @@ -428,7 +422,7 @@ class UnploadPollResultFormView(TemplateView): date_time_string = Clock.get_time_string() uploaded_files = [ - (f.name, f.temporary_file_path()) for f in new_files + (f.name, f.temporary_file_path()) for f in news ] for name, path in uploaded_files: result_file = PollResultFile(path) @@ -436,7 +430,7 @@ class UnploadPollResultFormView(TemplateView): result_file.set_upload_timestamp(date_time_string) result_file.save() - processed_files = [file.name for file in new_files] + processed_files = [file.name for file in news] messages.add_message( self.request, messages.SUCCESS, |