From b1f04581a8f957b5988ed675576d4c99aaa3672e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sat, 6 Apr 2019 18:27:17 +0200
Subject: [PATCH] fixed, tested

---
 rowers/mailprocessing.py                   |   8 +++-----
 rowers/management/commands/processemail.py |   4 +++-
 rowers/tests/testdata/testdata.csv.gz      | Bin 12523 -> 12523 bytes
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rowers/mailprocessing.py b/rowers/mailprocessing.py
index a7cc453a..803d65e0 100644
--- a/rowers/mailprocessing.py
+++ b/rowers/mailprocessing.py
@@ -90,6 +90,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
     try:
         datafilename = datafile.name
         fileformat = get_file_type('media/' + datafilename)
+        raise ValueError
     except IOError:
         datafilename = datafile.name + '.gz'
         fileformat = get_file_type('media/' + datafilename)
@@ -108,11 +109,8 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
         print('Fileformat = ',fileformat)
 
         
-    if fileformat == 'unknown':
-#        extension = datafilename[-4:].lower()
-#        fcopy = "media/"+datafilename[:-4]+"_copy"+extension
-#        with open('media/'+datafilename, 'r') as f_in, open(fcopy, 'w') as f_out:
-#            shutil.copyfileobj(f_in,f_out)
+    f,e = os.path.splitext(datafilename)
+    if fileformat == 'unknown' and e is not 'txt':
         fcopy = "media/"+datafilename
         if not testing:
             if settings.CELERY:
diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py
index ac493684..ceed4054 100644
--- a/rowers/management/commands/processemail.py
+++ b/rowers/management/commands/processemail.py
@@ -213,7 +213,9 @@ class Command(BaseCommand):
             testing = False
         cntr = 0
         for attachment in attachments:
-            extension = attachment.document.name[-3:].lower()
+            filename, extension = os.path.splitext(attachment.document.name)
+            extension = extension.lower()
+#            extension = attachment.document.name[-3:].lower()
             try:
                 message = Message.objects.get(id=attachment.message_id)
                 if message.encoded:
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 24bd696923493093f4a4b70b0f925b3690daf9c9..731826a17d1e81838bbbeac28b39991e5dfc6feb 100644
GIT binary patch
delta 15
WcmaEz_&SkIzMF%?=JH0irv?Bt#|AV2

delta 15
WcmaEz_&SkIzMF&N)1r-RPYnP#76!Qh