Refactoring

2021-12-24 20:51:15 -05:00
parent f8d9c8e4a7
commit 023298c6f8
14 changed files with 147 additions and 164 deletions
@@ -7,60 +7,57 @@ namespace Icarus.Models
 {
    public class Song
    {
+        #region Properties
        [JsonProperty("song_id")]
-		public int SongID { get; set; }
-		[JsonProperty("title")]
-		public string Title { get; set; }
-		[JsonProperty("album")]
-		[Column("Album")]
-		public string AlbumTitle { get; set; }
-		[JsonProperty("artist")]
-		public string Artist { get; set; }
-		[JsonProperty("year")]
-		public int? Year { get; set; }
-		[JsonProperty("genre")]
-		public string Genre { get; set; }
-		[JsonProperty("duration")]
-		public int Duration { get; set; }
-		[JsonProperty("filename")]
-		public string Filename { get; set; }
-		[JsonProperty("song_path")]
-		public string SongPath { get; set; }
-		[JsonProperty("track")]
-		public int Track { get; set; } = 0;
-		[JsonProperty("disc")]
-		public int Disc { get; set; } = 0;
+        public int SongID { get; set; }
+        [JsonProperty("title")]
+        public string Title { get; set; }
+        [JsonProperty("album")]
+        [Column("Album")]
+        public string AlbumTitle { get; set; }
+        [JsonProperty("artist")]
+        public string Artist { get; set; }
+        [JsonProperty("year")]
+        public int? Year { get; set; }
+        [JsonProperty("genre")]
+        public string Genre { get; set; }
+        [JsonProperty("duration")]
+        public int Duration { get; set; }
+        [JsonProperty("filename")]
+        public string Filename { get; set; }
+        [JsonIgnore]
+        public string SongDirectory { get; set; }
+        [JsonProperty("track")]
+        public int Track { get; set; } = 0;
+        [JsonProperty("disc")]
+        public int Disc { get; set; } = 0;
+        [JsonIgnore]
+        public int? AlbumID { get; set; }
+        [JsonIgnore]
+        public int? ArtistID { get; set; }
+        [JsonIgnore]
+        public int? GenreID { get; set; }
+        [JsonIgnore]
+        public int? CoverArtID { get; set; }
+        [JsonProperty("date_created")]
+        public DateTime DateCreated { get; set; }
+        #endregion

-		// [JsonIgnore]
-		// public Album Album { get; set; }
-		[JsonIgnore]
-		public int? AlbumID { get; set; }

-		/**
-		[JsonIgnore]
-		public Artist SongArtist { get; set; }
-		*/
-		[JsonIgnore]
-		public int? ArtistID { get; set; }
-		/**
-		[JsonIgnore]
-		public Genre SongGenre { get; set; }
-		*/
-		[JsonIgnore]
-		public int? GenreID { get; set; }
+        #region Methods
+        public string SongPath()
+        {
+            var fullPath = SongDirectory;

-		// [JsonIgnore]
-		// public Year SongYear { get; set; }
-		// [JsonIgnore]
-		// public int? YearId { get; set; }
+            if (fullPath[fullPath.Length -1] != '/')
+            {
+                fullPath += "/";
+            }

-		/**
-		[JsonIgnore]
-		public CoverArt SongCoverArt { get; set; }
-		*/
-		[JsonIgnore]
-		public int? CoverArtID { get; set; }
-		[JsonProperty("date_created")]
-		public DateTime DateCreated { get; set; }
+            fullPath += Filename;
+
+            return fullPath;
+        }
+        #endregion
    }
 }