Merge pull request #1341 from dumindux/Change_download_file_format

Change download file format

sunpy/net/tests/test_util.py

@@ -16,3 +16,9 @@ def test_content_disposition_unicode():
 
 def test_slugify():
     assert sunpy.util.net.slugify(u"äb c", u"b_c")
+    assert sunpy.util.net.slugify(u"file.greg.fits") == u"file_greg.fits"
+    assert sunpy.util.net.slugify(u"file.greg.fits", u"x") == u"filexgreg.fits"
+    assert sunpy.util.net.slugify(u"filegreg.fits") == u"filegreg.fits"
+    assert sunpy.util.net.slugify(u"filegreg") == u"filegreg"
+    assert sunpy.util.net.slugify(u"f/i*l:e,gr.eg.fits") == u"f_i_l_e_gr_eg.fits"
+    assert sunpy.util.net.slugify(u"part1.part2.part3.part4.part5") == u"part1_part2_part3_part4.part5"

sunpy/util/net.py

@@ -30,10 +30,22 @@
 def slugify(text, delim=u'_', encoding="ascii"):
     """ Slugify given unicode text. """
     text = normalize('NFKD', text)
-    return unicode(delim).join(ifilter(None, (
+
+    period = u'.'
+
+    name_and_extension = text.rsplit(period, 1)
+    name = name_and_extension[0]
+
+    name = unicode(delim).join(ifilter(None, (
         word.encode(encoding, 'ignore')
-        for word in _punct_re.split(text.lower())
-        )))
+        for word in _punct_re.split(name.lower())
+    )))
+
+    if len(name_and_extension) == 2:
+        extension = name_and_extension[1]
+        return unicode(period).join([name, extension])
+    else:
+        return name
 
 
 def get_content_disposition(content_disposition):