From: Pawel Kaczmarczyk Date: Fri, 10 Aug 2018 10:37:47 +0000 (+0200) Subject: [Filesystem] Add missing deprecation warnings since Tizen 5.0 X-Git-Tag: submit/tizen/20180907.104919~7^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=275c3efc9c7b31007f4dd81baa9a258ca642eb75;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [Filesystem] Add missing deprecation warnings since Tizen 5.0 [Verification] tct-filesystem-tizen-tests: 100% Change-Id: I8f0c2b888d1965a3ca633e1f56d77d88c4505ab1 Signed-off-by: Pawel Kaczmarczyk --- diff --git a/src/filesystem/filesystem_instance.cc b/src/filesystem/filesystem_instance.cc index 52f5948c..7487ed28 100644 --- a/src/filesystem/filesystem_instance.cc +++ b/src/filesystem/filesystem_instance.cc @@ -247,6 +247,10 @@ FilesystemInstance::~FilesystemInstance() { void FilesystemInstance::FileCreateSync(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.createFile() is deprecated since Tizen 5.0. Use " + "FileSystemManager.openFile() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) const std::string& location = args.get("location").get(); @@ -267,6 +271,10 @@ void FilesystemInstance::FileCreateSync(const picojson::value& args, picojson::o void FilesystemInstance::FileRename(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.moveTo() is deprecated since Tizen 5.0. Use " + "FileSystemManager.moveFile() or FileSystemManager.moveDirectory() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "callbackId", out) @@ -703,6 +711,10 @@ static std::vector decode(const char* str, std::size_t len) { void FilesystemInstance::FileReadString(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: This method is deprecated since Tizen 5.0.Use FileHandle.readString() " + "or FileHandle.readStringNonBlocking() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "offset", out) @@ -733,6 +745,10 @@ void FilesystemInstance::FileReadString(const picojson::value& args, picojson::o void FilesystemInstance::FileReadBytes(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: This method is deprecated since Tizen 5.0. Use FileHandle.readData() " + "or FileHandle.readDataNonBlocking() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "offset", out) @@ -756,6 +772,10 @@ void FilesystemInstance::FileReadBytes(const picojson::value& args, picojson::ob void FilesystemInstance::FileWriteString(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: FileStream.write() is deprecated since Tizen 5.0. Use " + "FileHandle.writeString() or FileHandle.writeStringNonBlocking() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "data", out) @@ -791,6 +811,10 @@ void FilesystemInstance::FileWriteString(const picojson::value& args, picojson:: void FilesystemInstance::FileWriteBytes(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: FileStream.writeBytes() is deprecated since Tizen 5.0. To read and Use " + "FileHandle.writeData() or FileHandle.writeDataNonBlocking() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "data", out) @@ -818,6 +842,11 @@ void FilesystemInstance::FileWriteBytes(const picojson::value& args, picojson::o void FilesystemInstance::FileWriteBase64(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: FileStream.writeBase64() is deprecated since Tizen 5.0. Use " + "FileHandle.writeData() or FileHandle.writeDataNonBlocking() in combination with atob() and " + "btoa() functions instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) CHECK_EXIST(args, "data", out) @@ -1011,6 +1040,10 @@ void FilesystemInstance::FileSystemManagerMakeDirectory(const picojson::value& a void FilesystemInstance::FileSystemManagerMakeDirectorySync(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.createDirectory() is deprecated since Tizen 5.0. Use " + "FileSystemManager.createDirectory() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "location", out) const std::string& location = args.get("location").get(); @@ -1029,6 +1062,10 @@ void FilesystemInstance::FileSystemManagerMakeDirectorySync(const picojson::valu void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.listFiles() is deprecated since Tizen 5.0. Use " + "FileSystemManager.listDirectory() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out); CHECK_EXIST(args, "pathToDir", out) CHECK_EXIST(args, "callbackId", out) @@ -1068,6 +1105,10 @@ void FilesystemInstance::ReadDir(const picojson::value& args, picojson::object& void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.deleteFile() is deprecated since Tizen 5.0. Use " + "FileSystemManager.deleteFile() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "pathToFile", out) double callback_id = args.get("callbackId").get(); @@ -1100,6 +1141,10 @@ void FilesystemInstance::UnlinkFile(const picojson::value& args, picojson::objec void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.deleteDirectory() is deprecated since Tizen 5.0. Use " + "FileSystemManager.deleteDirectory() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "pathToDelete", out) double callback_id = args.get("callbackId").get(); @@ -1132,6 +1177,10 @@ void FilesystemInstance::RemoveDirectory(const picojson::value& args, picojson:: void FilesystemInstance::CopyTo(const picojson::value& args, picojson::object& out) { ScopeLogger(); + LoggerW( + "DEPRECATION WARNING: File.copyTo() is deprecated since Tizen 5.0. Use " + "FileSystemManager.CopyFile() or FileSystemManager.CopyDirectory() instead."); + CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out); CHECK_EXIST(args, "callbackId", out) diff --git a/src/filesystem/js/file.js b/src/filesystem/js/file.js index d5d2d20d..990e4281 100644 --- a/src/filesystem/js/file.js +++ b/src/filesystem/js/file.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + function File(data) { function fileSizeGetter() { var _realPath = commonFS_.toRealPath(this.fullPath); @@ -60,6 +60,9 @@ function File(data) { } function toURI() { + privUtils_.warn("DEPRECATION WARNING: File.toURI() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.toURI() instead."); + xwalk.utils.checkPrivilegeAccess(xwalk.utils.privilege.FILESYSTEM_READ); return 'file://' + commonFS_.toRealPath(this.fullPath); } @@ -162,6 +165,9 @@ function checkFile(file, fileFilter) { } function listFiles() { + privUtils_.warn("DEPRECATION WARNING: File.listFiles() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.listDirectory() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'onsuccess', type: types_.FUNCTION}, {name: 'onerror', type: types_.FUNCTION, optional: true, nullable: true}, @@ -243,6 +249,9 @@ function _checkEncoding(encoding) { } function openStream() { + privUtils_.warn("DEPRECATION WARNING: File.openStream() is deprecated since Tizen 5.0. " + + "Use FileHandle interface to read/write operations instead."); + var args = validator_.validateArgs(arguments, [ {name: 'mode', type: types_.ENUM, values: ['r', 'rw', 'w', 'a']}, {name: 'onsuccess', type: types_.FUNCTION}, @@ -294,6 +303,9 @@ File.prototype.openStream = function() { }; function readAsText() { + privUtils_.warn("DEPRECATION WARNING: File.readAsText() is deprecated since Tizen 5.0. " + + "Use FileHandle.readString() or FileHandle.readStringNonBlocking() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'onsuccess', type: types_.FUNCTION}, {name: 'onerror', type: types_.FUNCTION, optional: true, nullable: true}, @@ -346,6 +358,9 @@ File.prototype.readAsText = function() { }; function copyTo() { + privUtils_.warn("DEPRECATION WARNING: File.copyTo() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.CopyFile() or FileSystemManager.CopyDirectory() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'originFilePath', type: types_.STRING}, {name: 'destinationFilePath', type: types_.STRING}, @@ -499,6 +514,9 @@ File.prototype.copyTo = function() { }; function moveTo() { + privUtils_.warn("DEPRECATION WARNING: File.moveTo() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.moveFile() or FileSystemManager.moveDirectory() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'originFilePath', type: types_.STRING}, {name: 'destinationFilePath', type: types_.STRING}, @@ -615,6 +633,9 @@ File.prototype.moveTo = function() { }; function createDirectory() { + privUtils_.warn("DEPRECATION WARNING: File.createDirectory() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.createDirectory() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'dirPath', type: types_.STRING} ]); @@ -679,6 +700,9 @@ File.prototype.createDirectory = function() { } function createFile() { + privUtils_.warn("DEPRECATION WARNING: File.createFile() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.createFile() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'relativeFilePath', type: types_.STRING} ]); @@ -735,6 +759,9 @@ File.prototype.createFile = function() { }; function resolveFile() { + privUtils_.warn("DEPRECATION WARNING: File.resolve() is deprecated since Tizen 5.0. " + + "Use FileHandle and FileSystemManager interfaces instead."); + var args = validator_.validateArgs(arguments, [ {name: 'filePath', type: types_.STRING} ]); @@ -783,6 +810,9 @@ File.prototype.resolve = function() { }; function deleteDirectory() { + privUtils_.warn("DEPRECATION WARNING: File.deleteDirectory() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.deleteDirectory() instead." ); + var args = validator_.validateArgs(arguments, [ {name: 'directoryPath', type: types_.STRING}, {name: 'recursive', type: types_.BOOLEAN}, @@ -883,6 +913,9 @@ File.prototype.deleteDirectory = function() { }; function deleteFile() { + privUtils_.warn("DEPRECATION WARNING: File.deleteFile() is deprecated since Tizen 5.0. " + + "Use FileSystemManager.deleteFile() instead."); + var args = validator_.validateArgs(arguments, [ {name: 'filePath', type: types_.STRING}, {name: 'onsuccess', type: types_.FUNCTION, optional: true, nullable: true}, diff --git a/src/filesystem/js/file_stream.js b/src/filesystem/js/file_stream.js index 9d391bbd..89eed34a 100644 --- a/src/filesystem/js/file_stream.js +++ b/src/filesystem/js/file_stream.js @@ -66,6 +66,9 @@ function _checkClosed(stream) { } function closeFileStream() { + privUtils_.warn("DEPRECATION WARNING: FileStream.close() is deprecated since Tizen 5.0. " + + "Use FileHandle.close() instead."); + this._closed = true; } @@ -86,6 +89,9 @@ function _checkWriteAccess(mode) { } function read() { + privUtils_.warn("DEPRECATION WARNING: FileStream.read() is deprecated since Tizen 5.0. " + + "Use FileHandle.readString() or FileHandle.readStringNonBlocking() instead."); + var args = validator_.validateArgs(arguments, [{name: 'charCount', type: types_.LONG}]); _checkClosed(this); @@ -177,10 +183,17 @@ function readBytes() { } FileStream.prototype.readBytes = function() { + privUtils_.warn("DEPRECATION WARNING: FileStream.readBytes() is deprecated since Tizen 5.0. " + + "Use FileHandle.readData() or FileHandle.readDataNonBlocking() instead."); + return readBytes.apply(this, arguments); }; FileStream.prototype.readBase64 = function() { + privUtils_.warn("DEPRECATION WARNING: FileStream.readBase64() is deprecated since Tizen 5.0. " + + "Use FileHandle.readData() or FileHandle.readDataNonBlocking() in combination " + + "with atob() and btoa() functions instead."); + return base64_encode(readBytes.apply(this, arguments)); }; @@ -196,6 +209,9 @@ function check_characters_outside_latin1(str) { } function write() { + privUtils_.warn("DEPRECATION WARNING: FileStream.write() is deprecated since Tizen 5.0. " + + "Use FileHandle.writeString() or FileHandle.writeStringNonBlocking() instead."); + var args = validator_.validateArgs(arguments, [{name: 'stringData', type: types_.STRING}]); @@ -235,6 +251,9 @@ FileStream.prototype.write = function() { }; function writeBytes() { + privUtils_.warn("DEPRECATION WARNING: FileStream.writeBytes() is deprecated since Tizen 5.0. " + + "Use FileHandle.writeData() or FileHandle.writeDataNonBlocking() instead."); + var args = validator_.validateArgs( arguments, [{ name: 'byteData', @@ -274,6 +293,10 @@ FileStream.prototype.writeBytes = function() { }; function writeBase64() { + privUtils_.warn("DEPRECATION WARNING: FileStream.writeBase64() is deprecated since Tizen 5.0. " + + "Use FileHandle.writeData() or FileHandle.writeDataNonBlocking() in combination " + + "with atob() and btoa() functions instead."); + var args = validator_.validateArgs(arguments, [{name: 'base64Data', type: types_.STRING}]); diff --git a/src/filesystem/js/file_system_manager.js b/src/filesystem/js/file_system_manager.js index 59fce182..cddcceb6 100644 --- a/src/filesystem/js/file_system_manager.js +++ b/src/filesystem/js/file_system_manager.js @@ -527,6 +527,9 @@ FileSystemManager.prototype.getDirName = function() { }; function resolve() { + privUtils_.warn("DEPRECATION WARNING: FileSystemManager.resolve() is deprecated since Tizen 5.0. " + + "Use FileHandle and FileSystemManager interfaces instead."); + var args = validator_.validateArgs(arguments, [ {name: 'location', type: types_.STRING}, {name: 'onsuccess', type: types_.FUNCTION}, {name: 'onerror', type: types_.FUNCTION, optional: true, nullable: true}, {