Merge branch 'dev' into code-cleanup

9 files changed, 64 insertions, 67 deletions

diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs
index c57c45297..e72d94bf5 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs
@@ -25,7 +25,7 @@ namespace Emby.XmlTv.Console
             var timer = Stopwatch.StartNew();
             System.Console.WriteLine("Running XMLTv Parsing");
 
-            var resultsFile = String.Format("C:\\Temp\\{0}_Results_{1:HHmmss}.txt", 
+            var resultsFile = String.Format("C:\\Temp\\{0}_Results_{1:HHmmss}.txt",
                 Path.GetFileNameWithoutExtension(filename),
                 DateTimeOffset.UtcNow);
 
diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs
index cd1fcce68..4178a27a1 100644
--- a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Emby.XmlTv.Console")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,11 +25,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs
index b6fc4c8e2..e79fda8a8 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Emby.XmlTv.Test")]
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
@@ -25,11 +25,11 @@ using System.Runtime.InteropServices;
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs
index dbbd352ee..2e4516be5 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs
@@ -16,7 +16,7 @@ namespace Emby.XmlTv.Test
         {
             var testFile = Path.GetFullPath(@"MultilanguageData.xml");
             var reader = new XmlTvReader(testFile, "es");
-            
+
             Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("2016"));
             Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("201601"));
             Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("20160101"));
diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs
index 489e16ee6..77dabe13e 100644
--- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs
+++ b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs
@@ -12,23 +12,22 @@ namespace Emby.XmlTv.Test
     [TestClass]
     public class XmlTvReaderLanguageTests
     {
-        /*
-            <title lang="es">Homes Under the Hammer - Spanish</title>
-		    <title lang="es">Homes Under the Hammer - Spanish 2</title>
-		    <title lang="en">Homes Under the Hammer - English</title>
-		    <title lang="en">Homes Under the Hammer - English 2</title>
-		    <title lang="">Homes Under the Hammer - Empty Language</title>
-		    <title lang="">Homes Under the Hammer - Empty Language 2</title>
-		    <title>Homes Under the Hammer - No Language</title>
-		    <title>Homes Under the Hammer - No Language 2</title>
-            */
-
-        /*  Expected Behaviour:
-            - Language = Null   Homes Under the Hammer - No Language
-            - Language = ""   Homes Under the Hammer - No Language
-            - Language = es     Homes Under the Hammer - Spanish
-            - Language = en     Homes Under the Hammer - English
-        */
+        /* <title lang="es">Homes Under the Hammer - Spanish</title>
+         * <title lang="es">Homes Under the Hammer - Spanish 2</title>
+         * <title lang="en">Homes Under the Hammer - English</title>
+         * <title lang="en">Homes Under the Hammer - English 2</title>
+         * <title lang="">Homes Under the Hammer - Empty Language</title>
+         * <title lang="">Homes Under the Hammer - Empty Language 2</title>
+         * <title>Homes Under the Hammer - No Language</title>
+         * <title>Homes Under the Hammer - No Language 2</title>
+         */
+
+        /* Expected Behaviour:
+         *  - Language = Null   Homes Under the Hammer - No Language
+         *  - Language = ""     Homes Under the Hammer - No Language
+         *  - Language = es     Homes Under the Hammer - Spanish
+         *  - Language = en     Homes Under the Hammer - English
+         */
 
         [TestMethod]
         [DeploymentItem("Xml Files\\MultilanguageData.xml")]
diff --git a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
index 9a012f564..aa4840664 100644
--- a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs
@@ -580,7 +580,7 @@ namespace Emby.XmlTv.Classes
 
         public void ParseEpisodeDataForOnScreen(XmlReader reader, XmlTvProgram result)
         {
-            //// example: 'Episode #FFEE' 
+            //// example: 'Episode #FFEE'
             //serEpNum = ConvertHTMLToAnsi(nodeEpisodeNum);
             //int num1 = serEpNum.IndexOf("#", 0);
             //if (num1 < 0) num1 = 0;
@@ -832,23 +832,22 @@ namespace Emby.XmlTv.Classes
 
         public void ProcessNode(XmlReader reader, Action<string> setter, string languageRequired = null, Action<string> allOccurrencesSetter = null)
         {
-            /*
-            <title lang="es">Homes Under the Hammer - Spanish</title>
-		    <title lang="es">Homes Under the Hammer - Spanish 2</title>
-		    <title lang="en">Homes Under the Hammer - English</title>
-		    <title lang="en">Homes Under the Hammer - English 2</title>
-		    <title lang="">Homes Under the Hammer - Empty Language</title>
-		    <title lang="">Homes Under the Hammer - Empty Language 2</title>
-		    <title>Homes Under the Hammer - No Language</title>
-		    <title>Homes Under the Hammer - No Language 2</title>
-            */
-
-            /*  Expected Behaviour:
-                - Language = Null   Homes Under the Hammer - No Language
-                - Language = ""   Homes Under the Hammer - No Language
-                - Language = es     Homes Under the Hammer - Spanish
-                - Language = en     Homes Under the Hammer - English
-            */
+            /* <title lang="es">Homes Under the Hammer - Spanish</title>
+             * <title lang="es">Homes Under the Hammer - Spanish 2</title>
+             * <title lang="en">Homes Under the Hammer - English</title>
+             * <title lang="en">Homes Under the Hammer - English 2</title>
+             * <title lang="">Homes Under the Hammer - Empty Language</title>
+             * <title lang="">Homes Under the Hammer - Empty Language 2</title>
+             * <title>Homes Under the Hammer - No Language</title>
+             * <title>Homes Under the Hammer - No Language 2</title>
+             */
+
+            /* Expected Behaviour:
+             *  - Language = Null   Homes Under the Hammer - No Language
+             *  - Language = ""     Homes Under the Hammer - No Language
+             *  - Language = es     Homes Under the Hammer - Spanish
+             *  - Language = en     Homes Under the Hammer - English
+             */
 
             var results = new List<Tuple<string, string>>();
 
@@ -921,23 +920,22 @@ namespace Emby.XmlTv.Classes
 
         public void ProcessMultipleNodes(XmlReader reader, Action<string> setter, string languageRequired = null)
         {
-            /*
-            <category lang="en">Property - English</category>
-		    <category lang="en">Property - English 2</category>
-		    <category lang="es">Property - Spanish</category>
-		    <category lang="es">Property - Spanish 2</category>
-		    <category lang="">Property - Empty Language</category>
-		    <category lang="">Property - Empty Language 2</category>
-		    <category>Property - No Language</category>
-		    <category>Property - No Language 2</category>
-            */
-
-            /*  Expected Behaviour:
-                - Language = Null   Property - No Language / Property - No Language 2
-                - Language = ""     Property - Empty Language / Property - Empty Language 2
-                - Language = es     Property - Spanish / Property - Spanish 2
-                - Language = en     Property - English / Property - English 2
-            */
+            /* <category lang="en">Property - English</category>
+             * <category lang="en">Property - English 2</category>
+             * <category lang="es">Property - Spanish</category>
+             * <category lang="es">Property - Spanish 2</category>
+             * <category lang="">Property - Empty Language</category>
+             * <category lang="">Property - Empty Language 2</category>
+             * <category>Property - No Language</category>
+             * <category>Property - No Language 2</category>
+             */
+
+            /* Expected Behaviour:
+             *  - Language = Null   Property - No Language / Property - No Language 2
+             *  - Language = ""     Property - Empty Language / Property - Empty Language 2
+             *  - Language = es     Property - Spanish / Property - Spanish 2
+             *  - Language = en     Property - English / Property - English 2
+             */
 
             var currentElementName = reader.Name;
             var values = new[] { new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() } }.ToList();
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs
index 9192acce7..de84ab5ba 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs
@@ -49,5 +49,5 @@ namespace Emby.XmlTv.Entities
         }
     }
 
-    
+
 }
diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs
index b5aa6cf7a..b6614afc1 100644
--- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs
@@ -13,7 +13,7 @@ namespace Emby.XmlTv.Entities
         public DateTimeOffset EndDate { get; set; }
 
         public string Title { get; set; }
-        
+
         public string Description { get; set; }
         public string ProgramId { get; set; }
         public string Quality { get; set; }
diff --git a/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs
index 2a56c5d25..ff2efb078 100644
--- a/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs
+++ b/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@ using System.Reflection;
 using System.Resources;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("XmlTv")]