Merge lp:~philip.scott/screenshot-tool/dont-overwrite into lp:~elementary-apps/screenshot-tool/trunk

[Felipe Escoto]

Don't overwrite files

Don't overwrite files, instead append the (%d) as when you download a file

[Danielle Foré (danrabbit)]

Just one tiny code style issue ;)

[lp:~philip.scott/screenshot-tool/dont-overwrite]

232. By Felipe Escoto on 2016-09-30

Don't overwrite files

[Danielle Foré (danrabbit)]

Works and looks good to me :)

review: Approve

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2016-09-29 03:16:03 +0000
+++ src/ScreenshotWindow.vala	2016-09-30 18:16:43 +0000
@@ -320,7 +320,19 @@
                         output = output.replace (type, "");
                     }
 
-                    string file_name = Path.build_filename (folder_dir, output + "." + format);
+                    string file_name = "";
+                    int attempt = 0;
+
+                    // Check if file exists
+                    do {
+                        if (attempt == 0) {
+                            file_name = Path.build_filename (folder_dir, "%s.%s".printf (output, format));
+                        } else {
+                            file_name = Path.build_filename (folder_dir, "%s (%d).%s".printf (output, attempt, format));
+                        }
+
+                        attempt++;
+                    } while (File.new_for_path (file_name).query_exists ());
 
                     try {
                         screenshot.save (file_name, format);