Merge pull request #2800 from MediaBrowser/dev

Dev

16 files changed, 47 insertions, 59 deletions

diff --git a/MediaBrowser.Model/Dlna/CodecProfile.cs b/MediaBrowser.Model/Dlna/CodecProfile.cs
index 979cd343f..14b1875c1 100644
--- a/MediaBrowser.Model/Dlna/CodecProfile.cs
+++ b/MediaBrowser.Model/Dlna/CodecProfile.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Xml.Serialization;
 using MediaBrowser.Model.Dlna;
-using System.Linq;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/ConditionProcessor.cs b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
index 291096f75..bd3dc6fd2 100644
--- a/MediaBrowser.Model/Dlna/ConditionProcessor.cs
+++ b/MediaBrowser.Model/Dlna/ConditionProcessor.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Model.MediaInfo;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 
 namespace MediaBrowser.Model.Dlna
 {
diff --git a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
index d99501875..e80f59be4 100644
--- a/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
+++ b/MediaBrowser.Model/Dlna/DirectPlayProfile.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Xml.Serialization;
 
 namespace MediaBrowser.Model.Dlna
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index 9c8e8b030..f863d8c95 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -149,7 +149,7 @@ namespace MediaBrowser.Model.Dlna
                 list.Add(string.Format("{0}={1}", pair.Name, pair.Value));
             }
 
-            string queryString = string.Join("&", list.ToArray());
+            string queryString = string.Join("&", list.ToArray(list.Count));
 
             return GetUrl(baseUrl, queryString);
         }
@@ -203,7 +203,7 @@ namespace MediaBrowser.Model.Dlna
                 list.Add(pair.Value);
             }
 
-            return string.Format("Params={0}", string.Join(";", list.ToArray()));
+            return string.Format("Params={0}", string.Join(";", list.ToArray(list.Count)));
         }
 
         private static List<NameValuePair> BuildParams(StreamInfo item, string accessToken, bool isDlna)
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index b1d918b16..92d8bfab2 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -163,7 +163,7 @@ namespace MediaBrowser.Model.Dto
 
         public string[] ProductionLocations { get; set; }
 
-        public List<string> MultiPartGameFiles { get; set; }
+        public string[] MultiPartGameFiles { get; set; }
 
         /// <summary>
         /// Gets or sets the path.
@@ -201,7 +201,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the taglines.
         /// </summary>
         /// <value>The taglines.</value>
-        public List<string> Taglines { get; set; }
+        public string[] Taglines { get; set; }
 
         /// <summary>
         /// Gets or sets the genres.
@@ -360,7 +360,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the parent backdrop image tags.
         /// </summary>
         /// <value>The parent backdrop image tags.</value>
-        public List<string> ParentBackdropImageTags { get; set; }
+        public string[] ParentBackdropImageTags { get; set; }
 
         /// <summary>
         /// Gets or sets the local trailer count.
@@ -438,7 +438,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the tags.
         /// </summary>
         /// <value>The tags.</value>
-        public List<string> Tags { get; set; }
+        public string[] Tags { get; set; }
 
         /// <summary>
         /// Gets or sets the primary image aspect ratio, after image enhancements.
@@ -560,13 +560,13 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the backdrop image tags.
         /// </summary>
         /// <value>The backdrop image tags.</value>
-        public List<string> BackdropImageTags { get; set; }
+        public string[] BackdropImageTags { get; set; }
 
         /// <summary>
         /// Gets or sets the screenshot image tags.
         /// </summary>
         /// <value>The screenshot image tags.</value>
-        public List<string> ScreenshotImageTags { get; set; }
+        public string[] ScreenshotImageTags { get; set; }
 
         /// <summary>
         /// Gets or sets the parent logo image tag.
@@ -664,7 +664,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the locked fields.
         /// </summary>
         /// <value>The locked fields.</value>
-        public List<MetadataFields> LockedFields { get; set; }
+        public MetadataFields[] LockedFields { get; set; }
 
         /// <summary>
         /// Gets or sets the trailer count.
@@ -778,27 +778,7 @@ namespace MediaBrowser.Model.Dto
         [IgnoreDataMember]
         public bool HasBackdrop
         {
-            get { return (BackdropImageTags != null && BackdropImageTags.Count > 0) || (ParentBackdropImageTags != null && ParentBackdropImageTags.Count > 0); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance has primary image.
-        /// </summary>
-        /// <value><c>true</c> if this instance has primary image; otherwise, <c>false</c>.</value>
-        [IgnoreDataMember]
-        public bool HasPrimaryImage
-        {
-            get { return ImageTags != null && ImageTags.ContainsKey(ImageType.Primary); }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is video.
-        /// </summary>
-        /// <value><c>true</c> if this instance is video; otherwise, <c>false</c>.</value>
-        [IgnoreDataMember]
-        public bool IsVideo
-        {
-            get { return StringHelper.EqualsIgnoreCase(MediaType, Entities.MediaType.Video); }
+            get { return (BackdropImageTags != null && BackdropImageTags.Length > 0) || (ParentBackdropImageTags != null && ParentBackdropImageTags.Length > 0); }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 3cd3e7dde..747528cbf 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -81,7 +81,7 @@ namespace MediaBrowser.Model.Entities
                         attributes.Add("Default");
                     }
 
-                    return string.Join(" ", attributes.ToArray());
+                    return string.Join(" ", attributes.ToArray(attributes.Count));
                 }
 
                 if (Type == MediaStreamType.Subtitle)
@@ -107,7 +107,7 @@ namespace MediaBrowser.Model.Entities
                         attributes.Add("Forced");
                     }
 
-                    string name = string.Join(" ", attributes.ToArray());
+                    string name = string.Join(" ", attributes.ToArray(attributes.Count));
 
                     return name;
                 }
diff --git a/MediaBrowser.Model/Extensions/LinqExtensions.cs b/MediaBrowser.Model/Extensions/LinqExtensions.cs
index 6b2bdb4c7..43e4a66cd 100644
--- a/MediaBrowser.Model/Extensions/LinqExtensions.cs
+++ b/MediaBrowser.Model/Extensions/LinqExtensions.cs
@@ -42,6 +42,32 @@ namespace MediaBrowser.Model.Extensions
             return source.DistinctBy(keySelector, null);
         }
 
+        public static TSource[] ToArray<TSource>(this IEnumerable<TSource> source, int count)
+        {
+            if (source == null) throw new ArgumentNullException("source");
+            if (count < 0) throw new ArgumentOutOfRangeException("count");
+            var array = new TSource[count];
+            int i = 0;
+            foreach (var item in source)
+            {
+                array[i++] = item;
+            }
+            return array;
+        }
+
+        public static List<TSource> ToList<TSource>(this IEnumerable<TSource> source, int count)
+        {
+            if (source == null) throw new ArgumentNullException("source");
+            if (count < 0) throw new ArgumentOutOfRangeException("count");
+            var array = new List<TSource>(count);
+            int i = 0;
+            foreach (var item in source)
+            {
+                array[i++] = item;
+            }
+            return array;
+        }
+
         /// <summary>
         /// Returns all distinct elements of the given source, where "distinctness"
         /// is determined via a projection and the specified comparer for the projected type.
diff --git a/MediaBrowser.Model/Globalization/ILocalizationManager.cs b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
index 4477d8de3..47cec1459 100644
--- a/MediaBrowser.Model/Globalization/ILocalizationManager.cs
+++ b/MediaBrowser.Model/Globalization/ILocalizationManager.cs
@@ -12,12 +12,12 @@ namespace MediaBrowser.Model.Globalization
         /// Gets the cultures.
         /// </summary>
         /// <returns>IEnumerable{CultureDto}.</returns>
-        IEnumerable<CultureDto> GetCultures();
+        List<CultureDto> GetCultures();
         /// <summary>
         /// Gets the countries.
         /// </summary>
         /// <returns>IEnumerable{CountryInfo}.</returns>
-        IEnumerable<CountryInfo> GetCountries();
+        List<CountryInfo> GetCountries();
         /// <summary>
         /// Gets the parental ratings.
         /// </summary>
diff --git a/MediaBrowser.Model/Net/ISocket.cs b/MediaBrowser.Model/Net/ISocket.cs
index 71eb9914b..42550340b 100644
--- a/MediaBrowser.Model/Net/ISocket.cs
+++ b/MediaBrowser.Model/Net/ISocket.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Model/Services/IHttpRequest.cs b/MediaBrowser.Model/Services/IHttpRequest.cs
index 46c0240cd..e1480f30a 100644
--- a/MediaBrowser.Model/Services/IHttpRequest.cs
+++ b/MediaBrowser.Model/Services/IHttpRequest.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Model/Services/IHttpResponse.cs b/MediaBrowser.Model/Services/IHttpResponse.cs
index 377f303a7..cd9c07d46 100644
--- a/MediaBrowser.Model/Services/IHttpResponse.cs
+++ b/MediaBrowser.Model/Services/IHttpResponse.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Model/Services/IHttpResult.cs b/MediaBrowser.Model/Services/IHttpResult.cs
index fcb137c6b..90afb0f27 100644
--- a/MediaBrowser.Model/Services/IHttpResult.cs
+++ b/MediaBrowser.Model/Services/IHttpResult.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Model/Services/QueryParamCollection.cs b/MediaBrowser.Model/Services/QueryParamCollection.cs
index dfea62821..a3e00f587 100644
--- a/MediaBrowser.Model/Services/QueryParamCollection.cs
+++ b/MediaBrowser.Model/Services/QueryParamCollection.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Services
 {
@@ -187,7 +188,7 @@ namespace MediaBrowser.Model.Services
 
         public override String ToString()
         {
-            var vals = this.Select(GetQueryStringValue).ToArray();
+            var vals = this.Select(GetQueryStringValue).ToArray(this.Count);
 
             return string.Join("&", vals);
         }
diff --git a/MediaBrowser.Model/Social/ISharingRepository.cs b/MediaBrowser.Model/Social/ISharingRepository.cs
index 069b6e1fe..1dadd7f71 100644
--- a/MediaBrowser.Model/Social/ISharingRepository.cs
+++ b/MediaBrowser.Model/Social/ISharingRepository.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace MediaBrowser.Model.Social
 {
diff --git a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
index 66f5294e7..2dec79e93 100644
--- a/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
+++ b/MediaBrowser.Model/Tasks/ScheduledTaskHelpers.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-
+
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
@@ -26,12 +24,6 @@ namespace MediaBrowser.Model.Tasks
 
             string key = task.ScheduledTask.Key;
 
-            var triggers = task.Triggers
-                .OrderBy(i => i.Type)
-                .ThenBy(i => i.DayOfWeek ?? DayOfWeek.Sunday)
-                .ThenBy(i => i.TimeOfDayTicks ?? 0)
-                .ToList();
-
             return new TaskInfo
             {
                 Name = task.Name,
@@ -40,7 +32,7 @@ namespace MediaBrowser.Model.Tasks
                 Id = task.Id,
                 LastExecutionResult = task.LastExecutionResult,
 
-                Triggers = triggers,
+                Triggers = task.Triggers,
 
                 Description = task.Description,
                 Category = task.Category,
diff --git a/MediaBrowser.Model/Tasks/TaskInfo.cs b/MediaBrowser.Model/Tasks/TaskInfo.cs
index 50276f8eb..8792ce952 100644
--- a/MediaBrowser.Model/Tasks/TaskInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskInfo.cs
@@ -41,7 +41,7 @@ namespace MediaBrowser.Model.Tasks
         /// Gets or sets the triggers.
         /// </summary>
         /// <value>The triggers.</value>
-        public List<TaskTriggerInfo> Triggers { get; set; }
+        public TaskTriggerInfo[] Triggers { get; set; }
 
         /// <summary>
         /// Gets or sets the description.
@@ -72,7 +72,7 @@ namespace MediaBrowser.Model.Tasks
         /// </summary>
         public TaskInfo()
         {
-            Triggers = new List<TaskTriggerInfo>();
+            Triggers = new TaskTriggerInfo[]{};
         }
     }
 }