diff --git a/api/@ohos.file.fs.d.ets b/api/@ohos.file.fs.d.ets index 1525dbedaa91046ce938431840e0f9c6861625f4..bf36ef13c4e93be1fbeac9485914517d1bacaad2 100644 --- a/api/@ohos.file.fs.d.ets +++ b/api/@ohos.file.fs.d.ets @@ -455,18 +455,6 @@ function copyDir(src: string, dest: string, mode?: int): Promise; */ function copyDir(src: string, dest: string, callback: AsyncCallback): void; -/** - * Copy directory. - * - * @param { string } src - source path. - * @param { string } dest - destination path. - * @param { AsyncCallback> } callback - Return the callback function. - * @throws { BusinessError } 13900015 - File exists - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ -function copyDir(src: string, dest: string, callback: AsyncCallback>): void; - /** * Copy directory. * @@ -496,19 +484,6 @@ function copyDir(src: string, dest: string, callback: AsyncCallback): void; -/** - * Copy directory. - * - * @param { string } src - source path. - * @param { string } dest - destination path. - * @param { int } mode - mode. - * @param { AsyncCallback> } callback - Return the callback function. - * @throws { BusinessError } 13900015 - File exists - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ -function copyDir(src: string, dest: string, mode: int, callback: AsyncCallback>): void; - /** * Copy directory with sync interface. * @@ -1677,18 +1652,6 @@ function moveDir(src: string, dest: string, mode?: int): Promise; */ function moveDir(src: string, dest: string, callback: AsyncCallback): void; -/** - * Move directory. - * - * @param { string } src - source file path. - * @param { string } dest - destination file path. - * @param { AsyncCallback> } callback - Return the callback function. - * @throws { BusinessError } 13900015 - File exists - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ -function moveDir(src: string, dest: string, callback: AsyncCallback>): void; - /** * Move directory. * @@ -1719,19 +1682,6 @@ function moveDir(src: string, dest: string, callback: AsyncCallback): void; -/** - * Move directory. - * - * @param { string } src - source file path. - * @param { string } dest - destination file path. - * @param { int } mode - move mode when duplicate file name exists. - * @param { AsyncCallback> } callback - Return the callback function. - * @throws { BusinessError } 13900015 - File exists - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ -function moveDir(src: string, dest: string, mode: int, callback: AsyncCallback>): void; - /** * Move directory with sync interface. * @@ -4626,34 +4576,6 @@ export interface Filter { excludeMedia?: boolean; } -/** - * Conflict Files type - * - * @interface ConflictFiles - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ -export interface ConflictFiles { - - /** - * The path of the source file. - * - * @type { string } - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ - srcFile: string; - - /** - * The path of the destination file. - * - * @type { string } - * @syscap SystemCapability.FileManagement.File.FileIO - * @since 20 - */ - destFile: string; -} - /** * Options type * diff --git a/kits/@kit.CoreFileKit.d.ts b/kits/@kit.CoreFileKit.d.ts index 5d94583f0702dc5ecf49b3ee49ecdabb46bb4ba9..a5a432a6d31a10a0ab6bfe90e1a792581349096d 100644 --- a/kits/@kit.CoreFileKit.d.ts +++ b/kits/@kit.CoreFileKit.d.ts @@ -61,7 +61,7 @@ import Environment from '@ohos.file.environment'; import fileUri from '@ohos.file.fileuri'; import fileIo from '@ohos.file.fs' import { - ConflictFiles, Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener, + Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener, Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions, DfsListeners, TaskSignal } from '@ohos.file.fs'; import hash from '@ohos.file.hash'; @@ -73,7 +73,7 @@ import keyManager from '@ohos.file.keyManager'; import fileShare from '@ohos.fileshare'; export { - BackupExtensionAbility, BundleVersion, ConflictFiles, Environment, Filter, Options, ReaderIteratorResult, + BackupExtensionAbility, BundleVersion, Environment, Filter, Options, ReaderIteratorResult, WatchEvent, WatchEventListener, Watcher, ReadOptions, ReadTextOptions, WriteOptions, ListFileOptions, cloudSync, cloudSyncManager, fileIo, fileShare, fileUri, hash, securityLabel, statfs, storageStatistics, volumeManager, keyManager, DfsListeners, TaskSignal