Merge pull request #3242 from MediaBrowser/dev

update translations
MediaBrowser · Apr 22, 2018 · 5888e02 · 5888e02
2 parents 364370f + 1863407
commit 5888e02
Show file tree

Hide file tree

Showing 133 changed files with 1,472 additions and 2,286 deletions.
diff --git a/Emby.Dlna/Common/StateVariable.cs b/Emby.Dlna/Common/StateVariable.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System;
 
 namespace Emby.Dlna.Common
 {
@@ -10,7 +11,7 @@ public class StateVariable
 
         public bool SendsEvents { get; set; }
 
-        public List<string> AllowedValues { get; set; }
+        public string[] AllowedValues { get; set; }
 
         public override string ToString()
         {
@@ -19,7 +20,7 @@ public override string ToString()
 
         public StateVariable()
         {
-            AllowedValues = new List<string>();
+            AllowedValues = Array.Empty<string>();
         }
     }
 }
diff --git a/Emby.Dlna/ConfigurationExtension.cs b/Emby.Dlna/ConfigurationExtension.cs
@@ -16,7 +16,7 @@ public class DlnaConfigurationFactory : IConfigurationFactory
     {
         public IEnumerable<ConfigurationStore> GetConfigurations()
         {
-            return new List<ConfigurationStore>
+            return new ConfigurationStore[]
             {
                 new ConfigurationStore
                 {

diff --git a/Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs b/Emby.Dlna/ConnectionManager/ConnectionManagerXmlBuilder.cs
@@ -42,7 +42,7 @@ private IEnumerable<StateVariable> GetStateVariables()
                 DataType = "string",
                 SendsEvents = false,
 
-                AllowedValues = new List<string>
+                AllowedValues = new string[]
                 {
                     "OK",
                     "ContentFormatMismatch",
@@ -65,7 +65,7 @@ private IEnumerable<StateVariable> GetStateVariables()
                 DataType = "string",
                 SendsEvents = false,
 
-                AllowedValues = new List<string>
+                AllowedValues = new string[]
                 {
                     "Output",
                     "Input"

diff --git a/Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs b/Emby.Dlna/ContentDirectory/ContentDirectoryXmlBuilder.cs
@@ -99,7 +99,7 @@ private IEnumerable<StateVariable> GetStateVariables()
                 DataType = "string",
                 SendsEvents = false,
 
-                AllowedValues = new List<string>
+                AllowedValues = new string[]
                 {
                     "BrowseMetadata",
                     "BrowseDirectChildren"

diff --git a/Emby.Dlna/ContentDirectory/ControlHandler.cs b/Emby.Dlna/ContentDirectory/ControlHandler.cs
@@ -311,7 +311,7 @@ private IEnumerable<KeyValuePair<string, string>> HandleBrowse(IDictionary<strin
 
             var resXML = builder.ToString();
 
-            return new List<KeyValuePair<string, string>>
+            return new []
                 {
                     new KeyValuePair<string,string>("Result", resXML),
                     new KeyValuePair<string,string>("NumberReturned", provided.ToString(_usCulture)),
@@ -1135,7 +1135,7 @@ private QueryResult<ServerItem> GetMusicLatest(BaseItem parent, User user, Inter
                 ParentId = parent == null ? null : parent.Id.ToString("N"),
                 GroupItems = true
 
-            }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToList();
+            }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
 
             return ToResult(items);
         }
@@ -1150,7 +1150,7 @@ private QueryResult<ServerItem> GetNextUp(BaseItem parent, User user, InternalIt
                 StartIndex = query.StartIndex,
                 UserId = query.User.Id.ToString("N")
 
-            }, new List<BaseItem> { parent }, query.DtoOptions);
+            }, new [] { parent }, query.DtoOptions);
 
             return ToResult(result);
         }
@@ -1167,7 +1167,7 @@ private QueryResult<ServerItem> GetTvLatest(BaseItem parent, User user, Internal
                 ParentId = parent == null ? null : parent.Id.ToString("N"),
                 GroupItems = false
 
-            }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToList();
+            }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
 
             return ToResult(items);
         }
@@ -1184,7 +1184,7 @@ private QueryResult<ServerItem> GetMovieLatest(BaseItem parent, User user, Inter
                 ParentId = parent == null ? null : parent.Id.ToString("N"),
                 GroupItems = true
 
-            }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToList();
+            }, query.DtoOptions).Select(i => i.Item1 ?? i.Item2.FirstOrDefault()).Where(i => i != null).ToArray();
 
             return ToResult(items);
         }
@@ -1249,15 +1249,15 @@ private QueryResult<ServerItem> GetMusicGenreItems(BaseItem item, Guid? parentId
             return ToResult(result);
         }
 
-        private QueryResult<ServerItem> ToResult(List<BaseItem> result)
+        private QueryResult<ServerItem> ToResult(BaseItem[] result)
         {
             var serverItems = result
                 .Select(i => new ServerItem(i))
-                .ToArray(result.Count);
+                .ToArray(result.Length);
 
             return new QueryResult<ServerItem>
             {
-                TotalRecordCount = result.Count,
+                TotalRecordCount = result.Length,
                 Items = serverItems
             };
         }

diff --git a/Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs b/Emby.Dlna/ContentDirectory/ServiceActionListBuilder.cs
@@ -7,7 +7,7 @@ public class ServiceActionListBuilder
     {
         public IEnumerable<ServiceAction> GetActions()
         {
-            var list = new List<ServiceAction>
+            return new []
             {
                 GetSearchCapabilitiesAction(),
                 GetSortCapabilitiesAction(),
@@ -18,8 +18,6 @@ public IEnumerable<ServiceAction> GetActions()
                 GetXSetBookmarkAction(),
                 GetBrowseByLetterAction()
             };
-
-            return list;
         }
 
         private ServiceAction GetGetSystemUpdateIDAction()

diff --git a/Emby.Dlna/Main/DlnaEntryPoint.cs b/Emby.Dlna/Main/DlnaEntryPoint.cs
@@ -248,7 +248,7 @@ private async Task RegisterServerEndpoints()
                 SetProperies(device, fullService);
                 _Publisher.AddDevice(device);
 
-                var embeddedDevices = new List<string>
+                var embeddedDevices = new []
                 {
                     "urn:schemas-upnp-org:service:ContentDirectory:1",
                     "urn:schemas-upnp-org:service:ConnectionManager:1",

diff --git a/Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs b/Emby.Dlna/MediaReceiverRegistrar/ServiceActionListBuilder.cs
@@ -7,7 +7,7 @@ public class ServiceActionListBuilder
     {
         public IEnumerable<ServiceAction> GetActions()
         {
-            var list = new List<ServiceAction>
+            return new []
             {
                 GetIsValidated(),
                 GetIsAuthorized(),
@@ -17,8 +17,6 @@ public IEnumerable<ServiceAction> GetActions()
                 GetGetValidationRevokedUpdateID(),
                 GetGetValidationSucceededUpdateID()
             };
-
-            return list;
         }
 
         private ServiceAction GetIsValidated()

diff --git a/Emby.Dlna/PlayTo/Device.cs b/Emby.Dlna/PlayTo/Device.cs
@@ -368,7 +368,7 @@ private Task SetPlay(TransportCommands avCommands, CancellationToken cancellatio
         {
             var command = avCommands.ServiceActions.FirstOrDefault(c => c.Name == "Play");
             if (command == null)
-                return Task.FromResult(true);
+                return Task.CompletedTask;
 
             var service = GetAvTransportService();
 

diff --git a/Emby.Dlna/PlayTo/TransportCommands.cs b/Emby.Dlna/PlayTo/TransportCommands.cs
@@ -108,7 +108,7 @@ private static StateVariable FromXml(XElement container)
             {
                 Name = container.GetValue(uPnpNamespaces.svc + "name"),
                 DataType = container.GetValue(uPnpNamespaces.svc + "dataType"),
-                AllowedValues = allowedValues
+                AllowedValues = allowedValues.ToArray()
             };
         }
 

diff --git a/Emby.Dlna/Service/ServiceXmlBuilder.cs b/Emby.Dlna/Service/ServiceXmlBuilder.cs
@@ -72,7 +72,7 @@ private void AppendServiceStateTable(StringBuilder builder, IEnumerable<StateVar
                 builder.Append("<name>" + DescriptionXmlBuilder.Escape(item.Name ?? string.Empty) + "</name>");
                 builder.Append("<dataType>" + DescriptionXmlBuilder.Escape(item.DataType ?? string.Empty) + "</dataType>");
 
-                if (item.AllowedValues.Count > 0)
+                if (item.AllowedValues.Length > 0)
                 {
                     builder.Append("<allowedValueList>");
                     foreach (var allowedValue in item.AllowedValues)

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
@@ -208,7 +208,7 @@ public async Task<Tuple<string, string, DateTime>> ProcessImage(ImageProcessingO
             dateModified = supportedImageInfo.Item2;
             var requiresTransparency = TransparentImageTypes.Contains(Path.GetExtension(originalImagePath) ?? string.Empty);
 
-            if (options.Enhancers.Count > 0)
+            if (options.Enhancers.Length > 0)
             {
                 if (item == null)
                 {
@@ -541,7 +541,7 @@ public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
         /// <param name="imageEnhancers">The image enhancers.</param>
         /// <returns>Guid.</returns>
         /// <exception cref="System.ArgumentNullException">item</exception>
-        public string GetImageCacheTag(BaseItem item, ItemImageInfo image, List<IImageEnhancer> imageEnhancers)
+        public string GetImageCacheTag(BaseItem item, ItemImageInfo image, IImageEnhancer[] imageEnhancers)
         {
             if (item == null)
             {
@@ -563,7 +563,7 @@ public string GetImageCacheTag(BaseItem item, ItemImageInfo image, List<IImageEn
             var imageType = image.Type;
 
             // Optimization
-            if (imageEnhancers.Count == 0)
+            if (imageEnhancers.Length == 0)
             {
                 return (originalImagePath + dateModified.Ticks).GetMD5().ToString("N");
             }
@@ -642,7 +642,7 @@ private async Task<Tuple<string, DateTime, bool>> GetEnhancedImage(ItemImageInfo
             bool inputImageSupportsTransparency,
             BaseItem item,
             int imageIndex,
-            List<IImageEnhancer> enhancers,
+            IImageEnhancer[] enhancers,
             CancellationToken cancellationToken)
         {
             var originalImagePath = image.Path;
@@ -693,7 +693,7 @@ private async Task<Tuple<string, bool>> GetEnhancedImageInternal(string original
             BaseItem item,
             ImageType imageType,
             int imageIndex,
-            List<IImageEnhancer> supportedEnhancers,
+            IImageEnhancer[] supportedEnhancers,
             string cacheGuid,
             CancellationToken cancellationToken)
         {
@@ -717,8 +717,8 @@ private async Task<Tuple<string, bool>> GetEnhancedImageInternal(string original
             }
 
             // All enhanced images are saved as png to allow transparency
-            var cacheExtension = _imageEncoder.SupportedOutputFormats.Contains(ImageFormat.Webp) ? 
-                ".webp" : 
+            var cacheExtension = _imageEncoder.SupportedOutputFormats.Contains(ImageFormat.Webp) ?
+                ".webp" :
                 (treatmentRequiresTransparency ? ".png" : ".jpg");
 
             var enhancedImagePath = GetCachePath(EnhancedImageCachePath, cacheGuid + cacheExtension);
@@ -842,16 +842,20 @@ public void CreateImageCollage(ImageCollageOptions options)
             _logger.Info("Completed creation of image collage and saved to {0}", options.OutputPath);
         }
 
-        public List<IImageEnhancer> GetSupportedEnhancers(BaseItem item, ImageType imageType)
+        public IImageEnhancer[] GetSupportedEnhancers(BaseItem item, ImageType imageType)
         {
-            var list = new List<IImageEnhancer>();
+            List<IImageEnhancer> list = null;
 
             foreach (var i in ImageEnhancers)
             {
                 try
                 {
                     if (i.Supports(item, imageType))
                     {
+                        if (list == null)
+                        {
+                            list = new List<IImageEnhancer>();
+                        }
                         list.Add(i);
                     }
                 }
@@ -860,7 +864,8 @@ public List<IImageEnhancer> GetSupportedEnhancers(BaseItem item, ImageType image
                     _logger.ErrorException("Error in image enhancer: {0}", ex, i.GetType().Name);
                 }
             }
-            return list;
+
+            return list == null ? new IImageEnhancer[] { } : list.ToArray();
         }
 
         private Dictionary<string, LockInfo> _locks = new Dictionary<string, LockInfo>();

diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs
@@ -1552,9 +1552,7 @@ protected List<Tuple<Type, string>> GetTypes(Tuple<Assembly, string> assemblyInf
 
         private IEnumerable<string> GetUrlPrefixes()
         {
-            var hosts = new List<string>();
-
-            hosts.Add("+");
+            var hosts = new[] { "+" };
 
             return hosts.SelectMany(i =>
             {

diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -1065,7 +1065,7 @@ private BaseItem GetChannelItemEntity(ChannelItemInfo info, IChannel channelProv
                     _logger.Debug("Forcing update due to TrailerTypes {0}", item.Name);
                     forceUpdate = true;
                 }
-                trailer.TrailerTypes = info.TrailerTypes;
+                trailer.TrailerTypes = info.TrailerTypes.ToArray();
             }
 
             if (info.DateModified > item.DateModified)

diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -920,7 +920,7 @@ private void SaveItem(BaseItem item, BaseItem topParent, string userDataKey, ISt
             }
 
             var trailer = item as Trailer;
-            if (trailer != null && trailer.TrailerTypes.Count > 0)
+            if (trailer != null && trailer.TrailerTypes.Length > 0)
             {
                 saveItemStatement.TryBind("@TrailerTypes", string.Join("|", trailer.TrailerTypes.Select(i => i.ToString()).ToArray()));
             }
@@ -1748,7 +1748,7 @@ private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader, InternalItemsQue
                                 }
                                 return (TrailerType?)null;
 
-                            }).Where(i => i.HasValue).Select(i => i.Value).ToList();
+                            }).Where(i => i.HasValue).Select(i => i.Value).ToArray();
                     }
                 }
                 index++;
@@ -2017,24 +2017,6 @@ private Guid[] SplitToGuids(string value)
             return result;
         }
 
-        /// <summary>
-        /// Gets the critic reviews.
-        /// </summary>
-        /// <param name="itemId">The item id.</param>
-        public List<ItemReview> GetCriticReviews(Guid itemId)
-        {
-            return new List<ItemReview>();
-        }
-
-        /// <summary>
-        /// Saves the critic reviews.
-        /// </summary>
-        /// <param name="itemId">The item id.</param>
-        /// <param name="criticReviews">The critic reviews.</param>
-        public void SaveCriticReviews(Guid itemId, IEnumerable<ItemReview> criticReviews)
-        {
-        }
-
         /// <summary>
         /// Gets chapters for an item
         /// </summary>

diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -437,7 +437,7 @@ public class DevicesConfigStore : IConfigurationFactory
     {
         public IEnumerable<ConfigurationStore> GetConfigurations()
         {
-            return new List<ConfigurationStore>
+            return new ConfigurationStore[]
             {
                 new ConfigurationStore
                 {

diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -267,7 +267,7 @@ private BaseItemDto GetBaseItemDtoInternal(BaseItem item, DtoOptions options, Li
             {
                 if (fields.Contains(ItemFields.MediaSources))
                 {
-                    dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(item, true, user);
+                    dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(item, true, user).ToArray();
 
                     NormalizeMediaSourceContainers(dto);
                 }
@@ -1190,7 +1190,7 @@ private void AttachBasicFields(BaseItemDto dto, BaseItem item, BaseItem owner, D
                 {
                     MediaStream[] mediaStreams;
 
-                    if (dto.MediaSources != null && dto.MediaSources.Count > 0)
+                    if (dto.MediaSources != null && dto.MediaSources.Length > 0)
                     {
                         if (item.SourceType == SourceType.Channel)
                         {
@@ -1515,7 +1515,7 @@ public void AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item)
 
             if (defaultAspectRatio.HasValue)
             {
-                if (supportedEnhancers.Count == 0)
+                if (supportedEnhancers.Length == 0)
                 {
                     return defaultAspectRatio.Value;
                 }

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2596,7 +2596,7 @@ public IEnumerable<Video> FindTrailers(BaseItem owner, List<FileSystemMetadata>
                         // item is new
                         video.ExtraType = ExtraType.Trailer;
                     }
-                    video.TrailerTypes = new List<TrailerType> { TrailerType.LocalTrailer };
+                    video.TrailerTypes = new [] { TrailerType.LocalTrailer };
 
                     return video;