refactor namespaces and imports (#670)

* re-namespace

* optimize usings

* more usings

* more of the same

* more implicit/global usings

* cleanup all usings

* minor fixes

ErsatzTV.Core/Metadata/Nfo/ActorNfo.cs

@@ -1,19 +1,18 @@
 using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class ActorNfo
 {
-    public class ActorNfo
-    {
-        [XmlElement("name")]
-        public string Name { get; set; }
+    [XmlElement("name")]
+    public string Name { get; set; }
 
-        [XmlElement("role")]
-        public string Role { get; set; }
+    [XmlElement("role")]
+    public string Role { get; set; }
 
-        [XmlElement("order")]
-        public int? Order { get; set; }
+    [XmlElement("order")]
+    public int? Order { get; set; }
 
-        [XmlElement("thumb")]
-        public string Thumb { get; set; }
-    }
-}
+    [XmlElement("thumb")]
+    public string Thumb { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/ArtistNfo.cs

@@ -1,27 +1,25 @@
-using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+[XmlRoot("artist")]
+public class ArtistNfo
 {
-    [XmlRoot("artist")]
-    public class ArtistNfo
-    {
-        [XmlElement("name")]
-        public string Name { get; set; }
+    [XmlElement("name")]
+    public string Name { get; set; }
 
-        [XmlElement("disambiguation")]
-        public string Disambiguation { get; set; }
+    [XmlElement("disambiguation")]
+    public string Disambiguation { get; set; }
 
-        [XmlElement("genre")]
-        public List<string> Genres { get; set; }
+    [XmlElement("genre")]
+    public List<string> Genres { get; set; }
 
-        [XmlElement("style")]
-        public List<string> Styles { get; set; }
+    [XmlElement("style")]
+    public List<string> Styles { get; set; }
 
-        [XmlElement("mood")]
-        public List<string> Moods { get; set; }
+    [XmlElement("mood")]
+    public List<string> Moods { get; set; }
 
-        [XmlElement("biography")]
-        public string Biography { get; set; }
-    }
-}
+    [XmlElement("biography")]
+    public string Biography { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/EpisodeNfoReader.cs

@@ -1,201 +1,197 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using System.Xml;
+using System.Xml;
 using System.Xml.Linq;
 using ErsatzTV.Core.Interfaces.Metadata.Nfo;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class EpisodeNfoReader : IEpisodeNfoReader
 {
-    public class EpisodeNfoReader : IEpisodeNfoReader
+    public async Task<List<TvShowEpisodeNfo>> Read(Stream input)
     {
-        public async Task<List<TvShowEpisodeNfo>> Read(Stream input)
+        var result = new List<TvShowEpisodeNfo>();
+
+        var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
+        using var reader = XmlReader.Create(input, settings);
+        TvShowEpisodeNfo nfo = null;
+
+        while (await reader.ReadAsync())
         {
-            var result = new List<TvShowEpisodeNfo>();
-
-            var settings = new XmlReaderSettings { Async = true, ConformanceLevel = ConformanceLevel.Fragment };
-            using var reader = XmlReader.Create(input, settings);
-            TvShowEpisodeNfo nfo = null;
-
-            while (await reader.ReadAsync())
+            switch (reader.NodeType)
             {
-                switch (reader.NodeType)
-                {
-                    case XmlNodeType.Element:
-                        switch (reader.Name.ToLowerInvariant())
-                        {
-                            case "episodedetails":
-                                nfo = new TvShowEpisodeNfo
-                                {
-                                    UniqueIds = new List<UniqueIdNfo>(),
-                                    Actors = new List<ActorNfo>(),
-                                    Writers = new List<string>(),
-                                    Directors = new List<string>()
-                                };
-                                break;
-                            case "title":
-                                await ReadTitle(reader, nfo);
-                                break;
-                            case "showtitle":
-                                await ReadShowTitle(reader, nfo);
-                                break;
-                            case "episode":
-                                await ReadEpisode(reader, nfo);
-                                break;
-                            case "season":
-                                await ReadSeason(reader, nfo);
-                                break;
-                            case "uniqueid":
-                                await ReadUniqueId(reader, nfo);
-                                break;
-                            case "mpaa":
-                                await ReadContentRating(reader, nfo);
-                                break;
-                            case "aired":
-                                // TODO: parse the date here
-                                await ReadAired(reader, nfo);
-                                break;
-                            case "plot":
-                                await ReadPlot(reader, nfo);
-                                break;
-                            case "actor":
-                                ReadActor(reader, nfo);
-                                break;
-                            case "credits":
-                                await ReadWriter(reader, nfo);
-                                break;
-                            case "director":
-                                await ReadDirector(reader, nfo);
-                                break;
-                        }
+                case XmlNodeType.Element:
+                    switch (reader.Name.ToLowerInvariant())
+                    {
+                        case "episodedetails":
+                            nfo = new TvShowEpisodeNfo
+                            {
+                                UniqueIds = new List<UniqueIdNfo>(),
+                                Actors = new List<ActorNfo>(),
+                                Writers = new List<string>(),
+                                Directors = new List<string>()
+                            };
+                            break;
+                        case "title":
+                            await ReadTitle(reader, nfo);
+                            break;
+                        case "showtitle":
+                            await ReadShowTitle(reader, nfo);
+                            break;
+                        case "episode":
+                            await ReadEpisode(reader, nfo);
+                            break;
+                        case "season":
+                            await ReadSeason(reader, nfo);
+                            break;
+                        case "uniqueid":
+                            await ReadUniqueId(reader, nfo);
+                            break;
+                        case "mpaa":
+                            await ReadContentRating(reader, nfo);
+                            break;
+                        case "aired":
+                            // TODO: parse the date here
+                            await ReadAired(reader, nfo);
+                            break;
+                        case "plot":
+                            await ReadPlot(reader, nfo);
+                            break;
+                        case "actor":
+                            ReadActor(reader, nfo);
+                            break;
+                        case "credits":
+                            await ReadWriter(reader, nfo);
+                            break;
+                        case "director":
+                            await ReadDirector(reader, nfo);
+                            break;
+                    }
 
-                        break;
-                    case XmlNodeType.EndElement:
-                        switch (reader.Name.ToLowerInvariant())
-                        {
-                            case "episodedetails":
-                                if (nfo != null)
-                                {
-                                    result.Add(nfo);
-                                }
+                    break;
+                case XmlNodeType.EndElement:
+                    switch (reader.Name.ToLowerInvariant())
+                    {
+                        case "episodedetails":
+                            if (nfo != null)
+                            {
+                                result.Add(nfo);
+                            }
 
-                                break;
-                        }
+                            break;
+                    }
 
-                        break;
-                }
-            }
-
-            return result;
-        }
-
-        private static async Task ReadTitle(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                nfo.Title = await reader.ReadElementContentAsStringAsync();
+                    break;
             }
         }
 
-        private static async Task ReadShowTitle(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                nfo.ShowTitle = await reader.ReadElementContentAsStringAsync();
-            }
-        }
-
-        private static async Task ReadEpisode(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                bool _ = int.TryParse(await reader.ReadElementContentAsStringAsync(), out int episode);
-                nfo.Episode = episode;
-            }
-        }
-
-        private static async Task ReadSeason(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                bool _ = int.TryParse(await reader.ReadElementContentAsStringAsync(), out int season);
-                nfo.Season = season;
-            }
-        }
-
-        private static async Task ReadUniqueId(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                var uniqueId = new UniqueIdNfo();
-                reader.MoveToAttribute("default");
-                uniqueId.Default = bool.TryParse(reader.Value, out bool def) && def;
-                reader.MoveToAttribute("type");
-                uniqueId.Type = reader.Value;
-                reader.MoveToElement();
-                uniqueId.Guid = await reader.ReadElementContentAsStringAsync();
-
-                nfo.UniqueIds.Add(uniqueId);
-            }
-        }
-
-        private static async Task ReadContentRating(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                nfo.ContentRating = await reader.ReadElementContentAsStringAsync();
-            }
-        }
-
-        private static async Task ReadAired(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                nfo.Aired = await reader.ReadElementContentAsStringAsync();
-            }
-        }
-
-        private static async Task ReadPlot(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                nfo.Plot = await reader.ReadElementContentAsStringAsync();
-            }
-        }
-
-        private static void ReadActor(XmlReader reader, TvShowEpisodeNfo nfo)
-        {
-            if (nfo != null)
-            {
-                var actor = new ActorNfo();
-                var element = (XElement) XNode.ReadFrom(reader);
-
-                XElement name = element.Element("name");
-                if (name != null)
-                {
-                    actor.Name = name.Value;
-                }
-
-                XElement role = element.Element("role");
-                if (role != null)
-                {
-                    actor.Role = role.Value;
-                }
-
-                XElement thumb = element.Element("thumb");
-                if (thumb != null)
-                {
-                    actor.Thumb = thumb.Value;
-                }
-
-                nfo.Actors.Add(actor);
-            }
-        }
-
-        private static async Task ReadWriter(XmlReader reader, TvShowEpisodeNfo nfo) =>
-            nfo?.Writers.Add(await reader.ReadElementContentAsStringAsync());
-
-        private static async Task ReadDirector(XmlReader reader, TvShowEpisodeNfo nfo) =>
-            nfo?.Directors.Add(await reader.ReadElementContentAsStringAsync());
+        return result;
     }
-}
+
+    private static async Task ReadTitle(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            nfo.Title = await reader.ReadElementContentAsStringAsync();
+        }
+    }
+
+    private static async Task ReadShowTitle(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            nfo.ShowTitle = await reader.ReadElementContentAsStringAsync();
+        }
+    }
+
+    private static async Task ReadEpisode(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            bool _ = int.TryParse(await reader.ReadElementContentAsStringAsync(), out int episode);
+            nfo.Episode = episode;
+        }
+    }
+
+    private static async Task ReadSeason(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            bool _ = int.TryParse(await reader.ReadElementContentAsStringAsync(), out int season);
+            nfo.Season = season;
+        }
+    }
+
+    private static async Task ReadUniqueId(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            var uniqueId = new UniqueIdNfo();
+            reader.MoveToAttribute("default");
+            uniqueId.Default = bool.TryParse(reader.Value, out bool def) && def;
+            reader.MoveToAttribute("type");
+            uniqueId.Type = reader.Value;
+            reader.MoveToElement();
+            uniqueId.Guid = await reader.ReadElementContentAsStringAsync();
+
+            nfo.UniqueIds.Add(uniqueId);
+        }
+    }
+
+    private static async Task ReadContentRating(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            nfo.ContentRating = await reader.ReadElementContentAsStringAsync();
+        }
+    }
+
+    private static async Task ReadAired(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            nfo.Aired = await reader.ReadElementContentAsStringAsync();
+        }
+    }
+
+    private static async Task ReadPlot(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            nfo.Plot = await reader.ReadElementContentAsStringAsync();
+        }
+    }
+
+    private static void ReadActor(XmlReader reader, TvShowEpisodeNfo nfo)
+    {
+        if (nfo != null)
+        {
+            var actor = new ActorNfo();
+            var element = (XElement) XNode.ReadFrom(reader);
+
+            XElement name = element.Element("name");
+            if (name != null)
+            {
+                actor.Name = name.Value;
+            }
+
+            XElement role = element.Element("role");
+            if (role != null)
+            {
+                actor.Role = role.Value;
+            }
+
+            XElement thumb = element.Element("thumb");
+            if (thumb != null)
+            {
+                actor.Thumb = thumb.Value;
+            }
+
+            nfo.Actors.Add(actor);
+        }
+    }
+
+    private static async Task ReadWriter(XmlReader reader, TvShowEpisodeNfo nfo) =>
+        nfo?.Writers.Add(await reader.ReadElementContentAsStringAsync());
+
+    private static async Task ReadDirector(XmlReader reader, TvShowEpisodeNfo nfo) =>
+        nfo?.Directors.Add(await reader.ReadElementContentAsStringAsync());
+}

ErsatzTV.Core/Metadata/Nfo/MovieNfo.cs

@@ -1,52 +1,49 @@
-using System;
-using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+[XmlRoot("movie")]
+public class MovieNfo
 {
-    [XmlRoot("movie")]
-    public class MovieNfo
-    {
-        [XmlElement("title")]
-        public string Title { get; set; }
+    [XmlElement("title")]
+    public string Title { get; set; }
 
-        [XmlElement("outline")]
-        public string Outline { get; set; }
+    [XmlElement("outline")]
+    public string Outline { get; set; }
 
-        [XmlElement("year")]
-        public int Year { get; set; }
+    [XmlElement("year")]
+    public int Year { get; set; }
 
-        [XmlElement("mpaa")]
-        public string ContentRating { get; set; }
+    [XmlElement("mpaa")]
+    public string ContentRating { get; set; }
 
-        [XmlElement("premiered")]
-        public DateTime Premiered { get; set; }
+    [XmlElement("premiered")]
+    public DateTime Premiered { get; set; }
 
-        [XmlElement("plot")]
-        public string Plot { get; set; }
+    [XmlElement("plot")]
+    public string Plot { get; set; }
 
-        [XmlElement("tagline")]
-        public string Tagline { get; set; }
+    [XmlElement("tagline")]
+    public string Tagline { get; set; }
 
-        [XmlElement("genre")]
-        public List<string> Genres { get; set; }
+    [XmlElement("genre")]
+    public List<string> Genres { get; set; }
 
-        [XmlElement("tag")]
-        public List<string> Tags { get; set; }
+    [XmlElement("tag")]
+    public List<string> Tags { get; set; }
 
-        [XmlElement("studio")]
-        public List<string> Studios { get; set; }
+    [XmlElement("studio")]
+    public List<string> Studios { get; set; }
 
-        [XmlElement("actor")]
-        public List<ActorNfo> Actors { get; set; }
+    [XmlElement("actor")]
+    public List<ActorNfo> Actors { get; set; }
 
-        [XmlElement("credits")]
-        public List<string> Writers { get; set; }
+    [XmlElement("credits")]
+    public List<string> Writers { get; set; }
 
-        [XmlElement("director")]
-        public List<string> Directors { get; set; }
+    [XmlElement("director")]
+    public List<string> Directors { get; set; }
 
-        [XmlElement("uniqueid")]
-        public List<UniqueIdNfo> UniqueIds { get; set; }
-    }
-}
+    [XmlElement("uniqueid")]
+    public List<UniqueIdNfo> UniqueIds { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/MusicVideoNfo.cs

@@ -1,36 +1,34 @@
-using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+[XmlRoot("musicvideo")]
+public class MusicVideoNfo
 {
-    [XmlRoot("musicvideo")]
-    public class MusicVideoNfo
-    {
-        [XmlElement("artist")]
-        public string Artist { get; set; }
+    [XmlElement("artist")]
+    public string Artist { get; set; }
 
-        [XmlElement("title")]
-        public string Title { get; set; }
+    [XmlElement("title")]
+    public string Title { get; set; }
 
-        [XmlElement("album")]
-        public string Album { get; set; }
+    [XmlElement("album")]
+    public string Album { get; set; }
 
-        [XmlElement("plot")]
-        public string Plot { get; set; }
+    [XmlElement("plot")]
+    public string Plot { get; set; }
 
-        [XmlElement("premiered")]
-        public string Premiered { get; set; }
+    [XmlElement("premiered")]
+    public string Premiered { get; set; }
 
-        [XmlElement("year")]
-        public int Year { get; set; }
+    [XmlElement("year")]
+    public int Year { get; set; }
 
-        [XmlElement("genre")]
-        public List<string> Genres { get; set; }
+    [XmlElement("genre")]
+    public List<string> Genres { get; set; }
 
-        [XmlElement("tag")]
-        public List<string> Tags { get; set; }
+    [XmlElement("tag")]
+    public List<string> Tags { get; set; }
 
-        [XmlElement("studio")]
-        public List<string> Studios { get; set; }
-    }
-}
+    [XmlElement("studio")]
+    public List<string> Studios { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/TvShowEpisodeNfo.cs

@@ -1,42 +1,40 @@
-using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+[XmlRoot("episodedetails")]
+public class TvShowEpisodeNfo
 {
-    [XmlRoot("episodedetails")]
-    public class TvShowEpisodeNfo
-    {
-        [XmlElement("showtitle")]
-        public string ShowTitle { get; set; }
+    [XmlElement("showtitle")]
+    public string ShowTitle { get; set; }
 
-        [XmlElement("title")]
-        public string Title { get; set; }
+    [XmlElement("title")]
+    public string Title { get; set; }
 
-        [XmlElement("episode")]
-        public int Episode { get; set; }
+    [XmlElement("episode")]
+    public int Episode { get; set; }
 
-        [XmlElement("season")]
-        public int Season { get; set; }
+    [XmlElement("season")]
+    public int Season { get; set; }
 
-        [XmlElement("mpaa")]
-        public string ContentRating { get; set; }
+    [XmlElement("mpaa")]
+    public string ContentRating { get; set; }
 
-        [XmlElement("aired")]
-        public string Aired { get; set; }
+    [XmlElement("aired")]
+    public string Aired { get; set; }
 
-        [XmlElement("plot")]
-        public string Plot { get; set; }
+    [XmlElement("plot")]
+    public string Plot { get; set; }
 
-        [XmlElement("actor")]
-        public List<ActorNfo> Actors { get; set; }
+    [XmlElement("actor")]
+    public List<ActorNfo> Actors { get; set; }
 
-        [XmlElement("credits")]
-        public List<string> Writers { get; set; }
+    [XmlElement("credits")]
+    public List<string> Writers { get; set; }
 
-        [XmlElement("director")]
-        public List<string> Directors { get; set; }
+    [XmlElement("director")]
+    public List<string> Directors { get; set; }
 
-        [XmlElement("uniqueid")]
-        public List<UniqueIdNfo> UniqueIds { get; set; }
-    }
-}
+    [XmlElement("uniqueid")]
+    public List<UniqueIdNfo> UniqueIds { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/TvShowNfo.cs

@@ -1,52 +1,50 @@
-using System.Collections.Generic;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+[XmlRoot("tvshow")]
+public class TvShowNfo
 {
-    [XmlRoot("tvshow")]
-    public class TvShowNfo
+    [XmlElement("title")]
+    public string Title { get; set; }
+
+    [XmlIgnore]
+    public int? Year { get; set; }
+
+    [XmlElement("year")]
+    public string YearAsText
     {
-        [XmlElement("title")]
-        public string Title { get; set; }
-
-        [XmlIgnore]
-        public int? Year { get; set; }
-
-        [XmlElement("year")]
-        public string YearAsText
-        {
-            get => Year.HasValue ? Year.ToString() : null;
-            set => Year = !string.IsNullOrWhiteSpace(value) ? int.Parse(value) : default(int?);
-        }
-
-        [XmlElement("plot")]
-        public string Plot { get; set; }
-
-        [XmlElement("outline")]
-        public string Outline { get; set; }
-
-        [XmlElement("tagline")]
-        public string Tagline { get; set; }
-
-        [XmlElement("mpaa")]
-        public string ContentRating { get; set; }
-
-        [XmlElement("premiered")]
-        public string Premiered { get; set; }
-
-        [XmlElement("genre")]
-        public List<string> Genres { get; set; }
-
-        [XmlElement("tag")]
-        public List<string> Tags { get; set; }
-
-        [XmlElement("studio")]
-        public List<string> Studios { get; set; }
-
-        [XmlElement("actor")]
-        public List<ActorNfo> Actors { get; set; }
-
-        [XmlElement("uniqueid")]
-        public List<UniqueIdNfo> UniqueIds { get; set; }
+        get => Year.HasValue ? Year.ToString() : null;
+        set => Year = !string.IsNullOrWhiteSpace(value) ? int.Parse(value) : default(int?);
     }
-}
+
+    [XmlElement("plot")]
+    public string Plot { get; set; }
+
+    [XmlElement("outline")]
+    public string Outline { get; set; }
+
+    [XmlElement("tagline")]
+    public string Tagline { get; set; }
+
+    [XmlElement("mpaa")]
+    public string ContentRating { get; set; }
+
+    [XmlElement("premiered")]
+    public string Premiered { get; set; }
+
+    [XmlElement("genre")]
+    public List<string> Genres { get; set; }
+
+    [XmlElement("tag")]
+    public List<string> Tags { get; set; }
+
+    [XmlElement("studio")]
+    public List<string> Studios { get; set; }
+
+    [XmlElement("actor")]
+    public List<ActorNfo> Actors { get; set; }
+
+    [XmlElement("uniqueid")]
+    public List<UniqueIdNfo> UniqueIds { get; set; }
+}

ErsatzTV.Core/Metadata/Nfo/UniqueIdNfo.cs

@@ -1,16 +1,15 @@
 using System.Xml.Serialization;
 
-namespace ErsatzTV.Core.Metadata.Nfo
+namespace ErsatzTV.Core.Metadata.Nfo;
+
+public class UniqueIdNfo
 {
-    public class UniqueIdNfo
-    {
-        [XmlAttribute("default")]
-        public bool Default { get; set; }
+    [XmlAttribute("default")]
+    public bool Default { get; set; }
 
-        [XmlAttribute("type")]
-        public string Type { get; set; }
+    [XmlAttribute("type")]
+    public string Type { get; set; }
 
-        [XmlText]
-        public string Guid { get; set; }
-    }
-}
+    [XmlText]
+    public string Guid { get; set; }
+}