Remove dupe file windows+windows8 both use the same one

This commit is contained in:
Jesse MacFadyen 2014-08-20 11:59:40 -07:00
parent f7d5846395
commit affb5ec0a6
2 changed files with 1 additions and 284 deletions

View File

@ -139,7 +139,7 @@
<!-- windows8 --> <!-- windows8 -->
<platform name="windows8"> <platform name="windows8">
<js-module src="src/windows8/FileTransferProxy.js" name="FileTransferProxy"> <js-module src="src/windows/FileTransferProxy.js" name="FileTransferProxy">
<clobbers target="" /> <clobbers target="" />
</js-module> </js-module>
</platform> </platform>

View File

@ -1,283 +0,0 @@
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
/*jshint -W030 */
var FileTransferError = require('./FileTransferError'),
ProgressEvent = require('org.apache.cordova.file.ProgressEvent'),
FileUploadResult = require('org.apache.cordova.file.FileUploadResult'),
FileEntry = require('org.apache.cordova.file.FileEntry');
// Some private helper functions, hidden by the module
function cordovaPathToNative(path) {
// turn / into \\
var cleanPath = path.replace(/\//g, '\\');
// turn \\ into \
cleanPath = cleanPath.replace(/\\\\/g, '\\');
// strip end \\ characters
cleanPath = cleanPath.replace(/\\+$/g, '');
return cleanPath;
}
function nativePathToCordova(path) {
var cleanPath = path.replace(/\\/g, '/');
return cleanPath;
}
var fileTransferOps = [];
function FileTransferOperation(state, promise) {
this.state = state;
this.promise = promise;
}
FileTransferOperation.PENDING = 0;
FileTransferOperation.DONE = 1;
FileTransferOperation.CANCELLED = 2;
module.exports = {
/*
exec(win, fail, 'FileTransfer', 'upload',
[filePath, server, fileKey, fileName, mimeType, params, trustAllHosts, chunkedMode, headers, this._id, httpMethod]);
*/
upload:function(successCallback, errorCallback, options) {
var filePath = cordovaPathToNative(options[0]);
var server = options[1];
var fileKey = options[2] || 'source';
var fileName = options[3];
var mimeType = options[4];
var params = options[5];
var trustAllHosts = options[6]; // todo
var chunkedMode = options[7]; // todo
var headers = options[8] || {};
var uploadId = options[9];
if (filePath === null || typeof filePath === 'undefined') {
errorCallback && errorCallback(FileTransferError.FILE_NOT_FOUND_ERR);
return;
}
if (String(filePath).substr(0, 8) == "file:///") {
filePath = Windows.Storage.ApplicationData.current.localFolder.path + String(filePath).substr(8).split("/").join("\\");
}
// Create internal download operation object
fileTransferOps[uploadId] = new FileTransferOperation(FileTransferOperation.PENDING, null);
Windows.Storage.StorageFile.getFileFromPathAsync(filePath).then(function (storageFile) {
if(!fileName) {
fileName = storageFile.name;
}
if(!mimeType) {
// use the actual content type of the file, probably this should be the default way.
// other platforms probably can't look this up.
mimeType = storageFile.contentType;
}
storageFile.openAsync(Windows.Storage.FileAccessMode.read).then(function (stream) {
// check if upload isn't already cancelled
var uploadOp = fileTransferOps[uploadId];
if (uploadOp && uploadOp.state == FileTransferOperation.CANCELLED) {
// Here we should call errorCB with ABORT_ERR error
errorCallback && errorCallback(new FileTransferError(FileTransferError.ABORT_ERR, filePath, server));
return;
}
var blob = MSApp.createBlobFromRandomAccessStream(mimeType, stream);
var formData = new FormData();
formData.append(fileKey, blob, fileName);
// add params
for(var key in params) {
formData.append(key,params[key]);
}
var uploadOperation;
try {
// Create XHR promise for uploading data to server
uploadOperation = WinJS.xhr({ type: "POST", url: server, data: formData, headers: headers });
fileTransferOps[uploadId].promise = uploadOperation;
} catch (e) {
// it will fail if URL is malformed, so we handle this situation
errorCallback && errorCallback(new FileTransferError(FileTransferError.INVALID_URL_ERR, filePath, server, null, null, e));
return;
}
uploadOperation.then(function (response) {
storageFile.getBasicPropertiesAsync().done(function(basicProperties) {
var ftResult = new FileUploadResult(basicProperties.size, response.status, response.responseText);
successCallback && successCallback(ftResult);
});
}, function(err) {
if ('status' in err) {
errorCallback && errorCallback(new FileTransferError(FileTransferError.CONNECTION_ERR, filePath, server, err.status, err.responseText, err));
} else {
errorCallback && errorCallback(new FileTransferError(FileTransferError.INVALID_URL_ERR, filePath, server, null, null, err));
}
}, function(evt) {
// progress event handler, calls successCallback with empty ProgressEvent
// We can't specify ProgressEvent data here since evt not provides any helpful information
var progressEvent = new ProgressEvent('progress');
successCallback && successCallback(progressEvent, { keepCallback: true });
});
});
}, function(err) {
errorCallback && errorCallback(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, server, server, null, null, err));
});
},
download:function(successCallback, errorCallback, options) {
var source = options[0];
var target = cordovaPathToNative(options[1]);
var downloadId = options[3];
var headers = options[4] || {};
if (target === null || typeof target === undefined) {
errorCallback && errorCallback(FileTransferError.FILE_NOT_FOUND_ERR);
return;
}
if (String(target).substr(0, 8) == "file:///") {
target = Windows.Storage.ApplicationData.current.localFolder.path + String(target).substr(8).split("/").join("\\");
}
var path = target.substr(0, String(target).lastIndexOf("\\"));
var fileName = target.substr(String(target).lastIndexOf("\\") + 1);
if (path === null || fileName === null) {
errorCallback && errorCallback(FileTransferError.FILE_NOT_FOUND_ERR);
return;
}
var download = null;
// Create internal download operation object
fileTransferOps[downloadId] = new FileTransferOperation(FileTransferOperation.PENDING, null);
Windows.Storage.StorageFolder.getFolderFromPathAsync(path).then(function (storageFolder) {
storageFolder.createFileAsync(fileName, Windows.Storage.CreationCollisionOption.generateUniqueName).then(function (storageFile) {
// check if download isn't already cancelled
var downloadOp = fileTransferOps[downloadId];
if (downloadOp && downloadOp.state == FileTransferOperation.CANCELLED) {
// Here we should call errorCB with ABORT_ERR error
errorCallback && errorCallback(new FileTransferError(FileTransferError.ABORT_ERR, source, target));
return;
}
// if download isn't cancelled, contunue with creating and preparing download operation
var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader();
for (var header in headers) {
downloader.setRequestHeader(header, headers[header]);
}
// create download object. This will throw an exception if URL is malformed
try {
var uri = Windows.Foundation.Uri(source);
download = downloader.createDownload(uri, storageFile);
} catch (e) {
// so we handle this and call errorCallback
errorCallback && errorCallback(new FileTransferError(FileTransferError.INVALID_URL_ERR));
return;
}
var downloadOperation = download.startAsync();
// update internal TransferOperation object with newly created promise
fileTransferOps[downloadId].promise = downloadOperation;
downloadOperation.then(function () {
// Update TransferOperation object with new state, delete promise property
// since it is not actual anymore
var currentDownloadOp = fileTransferOps[downloadId];
if (currentDownloadOp) {
currentDownloadOp.state = FileTransferOperation.DONE;
currentDownloadOp.promise = null;
}
successCallback && successCallback(new FileEntry(storageFile.name, storageFile.path));
}, function (error) {
var result;
// Handle download error here. If download was cancelled,
// message property will be specified
if (error.message == 'Canceled') {
result = new FileTransferError(FileTransferError.ABORT_ERR, source, target, null, null, error);
} else {
// in the other way, try to get response property
var response = download.getResponseInformation();
if (!response) {
result = new FileTransferError(FileTransferError.CONNECTION_ERR, source, target);
} else if (response.statusCode == 401 || response.statusCode == 404) {
result = new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, response.statusCode, null, error);
}
}
// Update TransferOperation object with new state, delete promise property
// since it is not actual anymore
var currentDownloadOp = fileTransferOps[downloadId];
if (currentDownloadOp) {
currentDownloadOp.state = FileTransferOperation.CANCELLED;
currentDownloadOp.promise = null;
}
// Cleanup, remove incompleted file
storageFile.deleteAsync().then(function () {
errorCallback && errorCallback(result);
});
}, function(evt) {
var progressEvent = new ProgressEvent('progress', {
loaded: evt.progress.bytesReceived,
total: evt.progress.totalBytesToReceive,
target: evt.resultFile
});
progressEvent.lengthComputable = true;
successCallback && successCallback(progressEvent, { keepCallback: true });
});
}, function (error) {
errorCallback && errorCallback(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, null, null, error));
});
}, function (error) {
errorCallback && errorCallback(new FileTransferError(FileTransferError.FILE_NOT_FOUND_ERR, source, target, null, null, error));
});
},
abort: function (successCallback, error, options) {
var fileTransferOpId = options[0];
// Try to find transferOperation with id specified, and cancel its' promise
var currentOp = fileTransferOps[fileTransferOpId];
if (currentOp) {
currentOp.state = FileTransferOperation.CANCELLED;
currentOp.promise && currentOp.promise.cancel();
}
}
};
require("cordova/exec/proxy").add("FileTransfer",module.exports);