Merge branch 'pr/10'

torshy · Jan 19, 2015 · 92a31b1 · 92a31b1
2 parents 0693546 + caac3d9
commit 92a31b1
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 45 deletions.
diff --git a/src/Torshify.Shell/Program.cs b/src/Torshify.Shell/Program.cs
@@ -132,6 +132,12 @@ protected void SearchMenu()
             ConsoleEx.Write("Query >> ", ConsoleColor.Green);
             string query = Console.ReadLine();
 
+            if (string.IsNullOrEmpty(query))
+            {
+                ConsoleEx.WriteLine("Query string for search can't be empty", ConsoleColor.Red);
+                return;
+            }
+
             ConsoleEx.WriteLine("Searching..", ConsoleColor.Yellow);
             ISearch search = Session
                 .Search(query, 0, 25, 0, 25, 0, 25, 0, 25, SearchType.Standard)

diff --git a/src/Torshify/Core/Native/NativeAlbum.cs b/src/Torshify/Core/Native/NativeAlbum.cs
@@ -153,7 +153,6 @@ protected override void Dispose(bool disposing)
                 finally
                 {
                     AlbumManager.Remove(Handle);
-                    Handle = IntPtr.Zero;
                 }
 
                 Debug.WriteLine("Album disposed");

diff --git a/src/Torshify/Core/Native/NativeAlbumBrowse.cs b/src/Torshify/Core/Native/NativeAlbumBrowse.cs
@@ -176,8 +176,7 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_albumbrowse_release(Handle);
-                        Handle = IntPtr.Zero;
+                        Ensure(() => Spotify.sp_albumbrowse_release(Handle));
                     }
                 }
                 catch

diff --git a/src/Torshify/Core/Native/NativeArtist.cs b/src/Torshify/Core/Native/NativeArtist.cs
@@ -86,7 +86,7 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_artist_release(Handle);
+                        Ensure(() => Spotify.sp_artist_release(Handle));
                     }
                 }
                 catch
@@ -95,7 +95,6 @@ protected override void Dispose(bool disposing)
                 finally
                 {
                     ArtistManager.Remove(Handle);
-                    Handle = IntPtr.Zero;
                 }
             }
 

diff --git a/src/Torshify/Core/Native/NativeArtistBrowse.cs b/src/Torshify/Core/Native/NativeArtistBrowse.cs
@@ -202,8 +202,7 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_artistbrowse_release(Handle);
-                        Handle = IntPtr.Zero;
+                        Ensure(() => Spotify.sp_artistbrowse_release(Handle));
                     }
 
                     GC.KeepAlive(_browseCompleteCallback);

diff --git a/src/Torshify/Core/Native/NativeImage.cs b/src/Torshify/Core/Native/NativeImage.cs
@@ -177,17 +177,15 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_image_remove_load_callback(Handle, _imageLoaded, IntPtr.Zero);
-                        Spotify.sp_image_release(Handle);
+                        Ensure(() => {
+                            Spotify.sp_image_remove_load_callback(Handle, _imageLoaded, IntPtr.Zero);
+                            Spotify.sp_image_release(Handle);
+                        });
                     }
                 }
                 catch
                 {
                 }
-                finally
-                {
-                    Handle = IntPtr.Zero;
-                }
             }
 
             base.Dispose(disposing);

diff --git a/src/Torshify/Core/Native/NativeLink.cs b/src/Torshify/Core/Native/NativeLink.cs
@@ -103,7 +103,7 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_link_release(Handle);
+                        Ensure(() => Spotify.sp_link_release(Handle));
                     }
                 }
                 catch
@@ -112,7 +112,6 @@ protected override void Dispose(bool disposing)
                 finally
                 {
                     LinkManager.Remove(Handle);
-                    Handle = IntPtr.Zero;
                 }
 
 #if DEBUG_VERBOSE

diff --git a/src/Torshify/Core/Native/NativePlaylist.cs b/src/Torshify/Core/Native/NativePlaylist.cs
@@ -387,7 +387,7 @@ protected override void Dispose(bool disposing)
 
                     try
                     {
-                        Spotify.sp_playlist_release(Handle);
+                        Ensure(() => Spotify.sp_playlist_release(Handle));
                     }
                     catch
                     {
@@ -396,7 +396,6 @@ protected override void Dispose(bool disposing)
                     {
                         PlaylistTrackManager.RemoveAll(this);
                         PlaylistManager.Remove(Handle);
-                        Handle = IntPtr.Zero;
                         Debug.WriteLine("Playlist disposed");
                     }
                 }

diff --git a/src/Torshify/Core/Native/NativePlaylistContainer.cs b/src/Torshify/Core/Native/NativePlaylistContainer.cs
@@ -146,7 +146,6 @@ protected override void Dispose(bool disposing)
                 finally
                 {
                     PlaylistContainerManager.Remove(Handle);
-                    Handle = IntPtr.Zero;
                     Debug.WriteLine("Playlist container disposed");
                 }
             }

diff --git a/src/Torshify/Core/Native/NativeSearch.cs b/src/Torshify/Core/Native/NativeSearch.cs
@@ -311,8 +311,7 @@ protected override void Dispose(bool disposing)
 
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_search_release(Handle);
-                        Handle = IntPtr.Zero;
+                        Ensure(() => Spotify.sp_search_release(Handle));
                     }
                 }
                 catch

diff --git a/src/Torshify/Core/Native/NativeSession.cs b/src/Torshify/Core/Native/NativeSession.cs
@@ -951,9 +951,8 @@ protected override void Dispose(bool disposing)
                             Debug.WriteLineIf(error != Error.OK, error.GetMessage());
                         }
 
-                        error = Spotify.sp_session_release(Handle);
+                        Ensure(() => error = Spotify.sp_session_release(Handle));
                         Debug.WriteLineIf(error != Error.OK, error.GetMessage());
-                        Handle = IntPtr.Zero;
                     }
                 }
                 catch

diff --git a/src/Torshify/Core/Native/NativeToplistBrowse.cs b/src/Torshify/Core/Native/NativeToplistBrowse.cs
@@ -178,10 +178,6 @@ protected override void Dispose(bool disposing)
                 catch
                 {
                 }
-                finally
-                {
-                    Handle = IntPtr.Zero;
-                }
             }
 
             base.Dispose(disposing);

diff --git a/src/Torshify/Core/Native/NativeTrack.cs b/src/Torshify/Core/Native/NativeTrack.cs
@@ -289,7 +289,7 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_track_release(Handle);
+                        Ensure(() => Spotify.sp_track_release(Handle));
                     }
                 }
                 catch
@@ -298,7 +298,6 @@ protected override void Dispose(bool disposing)
                 finally
                 {
                     TrackManager.Remove(Handle);
-                    Handle = IntPtr.Zero;
                     Debug.WriteLine("Track disposed");
                 }
             }

diff --git a/src/Torshify/Core/Native/NativeUser.cs b/src/Torshify/Core/Native/NativeUser.cs
@@ -83,16 +83,12 @@ protected override void Dispose(bool disposing)
                 {
                     lock (Spotify.Mutex)
                     {
-                        Spotify.sp_user_release(Handle);
+                        Ensure(() => Spotify.sp_user_release(Handle));
                     }
                 }
                 catch
                 {
                 }
-                finally
-                {
-                    Handle = IntPtr.Zero;
-                }
             }
 
             base.Dispose(disposing);

diff --git a/src/Torshify/Core/Native/Spotify.Error.cs b/src/Torshify/Core/Native/Spotify.Error.cs
@@ -11,6 +11,7 @@ internal partial class Spotify
       /// <param name="error">The error code.</param>
       /// <returns>The text-representation of the error.</returns>
       [DllImport("libspotify")]
+      [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(MarshalPtrToUtf8))]
       public static extern string sp_error_message(Error error);
   }
 }
diff --git a/src/Torshify/Core/Native/Spotify.Search.cs b/src/Torshify/Core/Native/Spotify.Search.cs
@@ -195,6 +195,7 @@ internal partial class Spotify
         /// <param name="index"></param>
         /// <returns></returns>
         [DllImport("libspotify")]
+        [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(MarshalPtrToUtf8))]
         internal static extern string sp_search_playlist_name(IntPtr searchPtr, int index);
 
         /// <summary>
@@ -204,6 +205,7 @@ internal partial class Spotify
         /// <param name="index"></param>
         /// <returns></returns>
         [DllImport("libspotify")]
+        [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(MarshalPtrToUtf8))]
         internal static extern string sp_search_playlist_uri(IntPtr searchPtr, int index);
 
         /// <summary>
@@ -213,6 +215,7 @@ internal partial class Spotify
         /// <param name="index"></param>
         /// <returns></returns>
         [DllImport("libspotify")]
+        [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(MarshalPtrToUtf8))]
         internal static extern string sp_search_playlist_image_uri(IntPtr searchPtr, int index);
     }
 }
diff --git a/src/Torshify/Core/Native/Spotify.Session.cs b/src/Torshify/Core/Native/Spotify.Session.cs
@@ -12,6 +12,7 @@ internal partial class Spotify
         /// </summary>
         /// <returns></returns>
         [DllImport("libspotify")]
+        [return: MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(MarshalPtrToUtf8))]
         internal static extern string sp_build_id();
 
         /// <summary>

diff --git a/src/Torshify/Core/Native/Spotify.cs b/src/Torshify/Core/Native/Spotify.cs
@@ -16,18 +16,6 @@ internal static partial class Spotify
 
         #endregion Fields
 
-        #region Constructors
-
-        static Spotify()
-        {
-            Console.ForegroundColor = ConsoleColor.Green;
-            Console.WriteLine("torshify uses SPOTIFY(R) CORE");
-            Console.ForegroundColor = ConsoleColor.Gray;
-            Console.WriteLine(sp_build_id());
-        }
-
-        #endregion Constructors
-
         #region Enumerations
 
         internal enum SpotifySampletype

diff --git a/src/Torshify/Core/NativeObject.cs b/src/Torshify/Core/NativeObject.cs
@@ -89,6 +89,8 @@ protected virtual void Dispose(bool disposing)
             }
 
             // get rid of unmanaged resources
+
+            Handle = IntPtr.Zero;
         }
 
         protected void AssertHandle()
@@ -99,6 +101,17 @@ protected void AssertHandle()
             }
         }
 
+        public void Ensure(Action action)
+        {
+            if ((Session is NativeObject) && !(Session as NativeObject).IsInvalid)
+            {
+                if (action != null)
+                {
+                    action();
+                }
+            }
+        }
+
         #endregion Protected Methods
     }
 }