Merge pull request #463 from OpenDataServices/426-files-directories

[#426] Directories not files should be created in media dir

cove/input/models.py

@@ -67,6 +67,8 @@ def download(self):
                         file_extension = possible_extension
 
                 file_name = r.url.split('/')[-1].split('?')[0][:100]
+                if file_name == '':
+                    file_name = 'file'
                 if file_extension:
                     if not file_name.endswith(file_extension):
                         file_name = file_name + '.' + file_extension

cove/input/tests.py

@@ -1,3 +1,4 @@
+import os
 import pytest
 import cove.input.views as v
 from cove.input.models import SuppliedData
@@ -73,3 +74,17 @@ def test_extension_from_content_disposition(rf, httpserver):
     supplied_datas = SuppliedData.objects.all()
     assert len(supplied_datas) == 1
     assert supplied_datas[0].original_file.name.endswith('.csv')
+
+
+@pytest.mark.django_db
+def test_directory_for_empty_filename(rf):
+    '''
+    Check that URLs ending in / correctly create a directory, to test against
+    regressions of https://github.com/OpenDataServices/cove/issues/426
+    '''
+    v.input(fake_cove_middleware(rf.post('/', {
+        'source_url': 'http://example.org/'
+    })))
+    supplied_datas = SuppliedData.objects.all()
+    assert len(supplied_datas) == 1
+    assert os.path.isdir(supplied_datas[0].upload_dir())