ファイルアップロード時のMIME Type判定を正確に

ohac · Jan 12, 2010 · 0a91cc4 · 0a91cc4
1 parent 85c59c3
commit 0a91cc4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/xpi/chrome/content/library/00_component.js b/xpi/chrome/content/library/00_component.js
@@ -57,6 +57,7 @@ var FaviconService      = getService('/browser/favicon-service;1', Ci.nsIFavicon
 var StyleSheetService   = getService('/content/style-sheet-service;1', Ci.nsIStyleSheetService);
 var FuelApplication     = getService('/fuel/application;1', Ci.fuelIApplication);
 var PrefService         = getService('/preferences-service;1');
+var MIMEService         = getService('/mime;1', Ci.nsIMIMEService);
 
 
 var PrefBranch = 

diff --git a/xpi/chrome/content/library/01_utility.js b/xpi/chrome/content/library/01_utility.js
@@ -476,7 +476,7 @@ function request(url, opts){
 					]);
 				} else {
 					if(value.file instanceof IFile){
-						value.contentType = value.contentType || guessContentType(value.file);
+						value.contentType = value.contentType || getMimeType(value.file);
 						value.fileName = value.file.leafName;
 						value.file = IOService.newChannelFromURI(createURI(value.file)).open();
 					}
@@ -617,17 +617,10 @@ function request(url, opts){
 	return d;
 }
 
-// FIXME: Firefox内の実装を探す
-function guessContentType(ext){
-	if(ext instanceof IFile)
-		ext = ext.leafName.split('.').pop();
-
-	return {
-		mp3 : 'audio/mpeg',
-		m4a : 'audio/mp4',
-		png : 'image/png',
-		jpg : 'image/jpeg',
-	}[ext];
+function getMimeType(file){
+	return (file instanceof IFile)?
+		MIMEService.getTypeFromFile(file) : 
+		MIMEService.getTypeFromExtension(file)
 }
 
 // ----[MochiKit]-------------------------------------------------

diff --git a/xpi/chrome/content/library/20_model.js b/xpi/chrome/content/library/20_model.js
@@ -2252,13 +2252,7 @@ models.register({
 		return request(this.URL + '/tracks', {
 			redirectionLimit : 0,
 			sendContent : {
-				'track_files[]' : {
-					file : file,
-					contentType : {
-						mp3 : 'audio/mpeg',
-						m4a : 'audio/mp4'
-					}[file.leafName.split('.').pop()],
-				},
+				'track_files[]' : file,
 			},
 		});
 	},