Skip to content

Commit

Permalink
Fix #7334 and add test.
Browse files Browse the repository at this point in the history
Former-commit-id: 3994f777730db0d5d50a15dd9856f358f1b633e3
  • Loading branch information
dkocher committed Jul 9, 2013
1 parent 9c8c4ca commit 29d09ea
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 2 deletions.
30 changes: 29 additions & 1 deletion source/ch/cyberduck/core/MappingMimeTypeService.java
@@ -1,16 +1,44 @@
package ch.cyberduck.core;

import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.jets3t.service.utils.Mimetypes;

import java.io.IOException;
import java.net.URL;
import java.util.Enumeration;

/**
* @version $Id$
*/
public class MappingMimeTypeService implements MimeTypeService {
private static final Logger log = Logger.getLogger(MappingMimeTypeService.class);

private Mimetypes types = Mimetypes.getInstance();

public MappingMimeTypeService() {
this.load();
}

private void load() {
try {
final Enumeration<URL> resources = getClass().getClassLoader().getResources("mime.types");
while(resources.hasMoreElements()) {
final URL url = resources.nextElement();
if(log.isDebugEnabled()) {
log.debug(String.format("Loading MIME types from %s", url));
}
types.loadAndReplaceMimetypes(url.openStream());
}
}
catch(IOException e) {
log.error("Failure loading mime.types");
}
}

@Override
public String getMime(final String filename) {
// Reads from mime.types in classpath
return Mimetypes.getInstance().getMimetype(StringUtils.lowerCase(filename));
return types.getMimetype(StringUtils.lowerCase(filename));
}
}
6 changes: 5 additions & 1 deletion test/ch/cyberduck/core/MappingMimeTypeServiceTest.java
Expand Up @@ -7,12 +7,16 @@
/**
* @version $Id$
*/
public class MappingMimeTypeServiceTest {
public class MappingMimeTypeServiceTest extends AbstractTestCase {

@Test
public void testGetMime() throws Exception {
MappingMimeTypeService s = new MappingMimeTypeService();
assertEquals("text/plain", s.getMime("f.txt"));
assertEquals("text/plain", s.getMime("f.TXT"));
assertEquals("video/x-f4v", s.getMime("f.f4v"));
assertEquals("application/javascript", s.getMime("f.js"));
assertEquals("video/mp2t", s.getMime("f.ts"));
assertEquals("application/x-mpegurl", s.getMime("f.m3u8"));
}
}

0 comments on commit 29d09ea

Please sign in to comment.