jon/web-dslr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete camera file in destructor

Browse Source 
This makes sure it gets deleted even on exception.
This commit is contained in:
Ingvar Stepanyan
2021-07-21 14:13:39 +00:00
parent e4afa15c2c
commit 3b85b63d20
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api.cpp
View File

@@ -131,19 +131,31 @@ class Context {
val captureImageAsFile() { val captureImageAsFile() {
return gpp_rethrow([=]() { return gpp_rethrow([=]() {
CameraFilePath camera_file_path; struct TempCameraFile {
strcpy(camera_file_path.folder, "/"); Camera &camera;
strcpy(camera_file_path.name, "web-gphoto2"); GPContext &context;
CameraFilePath path;
~TempCameraFile() {
gp_camera_file_delete(&camera, path.folder, path.name, &context);
}
};
TempCameraFile camera_file{
.camera = *camera,
.context = *context,
};
strcpy(camera_file.path.folder, "/");
strcpy(camera_file.path.name, "web-gphoto2");
gpp_try(gp_camera_capture(camera.get(), GP_CAPTURE_IMAGE, gpp_try(gp_camera_capture(camera.get(), GP_CAPTURE_IMAGE,
&camera_file_path, context.get())); &camera_file.path, context.get()));
auto &file = get_file(); auto &file = get_file();
gpp_try(gp_camera_file_get(camera.get(), camera_file_path.folder, gpp_try(gp_camera_file_get(camera.get(), camera_file.path.folder,
camera_file_path.name, GP_FILE_TYPE_NORMAL, camera_file.path.name, GP_FILE_TYPE_NORMAL,
&file, context.get())); &file, context.get()));
gpp_try(gp_camera_file_delete(camera.get(), camera_file_path.folder,
camera_file_path.name, context.get()));
gpp_try(gp_file_set_name(&file, "image.")); gpp_try(gp_file_set_name(&file, "image."));
gpp_try(gp_file_adjust_name_for_mime_type(&file)); gpp_try(gp_file_adjust_name_for_mime_type(&file));