griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

UI: prevent CWD relative directories being created in the file selector

Browse Source 
Entering a single word (for example) in the file selectors directory
would ask to create the director, which then created the directory
relative to the processes CWD, then set a CWD relative path.

From the users perspective this is strange as it's unclear where
the directory was created the path would not show the CWD prefix.

Resolve by checking the path is absolute and at least one of the parent
paths exists before prompting the user to create the path.

Resolve part of the strange behavior from #128567.
This commit is contained in:
Campbell Barton
2024-10-05 23:03:37 +10:00
parent 3103daab20
commit 47f0042942
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/blender/editors/space_file/file_ops.cc
View File

@@ -2791,23 +2791,45 @@ static void file_expand_directory(bContext *C)
}
}
/* TODO: check we still need this, it's annoying to have OS-specific code here... :/. */
#if defined(WIN32)
static bool can_create_dir(const char *dir)
/**
* \param dir: A normalized path (from user input).
*/
static bool can_create_dir(const char dir[FILE_MAX_LIBEXTRA])
{
/* for UNC paths we need to check whether the parent of the new
* directory is a proper directory itself and not a share or the
* UNC root (server name) itself. Calling BLI_is_dir does this
*/
if (BLI_path_is_unc(dir)) {
char parent[PATH_MAX];
BLI_strncpy(parent, dir, PATH_MAX);
BLI_path_parent_dir(parent);
return BLI_is_dir(parent);
/* If the user types in a name with no absolute prefix,
* creating a directory relative to the CWD doesn't make sense from the UI. */
if (!BLI_path_is_abs_from_cwd(dir)) {
return false;
}
/* If none of the parents exist, the directory can't be created.
* This prevents the popup to create a new path showing on WIN32
* for a drive-letter that doesn't exist (for example). */
{
char tdir[FILE_MAX_LIBEXTRA];
STRNCPY(tdir, dir);
if (!BLI_path_parent_dir_until_exists(tdir)) {
return false;
}
}
#if defined(WIN32)
/* For UNC paths we need to check whether the parent of the new
* directory is a proper directory itself and not a share or the
* UNC root (server name) itself. Calling #BLI_is_dir does this. */
if (BLI_path_is_unc(dir)) {
char tdir[FILE_MAX_LIBEXTRA];
STRNCPY(tdir, dir);
BLI_path_parent_dir(tdir);
if (!BLI_is_dir(tdir)) {
return false;
}
}
#endif /* WIN32 */
return true;
}
#endif
void file_directory_enter_handle(bContext *C, void * /*arg_unused*/, void * /*arg_but*/)
{
@@ -2860,14 +2882,12 @@ void file_directory_enter_handle(bContext *C, void * /*arg_unused*/, void * /*ar
* placing cursor at the end */
// UI_textbutton_activate_but(C, but);
}
#if defined(WIN32)
else if (!can_create_dir(params->dir)) {
const char *lastdir = folderlist_peeklastdir(sfile->folders_prev);
if (lastdir) {
STRNCPY(params->dir, lastdir);
}
}
#endif
else {
const char *lastdir = folderlist_peeklastdir(sfile->folders_prev);
char tdir[FILE_MAX_LIBEXTRA];