Merge branch 'master' of http://github.com/sosahvictor/cordova-plugin-file
diff --git a/plugin.xml b/plugin.xml
index 0f06eb9..412ba57 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -313,7 +313,7 @@
<!-- windows8 -->
<platform name="windows8">
- <js-module src="src/windows8/FileProxy.js" name="FileProxy">
+ <js-module src="src/windows/FileProxy.js" name="FileProxy">
<merges target="" />
</js-module>
</platform>
diff --git a/src/android/LocalFilesystem.java b/src/android/LocalFilesystem.java
index e70ee22..05cda35 100644
--- a/src/android/LocalFilesystem.java
+++ b/src/android/LocalFilesystem.java
@@ -38,6 +38,9 @@
import android.util.Base64;
import android.net.Uri;
+import android.content.Context;
+import android.content.Intent;
+import android.app.Activity;
public class LocalFilesystem extends Filesystem {
@@ -579,6 +582,7 @@
// Always close the output
out.close();
}
+ broadcastNewFile(inputURL);
}
catch (NullPointerException e)
{
@@ -590,6 +594,31 @@
return rawData.length;
}
+ /**
+ * Send broadcast of new file so files appear over MTP
+ *
+ * @param inputURL
+ */
+ private void broadcastNewFile(LocalFilesystemURL inputURL) {
+ File file = new File(this.filesystemPathForURL(inputURL));
+ if (file.exists()) {
+ //Get the activity
+ Activity activity = this.cordova.getActivity();
+
+ //Get the context
+ Context context = activity.getApplicationContext();
+
+ //Create the URI
+ Uri uri = Uri.fromFile(file);
+
+ //Create the intent
+ Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri);
+
+ //Send broadcast of new file
+ context.sendBroadcast(intent);
+ }
+ }
+
@Override
public long truncateFileAtURL(LocalFilesystemURL inputURL, long size) throws IOException {
File file = new File(filesystemPathForURL(inputURL));
diff --git a/src/ios/CDVFile.m b/src/ios/CDVFile.m
index fcc5100..c0deb32 100644
--- a/src/ios/CDVFile.m
+++ b/src/ios/CDVFile.m
@@ -958,29 +958,30 @@
*/
- (void)write:(CDVInvokedUrlCommand*)command
{
- NSString* callbackId = command.callbackId;
- NSArray* arguments = command.arguments;
+ [self.commandDelegate runInBackground:^ {
+ NSString* callbackId = command.callbackId;
+ NSArray* arguments = command.arguments;
- // arguments
- CDVFilesystemURL* localURI = [self fileSystemURLforArg:command.arguments[0]];
- id argData = [arguments objectAtIndex:1];
- unsigned long long pos = (unsigned long long)[[arguments objectAtIndex:2] longLongValue];
+ // arguments
+ CDVFilesystemURL* localURI = [self fileSystemURLforArg:command.arguments[0]];
+ id argData = [arguments objectAtIndex:1];
+ unsigned long long pos = (unsigned long long)[[arguments objectAtIndex:2] longLongValue];
- NSObject<CDVFileSystem> *fs = [self filesystemForURL:localURI];
+ NSObject<CDVFileSystem> *fs = [self filesystemForURL:localURI];
- [fs truncateFileAtURL:localURI atPosition:pos];
- CDVPluginResult *result;
- if ([argData isKindOfClass:[NSString class]]) {
- NSData *encData = [argData dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
- result = [fs writeToFileAtURL:localURI withData:encData append:YES];
- } else if ([argData isKindOfClass:[NSData class]]) {
- result = [fs writeToFileAtURL:localURI withData:argData append:YES];
- } else {
- result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid parameter type"];
- }
- [self.commandDelegate sendPluginResult:result callbackId:callbackId];
-
+ [fs truncateFileAtURL:localURI atPosition:pos];
+ CDVPluginResult *result;
+ if ([argData isKindOfClass:[NSString class]]) {
+ NSData *encData = [argData dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
+ result = [fs writeToFileAtURL:localURI withData:encData append:YES];
+ } else if ([argData isKindOfClass:[NSData class]]) {
+ result = [fs writeToFileAtURL:localURI withData:argData append:YES];
+ } else {
+ result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"Invalid parameter type"];
+ }
+ [self.commandDelegate sendPluginResult:result callbackId:callbackId];
+ }];
}
#pragma mark Methods for converting between URLs and paths
diff --git a/src/windows/FileProxy.js b/src/windows/FileProxy.js
index 8d36ddb..9910c54 100644
--- a/src/windows/FileProxy.js
+++ b/src/windows/FileProxy.js
@@ -61,6 +61,30 @@
var getFolderFromPathAsync = Windows.Storage.StorageFolder.getFolderFromPathAsync;
var getFileFromPathAsync = Windows.Storage.StorageFile.getFileFromPathAsync;
+var writeBytesAsync = Windows.Storage.FileIO.writeBytesAsync;
+var writeTextAsync = Windows.Storage.FileIO.writeTextAsync;
+var writeBlobAsync = function writeBlobAsync(storageFile, data) {
+ return storageFile.openAsync(Windows.Storage.FileAccessMode.readWrite)
+ .then(function (output) {
+ var dataSize = data.size;
+ var input = (data.detachStream || data.msDetachStream).call(data);
+
+ // Copy the stream from the blob to the File stream
+ return Windows.Storage.Streams.RandomAccessStream.copyAsync(input, output)
+ .then(function () {
+ return output.flushAsync().then(function () {
+ input.close();
+ output.close();
+
+ return dataSize;
+ });
+ });
+ });
+};
+
+var writeArrayBufferAsync = function writeArrayBufferAsync(storageFile, data) {
+ return writeBlobAsync(storageFile, new Blob([data]));
+};
module.exports = {
@@ -325,12 +349,9 @@
var fullPath = cordovaPathToNative(args[0]);
getFileFromPathAsync(fullPath).then(
- function (sFile) {
- getFileFromPathAsync(fullPath).done(function (storageFile) {
+ function (storageFile) {
storageFile.deleteAsync().done(win, function () {
fail(FileError.INVALID_MODIFICATION_ERR);
-
- });
});
},
function () {
@@ -515,39 +536,59 @@
position = args[2],
isBinary = args[3];
- if (data instanceof ArrayBuffer) {
- data = Array.apply(null, new Uint8Array(data));
- }
-
- var writePromise = isBinary ? Windows.Storage.FileIO.writeBytesAsync : Windows.Storage.FileIO.writeTextAsync;
-
-
fileName = fileName.split("/").join("\\");
-
// split path to folder and file name
var path = fileName.substring(0, fileName.lastIndexOf('\\')),
file = fileName.split('\\').pop();
-
+
+ function getWriteMethodForData(data, isBinary) {
+
+ if (data instanceof Blob) {
+ return writeBlobAsync;
+ }
+
+ if (data instanceof ArrayBuffer) {
+ return writeArrayBufferAsync;
+ }
+
+ if (isBinary) {
+ return writeBytesAsync;
+ }
+
+ if (typeof data === 'string') {
+ return writeTextAsync;
+ }
+
+ throw new Error('Unsupported data type for write method');
+ }
+
+ var writePromise = getWriteMethodForData(data, isBinary);
getFolderFromPathAsync(path).done(
- function(storageFolder) {
+ function (storageFolder) {
storageFolder.createFileAsync(file, Windows.Storage.CreationCollisionOption.openIfExists).done(
- function(storageFile) {
- writePromise(storageFile, data).
- done(function () {
- win(data.length);
- }, function () {
+ function (storageFile) {
+ writePromise(storageFile, data).done(
+ function (bytesWritten) {
+ var written = bytesWritten || data.length;
+ win(written);
+ },
+ function () {
fail(FileError.INVALID_MODIFICATION_ERR);
- });
- }, function() {
+ }
+ );
+ },
+ function () {
fail(FileError.INVALID_MODIFICATION_ERR);
}
);
-
- }, function() {
+
+ },
+ function () {
fail(FileError.NOT_FOUND_ERR);
- });
+ }
+ );
},
truncate: function (win, fail, args) { // ["fileName","size"]
diff --git a/src/windows8/FileProxy.js b/src/windows8/FileProxy.js
deleted file mode 100644
index 25fdee0..0000000
--- a/src/windows8/FileProxy.js
+++ /dev/null
@@ -1,943 +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.
- *
-*/
-
-var cordova = require('cordova');
-var Entry = require('./Entry'),
- File = require('./File'),
- FileEntry = require('./FileEntry'),
- FileError = require('./FileError'),
- DirectoryEntry = require('./DirectoryEntry'),
- Flags = require('./Flags'),
- FileSystem = require('./FileSystem'),
- LocalFileSystem = require('./LocalFileSystem');
-
-// 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;
-};
-
-function getFilesystemFromPath(path) {
- var storageFolderPermanent = Windows.Storage.ApplicationData.current.localFolder.path,
- storageFolderTemporary = Windows.Storage.ApplicationData.current.temporaryFolder.path,
- fs = null;
-
- if (path.indexOf(storageFolderPermanent) === 0) {
- fs = new FileSystem('persistent', { name: 'persistent', fullPath: storageFolderPermanent });
- } else if (path.indexOf(storageFolderTemporary) === 0) {
- fs = new FileSystem('temporary', { name: 'temporary', fullPath: storageFolderTemporary });
- }
- return fs;
-};
-
-var getFolderFromPathAsync = Windows.Storage.StorageFolder.getFolderFromPathAsync;
-var getFileFromPathAsync = Windows.Storage.StorageFile.getFileFromPathAsync;
-
-
-module.exports = {
-
- getFileMetadata: function (success, fail, args) {
- module.exports.getMetadata(success, fail, args);
- },
-
- getMetadata: function (success, fail, args) {
-
- var fullPath = cordovaPathToNative(args[0]);
-
- var getMetadataForFile = function (storageFile) {
- storageFile.getBasicPropertiesAsync().then(
- function (basicProperties) {
- success(new File(storageFile.name, storageFile.path, storageFile.fileType, basicProperties.dateModified, basicProperties.size));
- }, function () {
- fail(FileError.NOT_READABLE_ERR);
- }
- );
- };
-
- var getMetadataForFolder = function (storageFolder) {
- storageFolder.getBasicPropertiesAsync().then(
- function (basicProperties) {
- var metadata = {
- size: basicProperties.size,
- lastModifiedDate: basicProperties.dateModified
- };
- success(metadata);
- },
- function () {
- fail(FileError.NOT_READABLE_ERR);
- }
- );
- };
-
- getFileFromPathAsync(fullPath).then(getMetadataForFile,
- function () {
- getFolderFromPathAsync(fullPath).then(getMetadataForFolder,
- function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- }
- );
- },
-
- getParent: function (win, fail, args) { // ["fullPath"]
-
- var fullPath = cordovaPathToNative(args[0]);
-
- var storageFolderPer = Windows.Storage.ApplicationData.current.localFolder;
- var storageFolderTem = Windows.Storage.ApplicationData.current.temporaryFolder;
-
- if (fullPath == storageFolderPer.path) {
- win(new DirectoryEntry(storageFolderPer.name, storageFolderPer.path, getFilesystemFromPath(storageFolderPer.path)));
- return;
- } else if (fullPath == storageFolderTem.path) {
- win(new DirectoryEntry(storageFolderTem.name, storageFolderTem.path, getFilesystemFromPath(storageFolderTem.path)));
- return;
- }
- var splitArr = fullPath.split(new RegExp(/\/|\\/g));
-
- var popItem = splitArr.pop();
-
- var resultPath = fullPath.substr(0, fullPath.length - popItem.length - 1);
- var result = new DirectoryEntry(popItem, resultPath, getFilesystemFromPath(resultPath));
- getFolderFromPathAsync(result.fullPath).done(
- function () { win(result); },
- function () { fail(FileError.INVALID_STATE_ERR); }
- );
- },
-
- readAsText: function (win, fail, args) {
-
- var fileName = cordovaPathToNative(args[0]),
- enc = args[1],
- startPos = args[2],
- endPos = args[3];
-
- var encoding = Windows.Storage.Streams.UnicodeEncoding.utf8;
- if (enc == 'Utf16LE' || enc == 'utf16LE') {
- encoding = Windows.Storage.Streams.UnicodeEncoding.utf16LE;
- } else if (enc == 'Utf16BE' || enc == 'utf16BE') {
- encoding = Windows.Storage.Streams.UnicodeEncoding.utf16BE;
- }
-
- getFileFromPathAsync(fileName).then(function(file) {
- return file.openReadAsync();
- }).then(function (stream) {
- startPos = (startPos < 0) ? Math.max(stream.size + startPos, 0) : Math.min(stream.size, startPos);
- endPos = (endPos < 0) ? Math.max(endPos + stream.size, 0) : Math.min(stream.size, endPos);
- stream.seek(startPos);
-
- var readSize = endPos - startPos,
- buffer = new Windows.Storage.Streams.Buffer(readSize);
-
- return stream.readAsync(buffer, readSize, Windows.Storage.Streams.InputStreamOptions.none);
- }).done(function(buffer) {
- win(Windows.Security.Cryptography.CryptographicBuffer.convertBinaryToString(encoding, buffer));
- },function() {
- fail(FileError.NOT_FOUND_ERR);
- });
- },
-
- readAsBinaryString:function(win,fail,args) {
- var fileName = cordovaPathToNative(args[0]),
- startPos = args[1],
- endPos = args[2];
-
-
- getFileFromPathAsync(fileName).then(
- function (storageFile) {
- Windows.Storage.FileIO.readBufferAsync(storageFile).done(
- function (buffer) {
- var dataReader = Windows.Storage.Streams.DataReader.fromBuffer(buffer);
- // var fileContent = dataReader.readString(buffer.length);
- var byteArray = new Uint8Array(buffer.length),
- byteString = "";
- dataReader.readBytes(byteArray);
- dataReader.close();
- for (var i = 0; i < byteArray.length; i++) {
- var charByte = byteArray[i];
- // var charRepresentation = charByte <= 127 ? String.fromCharCode(charByte) : charByte.toString(16);
- var charRepresentation = String.fromCharCode(charByte);
- byteString += charRepresentation;
- }
- win(byteString.slice(startPos, endPos));
- }
- );
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- },
-
- readAsArrayBuffer:function(win,fail,args) {
- var fileName =cordovaPathToNative(args[0]);
-
- getFileFromPathAsync(fileName).then(
- function (storageFile) {
- var blob = MSApp.createFileFromStorageFile(storageFile);
- var url = URL.createObjectURL(blob, { oneTimeOnly: true });
- var xhr = new XMLHttpRequest();
- xhr.open("GET", url, true);
- xhr.responseType = 'arraybuffer';
- xhr.onload = function () {
- var resultArrayBuffer = xhr.response;
- // get start and end position of bytes in buffer to be returned
- var startPos = args[1] || 0,
- endPos = args[2] || resultArrayBuffer.length;
- // if any of them is specified, we'll slice output array
- if (startPos !== 0 || endPos !== resultArrayBuffer.length) {
- // slice method supported only on Windows 8.1, so we need to check if it's available
- // see http://msdn.microsoft.com/en-us/library/ie/dn641192(v=vs.94).aspx
- if (resultArrayBuffer.slice) {
- resultArrayBuffer = resultArrayBuffer.slice(startPos, endPos);
- } else {
- // if slice isn't available, we'll use workaround method
- var tempArray = new Uint8Array(resultArrayBuffer),
- resBuffer = new ArrayBuffer(endPos - startPos),
- resArray = new Uint8Array(resBuffer);
-
- for (var i = 0; i < resArray.length; i++) {
- resArray[i] = tempArray[i + startPos];
- }
- resultArrayBuffer = resBuffer;
- }
- }
- win(resultArrayBuffer);
- };
- xhr.send();
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- },
-
- readAsDataURL: function (win, fail, args) {
-
- var fileName = cordovaPathToNative(args[0]);
-
- getFileFromPathAsync(fileName).then(
- function (storageFile) {
- Windows.Storage.FileIO.readBufferAsync(storageFile).done(
- function (buffer) {
- var strBase64 = Windows.Security.Cryptography.CryptographicBuffer.encodeToBase64String(buffer);
- //the method encodeToBase64String will add "77u/" as a prefix, so we should remove it
- if(String(strBase64).substr(0,4) == "77u/") {
- strBase64 = strBase64.substr(4);
- }
- var mediaType = storageFile.contentType;
- var result = "data:" + mediaType + ";base64," + strBase64;
- win(result);
- }
- );
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- },
-
- getDirectory: function (win, fail, args) {
-
- var fullPath = cordovaPathToNative(args[0]);
- var path = cordovaPathToNative(args[1]);
- var options = args[2];
-
- var flag = "";
- if (options) {
- flag = new Flags(options.create, options.exclusive);
- } else {
- flag = new Flags(false, false);
- }
-
- getFolderFromPathAsync(fullPath).then(
- function (storageFolder) {
- if (flag.create === true && flag.exclusive === true) {
- storageFolder.createFolderAsync(path, Windows.Storage.CreationCollisionOption.failIfExists).done(
- function (storageFolder) {
- win(new DirectoryEntry(storageFolder.name, storageFolder.path, getFilesystemFromPath(storageFolder.path)));
- }, function () {
- fail(FileError.PATH_EXISTS_ERR);
- }
- );
- } else if (flag.create === true && flag.exclusive === false) {
- storageFolder.createFolderAsync(path, Windows.Storage.CreationCollisionOption.openIfExists).done(
- function (storageFolder) {
- win(new DirectoryEntry(storageFolder.name, storageFolder.path + "/", getFilesystemFromPath(storageFolder.path + "/")));
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }
- );
- } else if (flag.create === false) {
- if (/\?|\\|\*|\||\"|<|>|\:|\//g.test(path)) {
- fail(FileError.ENCODING_ERR);
- return;
- }
-
- storageFolder.getFolderAsync(path).done(
- function (storageFolder) {
- win(new DirectoryEntry(storageFolder.name, storageFolder.path, getFilesystemFromPath(storageFolder.path)));
- }, function () {
- // check if path actually points to a file
- storageFolder.getFileAsync(path).done(
- function () {
- fail(FileError.TYPE_MISMATCH_ERR);
- }, function() {
- fail(FileError.NOT_FOUND_ERR);
- });
- }
- );
- }
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- },
-
- remove: function (win, fail, args) {
-
- var fullPath = cordovaPathToNative(args[0]);
-
- getFileFromPathAsync(fullPath).then(
- function (sFile) {
- getFileFromPathAsync(fullPath).done(function (storageFile) {
- storageFile.deleteAsync().done(win, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
-
- });
- });
- },
- function () {
- getFolderFromPathAsync(fullPath).then(
- function (sFolder) {
- var removeEntry = function () {
- var storageFolderTop = null;
-
- getFolderFromPathAsync(fullPath).then(
- function (storageFolder) {
- // FileSystem root can't be removed!
- var storageFolderPer = Windows.Storage.ApplicationData.current.localFolder;
- var storageFolderTem = Windows.Storage.ApplicationData.current.temporaryFolder;
- if (fullPath == storageFolderPer.path || fullPath == storageFolderTem.path) {
- fail(FileError.NO_MODIFICATION_ALLOWED_ERR);
- return;
- }
- storageFolderTop = storageFolder;
- return storageFolder.createFileQuery().getFilesAsync();
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
-
- }
- // check sub-files.
- ).then(function (fileList) {
- if (fileList) {
- if (fileList.length === 0) {
- return storageFolderTop.createFolderQuery().getFoldersAsync();
- } else {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }
- }
- // check sub-folders.
- }).then(function (folderList) {
- if (folderList) {
- if (folderList.length === 0) {
- storageFolderTop.deleteAsync().done(win, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
-
- });
- } else {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }
- }
-
- });
- };
- removeEntry();
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- }
- );
- },
-
- removeRecursively: function (successCallback, fail, args) {
-
- var fullPath = cordovaPathToNative(args[0]);
-
- getFolderFromPathAsync(fullPath).done(function (storageFolder) {
- var storageFolderPer = Windows.Storage.ApplicationData.current.localFolder;
- var storageFolderTem = Windows.Storage.ApplicationData.current.temporaryFolder;
-
- if (storageFolder.path == storageFolderPer.path || storageFolder.path == storageFolderTem.path) {
- fail(FileError.NO_MODIFICATION_ALLOWED_ERR);
- return;
- }
-
- storageFolder.deleteAsync().done(function (res) {
- successCallback(res);
- }, function (err) {
- fail(err);
- });
-
- }, function () {
- fail(FileError.FILE_NOT_FOUND_ERR);
- });
- },
-
- getFile: function (win, fail, args) {
-
- //not sure why, but it won't work with normal slashes...
- var fullPath = cordovaPathToNative(args[0]);
- var path = cordovaPathToNative(args[1]);
- var options = args[2];
-
- var completePath = fullPath + '\\' + path;
- //handles trailing slash and leading slash, or just one or the other
- completePath = completePath.replace(/\\\\\\/g, '/').replace(/\\\\/g, '\\');
-
- var fileName = completePath.substring(completePath.lastIndexOf('\\'));
-
- //final adjustment
- fullPath = completePath.substring(0, completePath.lastIndexOf('\\'));
- path = fileName.replace(/\\/g, '');
-
- var flag = "";
- if (options !== null) {
- flag = new Flags(options.create, options.exclusive);
- } else {
- flag = new Flags(false, false);
- }
-
- getFolderFromPathAsync(fullPath).then(
- function (storageFolder) {
- if (flag.create === true && flag.exclusive === true) {
- storageFolder.createFileAsync(path, Windows.Storage.CreationCollisionOption.failIfExists).done(
- function (storageFile) {
- win(new FileEntry(storageFile.name, nativePathToCordova(storageFile.path), getFilesystemFromPath(storageFile.path)));
- }, function () {
- fail(FileError.PATH_EXISTS_ERR);
- }
- );
- } else if (flag.create === true && flag.exclusive === false) {
- storageFolder.createFileAsync(path, Windows.Storage.CreationCollisionOption.openIfExists).done(
- function (storageFile) {
- win(new FileEntry(storageFile.name, nativePathToCordova(storageFile.path), getFilesystemFromPath(storageFile.path)));
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }
- );
- } else if (flag.create === false) {
- if (/\?|\\|\*|\||\"|<|>|\:|\//g.test(path)) {
- fail(FileError.ENCODING_ERR);
- return;
- }
- storageFolder.getFileAsync(path).done(
- function (storageFile) {
- win(new FileEntry(storageFile.name, nativePathToCordova(storageFile.path), getFilesystemFromPath(storageFile.path)));
- }, function () {
- // check if path actually points to a folder
- storageFolder.getFolderAsync(path).done(
- function () {
- fail(FileError.TYPE_MISMATCH_ERR);
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- });
- }
- );
- }
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- },
-
- readEntries: function (win, fail, args) { // ["fullPath"]
-
- var path = cordovaPathToNative(args[0]);
-
- var result = [];
-
- getFolderFromPathAsync(path).then(function (storageFolder) {
- var promiseArr = [];
- var index = 0;
- promiseArr[index++] = storageFolder.createFileQuery().getFilesAsync().then(function (fileList) {
- if (fileList !== null) {
- for (var i = 0; i < fileList.length; i++) {
- result.push(new FileEntry(fileList[i].name, fileList[i].path, getFilesystemFromPath (fileList[i].path)));
- }
- }
- });
- promiseArr[index++] = storageFolder.createFolderQuery().getFoldersAsync().then(function (folderList) {
- if (folderList !== null) {
- for (var j = 0; j < folderList.length; j++) {
- result.push(new DirectoryEntry(folderList[j].name, folderList[j].path, getFilesystemFromPath(folderList[j].path)));
- }
- }
- });
- WinJS.Promise.join(promiseArr).then(function () {
- win(result);
- });
-
- }, function () { fail(FileError.NOT_FOUND_ERR); });
- },
-
- write: function (win, fail, args) {
-
- var fileName = cordovaPathToNative(args[0]),
- data = args[1],
- position = args[2],
- isBinary = args[3];
-
- if (data instanceof ArrayBuffer) {
- data = Array.apply(null, new Uint8Array(data));
- }
-
- var writePromise = isBinary ? Windows.Storage.FileIO.writeBytesAsync : Windows.Storage.FileIO.writeTextAsync;
-
-
- fileName = fileName.split("/").join("\\");
-
-
- // split path to folder and file name
- var path = fileName.substring(0, fileName.lastIndexOf('\\')),
- file = fileName.split('\\').pop();
-
-
- getFolderFromPathAsync(path).done(
- function(storageFolder) {
- storageFolder.createFileAsync(file, Windows.Storage.CreationCollisionOption.openIfExists).done(
- function(storageFile) {
- writePromise(storageFile, data).
- done(function () {
- win(data.length);
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
- });
- }, function() {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }
- );
-
- }, function() {
- fail(FileError.NOT_FOUND_ERR);
- });
- },
-
- truncate: function (win, fail, args) { // ["fileName","size"]
-
- var fileName = cordovaPathToNative(args[0]);
- var size = args[1];
-
- getFileFromPathAsync(fileName).done(function(storageFile){
- //the current length of the file.
- var leng = 0;
-
- storageFile.getBasicPropertiesAsync().then(function (basicProperties) {
- leng = basicProperties.size;
- if (Number(size) >= leng) {
- win(this.length);
- return;
- }
- if (Number(size) >= 0) {
- Windows.Storage.FileIO.readTextAsync(storageFile, Windows.Storage.Streams.UnicodeEncoding.utf8).then(function (fileContent) {
- fileContent = fileContent.substr(0, size);
- var fullPath = storageFile.path;
- var name = storageFile.name;
- var entry = new Entry(true, false, name, fullPath, getFilesystemFromPath(fullPath));
- var parentPath = "";
- var successCallBack = function (entry) {
- parentPath = entry.fullPath;
- storageFile.deleteAsync().then(function () {
- return getFolderFromPathAsync(parentPath);
- }).then(function (storageFolder) {
- storageFolder.createFileAsync(name).then(function (newStorageFile) {
- Windows.Storage.FileIO.writeTextAsync(newStorageFile, fileContent).done(function () {
- win(String(fileContent).length);
- }, function () {
- fail(FileError.NO_MODIFICATION_ALLOWED_ERR);
- });
- }, function() {
- fail(FileError.NO_MODIFICATION_ALLOWED_ERR);
- });
- });
- };
- entry.getParent(successCallBack, null);
- }, function () { fail(FileError.NOT_FOUND_ERR); });
- }
- });
- }, function () { fail(FileError.NOT_FOUND_ERR); });
- },
-
- copyTo: function (success, fail, args) { // ["fullPath","parent", "newName"]
-
- var srcPath = cordovaPathToNative(args[0]);
- var parentFullPath = cordovaPathToNative(args[1]);
- var name = args[2];
-
- //name can't be invalid
- if (/\?|\\|\*|\||\"|<|>|\:|\//g.test(name)) {
- fail(FileError.ENCODING_ERR);
- return;
- }
- // copy
- var copyFiles = "";
- getFileFromPathAsync(srcPath).then(
- function (sFile) {
- copyFiles = function (srcPath, parentPath) {
- var storageFileTop = null;
- getFileFromPathAsync(srcPath).then(function (storageFile) {
- storageFileTop = storageFile;
- return getFolderFromPathAsync(parentPath);
- }, function () {
-
- fail(FileError.NOT_FOUND_ERR);
- }).then(function (storageFolder) {
- storageFileTop.copyAsync(storageFolder, name, Windows.Storage.NameCollisionOption.failIfExists).then(function (storageFile) {
-
- success(new FileEntry(storageFile.name, nativePathToCordova(storageFile.path), getFilesystemFromPath(storageFile.path)));
- }, function () {
-
- fail(FileError.INVALID_MODIFICATION_ERR);
- });
- }, function () {
-
- fail(FileError.NOT_FOUND_ERR);
- });
- };
- var copyFinish = function (srcPath, parentPath) {
- copyFiles(srcPath, parentPath);
- };
- copyFinish(srcPath, parentFullPath);
- },
- function () {
- getFolderFromPathAsync(srcPath).then(
- function (sFolder) {
- copyFiles = function (srcPath, parentPath) {
- var coreCopy = function (storageFolderTop, complete) {
- storageFolderTop.createFolderQuery().getFoldersAsync().then(function (folderList) {
- var folderPromiseArr = [];
- if (folderList.length === 0) { complete(); }
- else {
- getFolderFromPathAsync(parentPath).then(function (storageFolderTarget) {
- var tempPromiseArr = [];
- var index = 0;
- for (var j = 0; j < folderList.length; j++) {
- tempPromiseArr[index++] = storageFolderTarget.createFolderAsync(folderList[j].name).then(function (targetFolder) {
- folderPromiseArr.push(copyFiles(folderList[j].path, targetFolder.path));
- });
- }
- WinJS.Promise.join(tempPromiseArr).then(function () {
- WinJS.Promise.join(folderPromiseArr).then(complete);
- });
- });
- }
- });
- };
-
- return new WinJS.Promise(function (complete) {
- var storageFolderTop = null;
- var filePromiseArr = [];
- var fileListTop = null;
- getFolderFromPathAsync(srcPath).then(function (storageFolder) {
- storageFolderTop = storageFolder;
- return storageFolder.createFileQuery().getFilesAsync();
- }).then(function (fileList) {
- fileListTop = fileList;
- if (fileList) {
- return getFolderFromPathAsync(parentPath);
- }
- }).then(function (targetStorageFolder) {
- for (var i = 0; i < fileListTop.length; i++) {
- filePromiseArr.push(fileListTop[i].copyAsync(targetStorageFolder));
- }
- WinJS.Promise.join(filePromiseArr).done(function () {
- coreCopy(storageFolderTop, complete);
- }, function() {
- fail(FileError.INVALID_MODIFICATION_ERR);
- });
- });
- });
- };
- var copyFinish = function (srcPath, parentPath) {
- getFolderFromPathAsync(parentPath).then(function (storageFolder) {
- storageFolder.createFolderAsync(name, Windows.Storage.CreationCollisionOption.openIfExists).then(function (newStorageFolder) {
- //can't copy onto itself
- if (srcPath == newStorageFolder.path) {
- fail(FileError.INVALID_MODIFICATION_ERR);
- return;
- }
- //can't copy into itself
- if (srcPath == parentPath) {
- fail(FileError.INVALID_MODIFICATION_ERR);
- return;
- }
- copyFiles(srcPath, newStorageFolder.path).then(function () {
- getFolderFromPathAsync(newStorageFolder.path).done(
- function (storageFolder) {
- success(new DirectoryEntry(storageFolder.name, nativePathToCordova(storageFolder.path), getFilesystemFromPath(storageFolder.path)));
- },
- function () { fail(FileError.NOT_FOUND_ERR); }
- );
- });
- }, function () { fail(FileError.INVALID_MODIFICATION_ERR); });
- }, function () { fail(FileError.INVALID_MODIFICATION_ERR); });
- };
- copyFinish(srcPath, parentFullPath);
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- }
- );
- },
-
- moveTo: function (success, fail, args) {
-
- var srcPath = cordovaPathToNative(args[0]);
- var parentFullPath = cordovaPathToNative(args[1]);
- var name = args[2];
-
-
- //name can't be invalid
- if (/\?|\\|\*|\||\"|<|>|\:|\//g.test(name)) {
- fail(FileError.ENCODING_ERR);
- return;
- }
-
- var moveFiles = "";
- getFileFromPathAsync(srcPath).then(
- function (sFile) {
- moveFiles = function (srcPath, parentPath) {
- var storageFileTop = null;
- getFileFromPathAsync(srcPath).then(function (storageFile) {
- storageFileTop = storageFile;
- return getFolderFromPathAsync(parentPath);
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }).then(function (storageFolder) {
- storageFileTop.moveAsync(storageFolder, name, Windows.Storage.NameCollisionOption.replaceExisting).then(function () {
- success(new FileEntry(name, nativePathToCordova(storageFileTop.path), getFilesystemFromPath(storageFolder.path)));
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
- });
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- });
- };
- var moveFinish = function (srcPath, parentPath) {
- //can't copy onto itself
- if (srcPath == parentPath + "\\" + name) {
- fail(FileError.INVALID_MODIFICATION_ERR);
- return;
- }
- moveFiles(srcPath, parentFullPath);
- };
- moveFinish(srcPath, parentFullPath);
- },
- function () {
- getFolderFromPathAsync(srcPath).then(
- function (sFolder) {
- moveFiles = function (srcPath, parentPath) {
- var coreMove = function (storageFolderTop, complete) {
- storageFolderTop.createFolderQuery().getFoldersAsync().then(function (folderList) {
- var folderPromiseArr = [];
- if (folderList.length === 0) {
- // If failed, we must cancel the deletion of folders & files.So here wo can't delete the folder.
- complete();
- }
- else {
- getFolderFromPathAsync(parentPath).then(function (storageFolderTarget) {
- var tempPromiseArr = [];
- var index = 0;
- for (var j = 0; j < folderList.length; j++) {
- tempPromiseArr[index++] = storageFolderTarget.createFolderAsync(folderList[j].name).then(function (targetFolder) {
- folderPromiseArr.push(moveFiles(folderList[j].path, targetFolder.path));
- });
- }
- WinJS.Promise.join(tempPromiseArr).then(function () {
- WinJS.Promise.join(folderPromiseArr).then(complete);
- });
- });
- }
- });
- };
- return new WinJS.Promise(function (complete) {
- var storageFolderTop = null;
- getFolderFromPathAsync(srcPath).then(function (storageFolder) {
- storageFolderTop = storageFolder;
- return storageFolder.createFileQuery().getFilesAsync();
- }).then(function (fileList) {
- var filePromiseArr = [];
- getFolderFromPathAsync(parentPath).then(function (dstStorageFolder) {
- if (fileList) {
- for (var i = 0; i < fileList.length; i++) {
- filePromiseArr.push(fileList[i].moveAsync(dstStorageFolder));
- }
- }
- WinJS.Promise.join(filePromiseArr).then(function () {
- coreMove(storageFolderTop, complete);
- }, function () { });
- });
- });
- });
- };
- var moveFinish = function (srcPath, parentPath) {
- var originFolderTop = null;
- getFolderFromPathAsync(srcPath).then(function (originFolder) {
- originFolderTop = originFolder;
- return getFolderFromPathAsync(parentPath);
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }).then(function (storageFolder) {
- return storageFolder.createFolderAsync(name, Windows.Storage.CreationCollisionOption.openIfExists);
- }, function () {
- fail(FileError.INVALID_MODIFICATION_ERR);
- }).then(function (newStorageFolder) {
- //can't move onto directory that is not empty
- newStorageFolder.createFileQuery().getFilesAsync().then(function (fileList) {
- newStorageFolder.createFolderQuery().getFoldersAsync().then(function (folderList) {
- if (fileList.length !== 0 || folderList.length !== 0) {
- fail(FileError.INVALID_MODIFICATION_ERR);
- return;
- }
- //can't copy onto itself
- if (srcPath == newStorageFolder.path) {
- fail(FileError.INVALID_MODIFICATION_ERR);
- return;
- }
- //can't copy into itself
- if (srcPath == parentPath) {
- fail(FileError.INVALID_MODIFICATION_ERR);
- return;
- }
- moveFiles(srcPath, newStorageFolder.path).then(function () {
- var successCallback = function () {
- success(new DirectoryEntry(name, nativePathToCordova(newStorageFolder.path), getFilesystemFromPath(newStorageFolder.path)));
- };
-
- originFolderTop.deleteAsync().done(successCallback, fail);
-
- }, function () { console.log("error!"); });
- });
- });
- }, function () { fail(FileError.INVALID_MODIFICATION_ERR); });
-
- };
- moveFinish(srcPath, parentFullPath);
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- }
- );
- },
- tempFileSystem:null,
-
- persistentFileSystem:null,
-
- requestFileSystem: function (win, fail, args) {
-
- var type = args[0];
- var size = args[1];
-
- var filePath = "";
- var result = null;
- var fsTypeName = "";
-
- switch (type) {
- case LocalFileSystem.TEMPORARY:
- filePath = Windows.Storage.ApplicationData.current.temporaryFolder.path;
- fsTypeName = "temporary";
- break;
- case LocalFileSystem.PERSISTENT:
- filePath = Windows.Storage.ApplicationData.current.localFolder.path;
- fsTypeName = "persistent";
- break;
- }
-
- var MAX_SIZE = 10000000000;
- if (size > MAX_SIZE) {
- fail(FileError.QUOTA_EXCEEDED_ERR);
- return;
- }
-
- var fileSystem = new FileSystem(fsTypeName, new DirectoryEntry(fsTypeName, nativePathToCordova(filePath)));
- result = fileSystem;
- win(result);
- },
-
- resolveLocalFileSystemURI: function (success, fail, args) {
-
- var uri = cordovaPathToNative(args[0]);
-
- var path = uri;
-
- // support for file name with parameters
- if (/\?/g.test(path)) {
- path = String(path).split("?")[0];
- }
-
- // support for encodeURI
- if (/\%5/g.test(path)) {
- path = decodeURI(path);
- }
-
- // support for special path start with file:///
- if (path.substr(0, 8) == "file:///") {
- path = Windows.Storage.ApplicationData.current.localFolder.path + "\\" + String(path).substr(8);
- } else {
- // method should not let read files outside of the [APP HASH]/Local or [APP HASH]/temp folders
- if (path.indexOf(Windows.Storage.ApplicationData.current.temporaryFolder.path) != 0 &&
- path.indexOf(Windows.Storage.ApplicationData.current.localFolder.path) != 0) {
- fail(FileError.NOT_FOUND_ERR);
- return;
- }
- }
-
- getFileFromPathAsync(path).then(
- function (storageFile) {
- success(new FileEntry(storageFile.name, nativePathToCordova(storageFile.path), getFilesystemFromPath(storageFile.path)));
- }, function () {
- getFolderFromPathAsync(path).then(
- function (storageFolder) {
- var cordovaPath = nativePathToCordova(storageFolder.path);
- success(new DirectoryEntry(storageFolder.name, cordovaPath, getFilesystemFromPath(storageFolder.path), cordovaPath));
- }, function () {
- fail(FileError.NOT_FOUND_ERR);
- }
- );
- }
- );
- }
-
-
-};
-
-require("cordova/exec/proxy").add("File",module.exports);
diff --git a/www/FileWriter.js b/www/FileWriter.js
index 786e994..7f53c0c 100644
--- a/www/FileWriter.js
+++ b/www/FileWriter.js
@@ -1,4 +1,4 @@
-/*
+/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -99,10 +99,11 @@
var that=this;
var supportsBinary = (typeof window.Blob !== 'undefined' && typeof window.ArrayBuffer !== 'undefined');
+ var isProxySupportBlobNatively = (cordova.platformId === "windows8" || cordova.platformId === "windows");
var isBinary;
// Check to see if the incoming data is a blob
- if (data instanceof File || (supportsBinary && data instanceof Blob)) {
+ if (data instanceof File || (!isProxySupportBlobNatively && supportsBinary && data instanceof Blob)) {
var fileReader = new FileReader();
fileReader.onload = function() {
// Call this method again, with the arraybuffer as argument
@@ -118,7 +119,7 @@
// Mark data type for safer transport over the binary bridge
isBinary = supportsBinary && (data instanceof ArrayBuffer);
- if (isBinary && ['windowsphone', 'windows8'].indexOf(cordova.platformId) >= 0) {
+ if (isBinary && cordova.platformId === "windowsphone") {
// create a plain array, using the keys from the Uint8Array view so that we can serialize it
data = Array.apply(null, new Uint8Array(data));
}
diff --git a/www/firefoxos/FileSystem.js b/www/firefoxos/FileSystem.js
index 23daa07..8ff0ec4 100644
--- a/www/firefoxos/FileSystem.js
+++ b/www/firefoxos/FileSystem.js
@@ -19,7 +19,7 @@
*
*/
-FILESYSTEM_PREFIX = "cdvfile://";
+FILESYSTEM_PREFIX = "file:///";
module.exports = {
__format__: function(fullPath) {
