Merge lp:~davidmhewitt/pantheon-photos/fix-1658467 into lp:~pantheon-photos/pantheon-photos/trunk

[David Hewitt]

see if a file is writeable when closing and offer save as if the file is read only

Now tests to see if a file is writeable when closing the application and offers the save as option instead if the file is read only.

Also changed the behaviour slightly so that the application doesn't still close if there was a different error while saving.

[Corentin Noël (tintou)]

There is a coding-style issue, you have to add a space before each parenthesis

review: Needs Fixing

[lp:~davidmhewitt/pantheon-photos/fix-1658467]

3125. By David Hewitt on 2017-01-26

Fixed code style issues

[David Hewitt (davidmhewitt)]

> There is a coding-style issue, you have to add a space before each parenthesis

Resolved

[Corentin Noël (tintou)]

Just two tiny things that I haven't see at first and we are good

[lp:~davidmhewitt/pantheon-photos/fix-1658467]

3126. By David Hewitt on 2017-01-27

Fixed hardcoded strings and ints and corrected whitespace

[David Hewitt (davidmhewitt)]

> Just two tiny things that I haven't see at first and we are good

Thanks Corentin, all good feedback. I've resolved the issues in the above commit.

[Corentin Noël (tintou)]

review: Approve

=== modified file 'src/Photo.vala'
--- src/Photo.vala	2017-01-12 18:13:48 +0000
+++ src/Photo.vala	2017-01-27 18:01:19 +0000
@@ -1640,6 +1640,19 @@
                ? true : is_extension_found (file.get_basename (), IMAGE_EXTENSIONS);
     }
 
+    public bool can_write_file () {
+        var file = File.new_for_path (row.master.filepath);
+        FileInfo file_info;
+        try {
+            file_info = file.query_info (GLib.FileAttribute.ACCESS_CAN_WRITE, FileQueryInfoFlags.NONE);
+        } catch (Error e) {
+            warning ("Error while testing if file is writeable: %s\n", e.message);
+            return false;
+        }
+
+        return file_info.get_attribute_boolean (GLib.FileAttribute.ACCESS_CAN_WRITE);
+    }
+
     private static bool is_extension_found (string basename, string[] extensions) {
         string name, ext;
         disassemble_filename (basename, out name, out ext);

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2017-01-26 15:35:50 +0000
+++ src/direct/DirectPhotoPage.vala	2017-01-27 18:01:19 +0000
@@ -373,7 +373,7 @@
             return true;
         }
 
-        bool is_writeable = get_photo ().get_file_format ().can_write ();
+        bool is_writeable = get_photo ().can_write_file () && get_photo ().get_file_format ().can_write ();
         string save_option = is_writeable ? _ ("_Save") : _ ("_Save a Copy");
 
         Gtk.ResponseType response = AppWindow.affirm_cancel_negate_question (
@@ -385,10 +385,10 @@
             photo.remove_all_transformations ();
         else if (response == Gtk.ResponseType.NO) {
             if (is_writeable)
-                save (photo.get_file (), 0, ScaleConstraint.ORIGINAL, Jpeg.Quality.HIGH,
+                return save (photo.get_file (), 0, ScaleConstraint.ORIGINAL, Jpeg.Quality.HIGH,
                       get_photo ().get_file_format ());
             else
-                on_save_as ();
+                return do_save_as ();
         } else if ((response == Gtk.ResponseType.CANCEL) || (response == Gtk.ResponseType.DELETE_EVENT) ||
                    (response == Gtk.ResponseType.CLOSE)) {
             return false;
@@ -405,7 +405,7 @@
         return (old_photo != null) ? check_ok_to_close_photo (old_photo) : true;
     }
 
-    private void save (File dest, int scale, ScaleConstraint constraint, Jpeg.Quality quality,
+    private bool save (File dest, int scale, ScaleConstraint constraint, Jpeg.Quality quality,
                        PhotoFileFormat format, bool copy_unmodified = false, bool save_metadata = true) {
         Scaling scaling = Scaling.for_constraint (constraint, scale, false);
 
@@ -415,7 +415,7 @@
             AppWindow.error_message (_ ("Error while saving to %s: %s").printf (dest.get_path (),
                                      err.message));
 
-            return;
+            return false;
         }
 
         // Fetch the DirectPhoto and reimport.
@@ -427,6 +427,8 @@
 
         DirectPhoto.global.reimport_photo (photo);
         display_mirror_of (view_controller, photo);
+
+        return true;
     }
 
     private void on_save () {
@@ -439,14 +441,14 @@
               get_photo ().get_file_format ());
     }
 
-    private void on_save_as () {
+    private bool do_save_as () {
         ExportDialog export_dialog = new ExportDialog (_ ("Save As"));
 
         int scale;
         ScaleConstraint constraint;
         ExportFormatParameters export_params = ExportFormatParameters.last ();
         if (!export_dialog.execute (out scale, out constraint, ref export_params))
-            return;
+            return false;
 
         string filename = get_photo ().get_export_basename_for_parameters (export_params);
         PhotoFileFormat effective_export_format =
@@ -472,11 +474,12 @@
         save_as_dialog.set_local_only (false);
 
         int response = save_as_dialog.run ();
+        bool save_successful = false;
         if (response == Gtk.ResponseType.OK) {
             // flag to prevent asking user about losing changes to the old file (since they'll be
             // loaded right into the new one)
             drop_if_dirty = true;
-            save (File.new_for_uri (save_as_dialog.get_uri ()), scale, constraint, export_params.quality,
+            save_successful = save (File.new_for_uri (save_as_dialog.get_uri ()), scale, constraint, export_params.quality,
                   effective_export_format, export_params.mode == ExportFormatMode.UNMODIFIED,
                   export_params.export_metadata);
             drop_if_dirty = false;
@@ -485,6 +488,11 @@
         }
 
         save_as_dialog.destroy ();
+        return save_successful;
+    }
+
+    private void on_save_as () {
+        do_save_as ();
     }
 
     /** Returns true if the code parameter matches the keycode of the keyval parameter for