Refactoring

geloczi · Dec 19, 2021 · fde0f93 · fde0f93
1 parent 9bd8820
commit fde0f93
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 35 deletions.
diff --git a/SynologyDotNet.AudioStation.IntegrationTest/AudioStationConnector_Tests.cs b/SynologyDotNet.AudioStation.IntegrationTest/AudioStationConnector_Tests.cs
@@ -178,7 +178,7 @@ public async Task ListArtistAlbumSongs()
                 (SongQueryParameter.artist, Config.TestArtist),
                 (SongQueryParameter.album_artist, Config.TestArtist),
                 (SongQueryParameter.album, Config.TestAlbum),
-                (SongQueryParameter.sort_by, SongSortBy.track),
+                (SongQueryParameter.sort_by, SongSortBy.Track),
                 (SongQueryParameter.sort_direction, SortDirection.Descending));
             Assert.IsTrue(response.Success);
             Assert.IsTrue(response.Data.Songs.Length >= 2);
@@ -196,7 +196,7 @@ public async Task ListArtistAlbumSongs()
                 (SongQueryParameter.artist, Config.TestArtist),
                 (SongQueryParameter.album_artist, Config.TestArtist),
                 (SongQueryParameter.album, Config.TestAlbum),
-                (SongQueryParameter.sort_by, SongSortBy.track),
+                (SongQueryParameter.sort_by, SongSortBy.Track),
                 (SongQueryParameter.sort_direction, SortDirection.Ascending)
             ).Result;
             foreach (var song in response.Data.Songs)

diff --git a/SynologyDotNet.AudioStation/Model/Song.cs b/SynologyDotNet.AudioStation/Model/Song.cs
@@ -1,39 +1,7 @@
-using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace SynologyDotNet.AudioStation.Model
 {
-    [Flags]
-    public enum SongQueryAdditional : short
-    {
-        None = 0,
-        song_tag = 1,
-        song_audio = 2,
-        song_rating = 4,
-        All = ~None
-    }
-
-    public enum SongQueryParameter
-    {
-        id,
-        artist,
-        album_artist,
-        album,
-        sort_by,
-        sort_direction
-    }
-
-    public static class SongSortBy
-    {
-        public const string title = "title";
-        public const string song_rating = "song_rating";
-        public const string album = "album";
-        public const string album_artist = "album_artist";
-        public const string year = "year";
-        public const string track = "track";
-        public const string random = "random";
-    }
-
     public class Song
     {
         /// <summary>

diff --git a/SynologyDotNet.AudioStation/Model/SongQueryAdditional.cs b/SynologyDotNet.AudioStation/Model/SongQueryAdditional.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace SynologyDotNet.AudioStation.Model
+{
+    [Flags]
+    public enum SongQueryAdditional : short
+    {
+        None = 0,
+        song_tag = 1,
+        song_audio = 2,
+        song_rating = 4,
+        All = ~None
+    }
+}
diff --git a/SynologyDotNet.AudioStation/Model/SongQueryParameter.cs b/SynologyDotNet.AudioStation/Model/SongQueryParameter.cs
@@ -0,0 +1,12 @@
+namespace SynologyDotNet.AudioStation.Model
+{
+    public enum SongQueryParameter
+    {
+        id,
+        artist,
+        album_artist,
+        album,
+        sort_by,
+        sort_direction
+    }
+}
diff --git a/SynologyDotNet.AudioStation/Model/SongSortBy.cs b/SynologyDotNet.AudioStation/Model/SongSortBy.cs
@@ -0,0 +1,13 @@
+namespace SynologyDotNet.AudioStation.Model
+{
+    public static class SongSortBy
+    {
+        public const string Title = "title";
+        public const string Rating = "song_rating";
+        public const string Album = "album";
+        public const string AlbumArtist = "album_artist";
+        public const string Year = "year";
+        public const string Track = "track";
+        public const string Random = "random";
+    }
+}