Addresses #136, Detect mime type and character set of local files when importing
Use new MIME type detection tricks when linking and importing files -- now for charset detection...
This commit is contained in:
parent
794238c23f
commit
7e1a678f9b
1 changed files with 2 additions and 11 deletions
|
@ -1950,7 +1950,7 @@ Scholar.Attachments = new function(){
|
|||
newFile.initWithFile(destDir);
|
||||
newFile.append(title);
|
||||
|
||||
var mimeType = _getMIMETypeFromFile(newFile);
|
||||
var mimeType = Scholar.File.getMIMETypeFromFile(newFile);
|
||||
var charsetID = _getCharsetIDFromFile(newFile);
|
||||
|
||||
_addToDB(newFile, null, null, this.LINK_MODE_IMPORTED_FILE, mimeType, charsetID, sourceItemID, itemID);
|
||||
|
@ -1961,7 +1961,7 @@ Scholar.Attachments = new function(){
|
|||
|
||||
function linkFromFile(file, sourceItemID){
|
||||
var title = file.leafName;
|
||||
var mimeType = _getMIMETypeFromFile(file);
|
||||
var mimeType = Scholar.File.getMIMETypeFromFile(file);
|
||||
var charsetID = _getCharsetIDFromFile(file);
|
||||
return _addToDB(file, null, title, this.LINK_MODE_LINKED_FILE, mimeType, charsetID, sourceItemID);
|
||||
}
|
||||
|
@ -2050,15 +2050,6 @@ Scholar.Attachments = new function(){
|
|||
}
|
||||
|
||||
|
||||
// TODO: currently only uses file extension
|
||||
function _getMIMETypeFromFile(file){
|
||||
var ms = Components
|
||||
.classes['@mozilla.org/uriloader/external-helper-app-service;1']
|
||||
.getService(Components.interfaces.nsIMIMEService);
|
||||
return ms.getTypeFromFile(file);
|
||||
}
|
||||
|
||||
|
||||
function _getCharsetIDFromFile(file){
|
||||
// TODO: Not yet implemented
|
||||
return null;
|
||||
|
|
Loading…
Add table
Reference in a new issue