From 4bda2f35398dfd2dcfc2100ea0b337151fe4ad0b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 18 Dec 2016 16:57:42 +0100
Subject: [PATCH] Processing of zipped files

---
 rowers/forms.py          | 1 +
 rowers/mailprocessing.py | 8 ++++++++
 rowers/views.py          | 7 +++++++
 rowsandall_app/rows.py   | 2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/rowers/forms.py b/rowers/forms.py
index d27030bd..9666b376 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -42,6 +42,7 @@ class DocumentsForm(forms.Form):
 	('ergdata' , 'ErgData CSV'),
 	('ergstick' , 'ErgStick CSV'),
 	('painsleddesktop' , 'Painsled Desktop CSV'),
+        ('zip','Zipped file'),
 	)
     title = forms.CharField(required=False)
     file = forms.FileField(required=True,
diff --git a/rowers/mailprocessing.py b/rowers/mailprocessing.py
index 424241d3..3c4fb3d3 100644
--- a/rowers/mailprocessing.py
+++ b/rowers/mailprocessing.py
@@ -100,6 +100,14 @@ def make_new_workout_from_email(rr,f2,name,cntr=0):
     workouttype = 'rower'
     f2 = f2.name
     fileformat = get_file_type('media/'+f2)
+
+    if len(fileformat)==3 and fileformat[0]=='zip':
+        f_to_be_deleted = f2
+        with zipfile.ZipFile(f2) as z:
+            f2 = z.extract(z.namelist()[0],path='media/')
+            fileformat = fileformat[2]
+            os.remove(f_to_be_deleted)
+
     if fileformat == 'unknown':
 	if settings.DEBUG:	    
 	    res = handle_sendemail_unrecognized.delay(f2,
diff --git a/rowers/views.py b/rowers/views.py
index 87d2991c..5f1f1cc7 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1,4 +1,5 @@
 import time
+import zipfile
 import operator
 from django.views.generic.base import TemplateView
 from django.db.models import Q
@@ -3694,6 +3695,12 @@ def workout_upload_view(request,message=""):
             
 	    # new
 	    fileformat = get_file_type(f2)
+            if len(fileformat)==3 and fileformat[0]=='zip':
+                f_to_be_deleted = f2
+                with zipfile.ZipFile(f2) as z:
+                    f2 = z.extract(z.namelist()[0],path='media/')
+                fileformat = fileformat[2]
+                os.remove(f_to_be_deleted)
             
 	    if fileformat == 'unknown':
 		message = "We couldn't recognize the file type"
diff --git a/rowsandall_app/rows.py b/rowsandall_app/rows.py
index 1d9848c9..c93e7a69 100644
--- a/rowsandall_app/rows.py
+++ b/rowsandall_app/rows.py
@@ -48,7 +48,7 @@ def format_time(x,pos=None):
 def validate_file_extension(value):
   import os
   ext = os.path.splitext(value.name)[1]
-  valid_extensions = ['.tcx','.csv','.TCX','.CSV','.fit','.FIT']
+  valid_extensions = ['.tcx','.csv','.TCX','.CSV','.fit','.FIT','.zip','.ZIP']
   if not ext in valid_extensions:
     raise ValidationError(u'File not supported!')