Skip to content

Moving an image does not include sidecar text file #19160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TurboGit merged 4 commits into from
Sep 6, 2025
Merged

Moving an image does not include sidecar text file #19160

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0a0ab57
copy text and audio file to location of new file
deekayhd Aug 2, 2025
44a9a71
refactoring
deekayhd Aug 2, 2025
20c8b19
add possibility to rename with move
deekayhd Aug 2, 2025
049e9aa
requested changes from review
deekayhd Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions src/common/image.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2195,6 +2195,25 @@ void dt_image_refresh_makermodel(dt_image_t *img)
sizeof(img->camera_makermodel)-len-1);
}

gboolean _move_extra_file(const gchar *oldFilePath, const gchar *newFolder, const gchar *newBasename)
{
//get extension of extra files before move (can be upper or lower case)
gchar *oldFilename = g_path_get_basename(oldFilePath);
gchar *oldExtension = g_strdup( oldFilename + (strrchr(oldFilename, '.') - oldFilename) );
gchar newFilePath[PATH_MAX] = { 0 };
g_strlcpy(newFilePath, newFolder, sizeof(newFilePath));
g_strlcat(newFilePath, newBasename, sizeof(newFilePath));
g_strlcat(newFilePath, oldExtension, sizeof(newFilePath));
GFile *oldFile = g_file_new_for_path(oldFilePath);
GFile *newFile = g_file_new_for_path(newFilePath);
const gboolean moveSuccess = g_file_move(oldFile, newFile, 0, NULL, NULL, NULL, NULL);
g_free(oldFilename);
g_free(oldExtension);
g_object_unref(oldFile);
g_object_unref(newFile);
return moveSuccess;
}

gboolean dt_image_rename(const dt_imgid_t imgid,
const int32_t filmid,
const gchar *newname)
Expand Down Expand Up @@ -2366,6 +2385,34 @@ gboolean dt_image_rename(const dt_imgid_t imgid,
g_object_unref(cnew);
}

// Now copy extra files like sidecar text file and audio file, if present
gchar *oldTxtFilePath = dt_image_get_text_path_from_path(oldimg);
gchar *oldAudioFilePath = dt_image_get_audio_path_from_path(oldimg);
if(oldTxtFilePath != NULL || oldAudioFilePath != NULL)
{
gchar newFolder[PATH_MAX] = { 0 };
gchar *newPath = g_path_get_dirname(newimg);
gchar *newImgBasename = g_path_get_basename(newimg);
//if a new image name is provided, this should also be used for the extra files
gchar *newBasename = g_strndup(newImgBasename, strrchr(newImgBasename, '.') - newImgBasename);
g_strlcpy(newFolder, newPath, sizeof(newFolder));
g_strlcat(newFolder, G_DIR_SEPARATOR_S, sizeof(newFolder));

if(oldTxtFilePath != NULL)
{
_move_extra_file(oldTxtFilePath, newFolder, newBasename);
}
if(oldAudioFilePath != NULL)
{
_move_extra_file(oldAudioFilePath, newFolder, newBasename);
}
g_free(newPath);
g_free(newImgBasename);
g_free(newBasename);
}
g_free(oldTxtFilePath);
g_free(oldAudioFilePath);

result = FALSE;
}
else
Expand Down
Loading