Skip to content

Commit 3543f39

Browse files
Merge pull request #155 from TakayukiHoshi1984/bugfix_host_file_move
存在しないディレクトリにファイルを移動しようとした場合の不具合修正
2 parents 2427e35 + 1427ea9 commit 3543f39

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

dConnectDevicePlugin/dConnectDeviceHost/dConnectDeviceHost/Classes/profile/DPHostFileProfile.m

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,11 @@ - (instancetype)init
166166
[response setErrorToInvalidRequestParameterWithMessage:@"Directory can not be specified; use Move Directory API instead."];
167167
return YES;
168168
}
169-
if ([sysFileMgr fileExistsAtPath:dstNewPath isDirectory:&isDirectory]
170-
&& ![[dstNewPath pathExtension] isEqualToString:@""] && !forceOverwrite) {
169+
if (![sysFileMgr fileExistsAtPath:dstNewPath isDirectory:&isDirectory]) {
170+
[response setErrorToInvalidRequestParameterWithMessage:@"NewPath not exist."];
171+
return YES;
172+
} else if ([sysFileMgr fileExistsAtPath:dstNewPath isDirectory:&isDirectory]
173+
&& ![[dstNewPath pathExtension] isEqualToString:@""] && !forceOverwrite) {
171174
[response setErrorToInvalidRequestParameterWithMessage:@"NewPath File already exist."];
172175
return YES;
173176
} else if (isDirectory) {
@@ -323,7 +326,10 @@ - (instancetype)init
323326
[response setErrorToInvalidRequestParameterWithMessage:@"Directory can not be specified; use Move File API instead."];
324327
return YES;
325328
}
326-
if ([sysFileMgr fileExistsAtPath:dstNewPath isDirectory:&isDirectory]
329+
if (![sysFileMgr fileExistsAtPath:dstNewPath isDirectory:&isDirectory]) {
330+
[response setErrorToInvalidRequestParameterWithMessage:@"NewPath not exist."];
331+
return YES;
332+
} else if ([sysFileMgr fileExistsAtPath:dstNewPath isDirectory:&isDirectory]
327333
&& ![[dstNewPath pathExtension] isEqualToString:@""]) {
328334
[response setErrorToInvalidRequestParameterWithMessage:@"NewPath File already exist."];
329335
return YES;

0 commit comments

Comments
 (0)