gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-01 05:23:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

filename-util: check for space in name parsing

Browse source 
Duplication appendices added start with a space, so when parsing
previous names make sure that such a space exists too.

Also, fix incorrect unittest and use the term appendix more uniformly.
This commit is contained in:
Peter Eisenmann 2023-11-05 21:56:22 +01:00
parent 6c2fbfbe13
commit 6e3befd73e
2 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nautilus-filename-utilities.c
View file

@ -25,10 +25,8 @@
* parse_previous_duplicate_name:
* @name: Name of the original file
* @extensionless_length: Length of @name when without an extension
* @base_length: (out): Length of the file name without any duplication suffixes.
* Only set when a duplicate is detected.
* @base_length: (out): Length of the file name without any duplication appendices.
* @count: (out): The how manyth duplicate the parsed file name represents.
* Only set when a duplicate is detected.
*
* Parses a file name to see if it was created as a duplicate of another file.
*/
@ -48,7 +46,7 @@ parse_previous_duplicate_name (const char *name,
return;
}
/* Duplication suffix ends with bracket, check for it */
/* Duplication appendix ends with bracket, check for it */
size_t last_character_pos = extensionless_length - 1;
if (name[last_character_pos] != ')')
{
@ -57,27 +55,27 @@ parse_previous_duplicate_name (const char *name,
}
/* Search for opening bracket */
char *start_bracket = g_utf8_strrchr (name, last_character_pos, '(');
if (start_bracket == NULL || start_bracket == name)
char *base_end = g_strrstr_len (name, last_character_pos, " (");
if (base_end == NULL || base_end == name)
{
/* Appendix is surrounded by brackets and can't be the whole file name */
/* Appendix is prefixed with space and bracket and can't be the whole file name */
return;
}
/* Potential bracketed suffix detected, check if it's a known copy suffix */
size_t start_bracket_pos = start_bracket - name;
size_t str_in_bracket_length = last_character_pos - (start_bracket_pos + 1);
/* Potential bracketed appendix found, try to parse it */
const char *appendix = base_end + strlen (" (");
size_t appendix_length = last_character_pos - (appendix - name);
if (strncmp (start_bracket + 1, COPY_APPENDIX_FIRST_COPY, str_in_bracket_length) == 0)
if (strncmp (appendix, COPY_APPENDIX_FIRST_COPY, appendix_length) == 0)
{
/* File is a (first) copy */
*count = 1;
*base_length = start_bracket_pos - 1;
*base_length = base_end - name;
}
else if (sscanf (start_bracket + 1, COPY_APPENDIX_NTH_COPY, count))
else if (sscanf (appendix, COPY_APPENDIX_NTH_COPY, count))
{
/* File is an n-th copy, create n+1-th copy */
*base_length = start_bracket_pos - 1;
*base_length = base_end - name;
}
else
{

2
test/automated/displayless/test-filename-utilities.c
View file

@ -43,7 +43,7 @@ test_filename_create_file_copy (void)
}
/* test the next duplicate name generator */
ASSERT_DUPLICATION_NAME (" (Copy)", " (Copy 2)");
ASSERT_DUPLICATION_NAME ("(Copy)", "(Copy) (Copy)");
ASSERT_DUPLICATION_NAME ("foo", "foo (Copy)");
ASSERT_DUPLICATION_NAME (".bashrc", ".bashrc (Copy)");
ASSERT_DUPLICATION_NAME (".foo.txt", ".foo (Copy).txt");