Merge lp:~shnatsel/noise/ditch-existence-checking-copypasta into lp:~elementary-apps/noise/trunk

[Sergey "Shnatsel" Davidoff]

ditch the superfluous existence-checking function copypasted all over the place

Ditch some useless copypasta from Noise codebase.

Player.check_existence (string uri) method as well as its copies in other classes is only used in once place and even there it's not needed at all.

Instead of "player.check_existance (m.uri)" which creates a new Glib.File out of the URI you can just use the already-in-place Glib.File associated with the media and do the job using well-known library functions only: "m.file.query_exists ()"
This simplifies the code and makes it a bit more readable.

If the need to check abstracted media existence ever arises (i.e. if we encounter a media without a valid file property), a similar function can be re-introduced, although I expect it to be a method of the Noise.Media class in that case.

[Victor Martinez (victored)]

Good catch. Please correct the coding style in diff line 81 and it's done:

"if ( ! m.file.query_exists ()) {"

Should be:

"if (!m.file.query_exists ()) {"

It may seem harder to read but it's more consistent.

review: Needs Fixing

[lp:~shnatsel/noise/ditch-existence-checking-copypasta]

1538. By Sergey "Shnatsel" Davidoff on 2013-10-13

coding style tweak

[Sergey "Shnatsel" Davidoff (shnatsel)]

<shnatsel> "if (!m.file.query_exists ()) {" vs "if ( ! m.file.query_exists ()) {"
<shnatsel> which one should be used in elementary?
<Munchor> the first one, we never put a space after opening parentheses. "if (! m.file.query_exists ()) {" is also acceptable I guess.

Fixed.

[Victor Martinez (victored)]

Hey, thanks for applying the correction. I'm not sure we really use "if (! condition) {" style from C++ over "if (!condition) {", but I guess it's OK, just not that common in Vala code.

review: Approve

=== modified file 'core/GStreamer/Playback.vala'
--- core/GStreamer/Playback.vala	2013-02-26 21:56:08 +0000
+++ core/GStreamer/Playback.vala	2013-10-13 16:08:51 +0000
@@ -49,7 +49,6 @@
     public abstract void pause ();
     public abstract void set_state (Gst.State s);
     public abstract void set_media (Media media);
-    public abstract bool check_existance (string uri);
     public abstract void set_position (int64 pos);
     public abstract int64 get_position ();
     public abstract int64 get_duration ();

=== modified file 'plugins/Devices/CDRom/CDPlayer.vala'
--- plugins/Devices/CDRom/CDPlayer.vala	2013-06-17 12:58:33 +0000
+++ plugins/Devices/CDRom/CDPlayer.vala	2013-10-13 16:08:51 +0000
@@ -67,14 +67,7 @@
         uris.add ("cdda://");
         return uris;
     }
-    
-    public bool check_existance (string uri) {
-        if (!GLib.File.new_for_uri (uri).query_exists ()) {
-            return false;
-        }
-        return true;
-    }
-    
+
     public bool update_position () {
         if (first_start || (App.player.media_info != null && App.player.media_info.media != null && get_position() >= (int64)(App.player.media_info.media.resume_pos - 1) * 1000000000)) {
             first_start = false;

=== modified file 'plugins/Devices/iPod/iPodStreamer.vala'
--- plugins/Devices/iPod/iPodStreamer.vala	2013-06-17 12:58:33 +0000
+++ plugins/Devices/iPod/iPodStreamer.vala	2013-10-13 16:08:51 +0000
@@ -54,14 +54,7 @@
         uris.add ("afc://");
         return uris;
     }
-    
-    public bool check_existance (string uri) {
-        if (!GLib.File.new_for_uri (uri).query_exists ()) {
-            return false;
-        }
-        return true;
-    }
-    
+
     public bool update_position () {
         if(set_resume_pos || (App.player.media_info != null && App.player.media_info.media != null && get_position() >= (int64)(App.player.media_info.media.resume_pos - 1) * 1000000000)) {
             set_resume_pos = true;

=== modified file 'src/GStreamer/Streamer.vala'
--- src/GStreamer/Streamer.vala	2013-06-12 18:04:28 +0000
+++ src/GStreamer/Streamer.vala	2013-10-13 16:08:51 +0000
@@ -53,14 +53,7 @@
         uris.add ("http://");
         return uris;
     }
-    
-    public bool check_existance (string uri) {
-        if (!GLib.File.new_for_uri (uri).query_exists ()) {
-            return false;
-        }
-        return true;
-    }
-    
+
     public bool update_position () {
         if(set_resume_pos || (App.player.media_info != null && App.player.media_info.media != null && get_position() >= (int64)(App.player.media_info.media.resume_pos - 1) * 1000000000)) {
             set_resume_pos = true;

=== modified file 'src/PlaybackManager.vala'
--- src/PlaybackManager.vala	2013-06-17 12:58:33 +0000
+++ src/PlaybackManager.vala	2013-10-13 16:08:51 +0000
@@ -532,7 +532,7 @@
         }
         
         // check that the file exists
-        if (!player.check_existance (m.uri)) {
+        if (! m.file.query_exists ()) {
             m.unique_status_image = Icons.PROCESS_ERROR.render(Gtk.IconSize.MENU);
             m.location_unknown = true;
             //App.main_window.media_not_found(id);