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 24bd6969..731826a1 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ