Merge pull request #2962 from MediaBrowser/dev

Dev

Emby.Dlna/Didl/DidlBuilder.cs

@@ -1071,8 +1071,10 @@ namespace Emby.Dlna.Didl
 
             writer.WriteStartElement(string.Empty, "res", NS_DIDL);
 
-            var width = albumartUrlInfo.Width;
+            // Images must have a reported size or many clients (Bubble upnp), will only use the first thumbnail
-            var height = albumartUrlInfo.Height;
+            // rather than using a larger one when available
+            var width = albumartUrlInfo.Width ?? maxWidth;
+            var height = albumartUrlInfo.Height ?? maxHeight;
 
             var contentFeatures = new ContentFeatureBuilder(_profile)
                 .BuildImageHeader(format, width, height, imageInfo.IsDirectStream, org_Pn);
@@ -1083,10 +1085,7 @@ namespace Emby.Dlna.Didl
                 contentFeatures
                 ));
 
-            if (width.HasValue && height.HasValue)
+            writer.WriteAttributeString("resolution", string.Format("{0}x{1}", width, height));
-            {
-                writer.WriteAttributeString("resolution", string.Format("{0}x{1}", width.Value, height.Value));
-            }
 
             writer.WriteString(albumartUrlInfo.Url);
 

Emby.Server.Implementations/ApplicationHost.cs

@@ -775,7 +775,14 @@ namespace Emby.Server.Implementations
             }
 
             // Put the app config in the log for troubleshooting purposes
-            Logger.LogMultiline("Application configuration:", LogSeverity.Info, new StringBuilder(JsonSerializer.SerializeToString(ConfigurationManager.CommonConfiguration)));
+            var configJson = new StringBuilder(JsonSerializer.SerializeToString(ConfigurationManager.CommonConfiguration));
+
+            if (!string.IsNullOrWhiteSpace(ServerConfigurationManager.Configuration.CertificatePassword))
+            {
+                configJson = configJson.Replace(ServerConfigurationManager.Configuration.CertificatePassword, "####");
+            }
+
+            Logger.LogMultiline("Application configuration:", LogSeverity.Info, configJson);
 
             if (Plugins != null)
             {

Emby.Server.Implementations/HttpServer/Security/AuthorizationContext.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using MediaBrowser.Model.Services;
 using System.Linq;
+using System.Threading;
 
 namespace Emby.Server.Implementations.HttpServer.Security
 {
@@ -95,23 +96,44 @@ namespace Emby.Server.Implementations.HttpServer.Security
                 {
                     info.UserId = tokenInfo.UserId;
 
+                    var updateToken = false;
+
                     // TODO: Remove these checks for IsNullOrWhiteSpace
                     if (string.IsNullOrWhiteSpace(info.Client))
                     {
                         info.Client = tokenInfo.AppName;
                     }
-                    if (string.IsNullOrWhiteSpace(info.Device))
+
-                    {
-                        info.Device = tokenInfo.DeviceName;
-                    }
                     if (string.IsNullOrWhiteSpace(info.DeviceId))
                     {
                         info.DeviceId = tokenInfo.DeviceId;
                     }
+
+
+                    if (string.IsNullOrWhiteSpace(info.Device))
+                    {
+                        info.Device = tokenInfo.DeviceName;
+                    }
+                    else if (!string.Equals(info.Device, tokenInfo.DeviceName, StringComparison.OrdinalIgnoreCase))
+                    {
+                        updateToken = true;
+                        tokenInfo.DeviceName = info.Device;
+                    }
+
                     if (string.IsNullOrWhiteSpace(info.Version))
                     {
                         info.Version = tokenInfo.AppVersion;
                     }
+                    else if (!string.Equals(info.Version, tokenInfo.AppVersion, StringComparison.OrdinalIgnoreCase))
+                    {
+                        updateToken = true;
+                        tokenInfo.AppVersion = info.Version;
+                    }
+
+                    if (updateToken)
+                    {
+                        _authRepo.Update(tokenInfo, CancellationToken.None);
+                    }
                 }
                 else
                 {

Emby.Server.Implementations/HttpServer/Security/SessionContext.cs

@@ -25,15 +25,6 @@ namespace Emby.Server.Implementations.HttpServer.Security
         {
             var authorization = _authContext.GetAuthorizationInfo(requestContext);
 
-            //if (!string.IsNullOrWhiteSpace(authorization.Token))
-            //{
-            //    var auth = GetTokenInfo(requestContext);
-            //    if (auth != null)
-            //    {
-            //        return _sessionManager.GetSessionByAuthenticationToken(auth, authorization.DeviceId, requestContext.RemoteIp, authorization.Version);
-            //    }
-            //}
-
             var user = string.IsNullOrWhiteSpace(authorization.UserId) ? null : _userManager.GetUserById(authorization.UserId);
             return _sessionManager.LogSessionActivity(authorization.Client, authorization.Version, authorization.DeviceId, authorization.Device, requestContext.RemoteIp, user);
         }

Emby.Server.Implementations/Library/UserViewManager.cs

@@ -96,7 +96,7 @@ namespace Emby.Server.Implementations.Library
                 if (parents.Count > 0)
                 {
                     var localizationKey = string.Equals(viewType, CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) ?
-                        "Shows" :
+                        "TvShows" :
                         "Movies";
 
                     list.Add(GetUserView(parents, viewType, localizationKey, string.Empty, user, query.PresetViews, cancellationToken));

Emby.Server.Implementations/Localization/Core/ar.json

@@ -27,6 +27,7 @@
     "Artists": "\u0627\u0644\u0641\u0646\u0627\u0646\u0648\u0646",
     "Folders": "\u0627\u0644\u0645\u062c\u0644\u062f\u0627\u062a",
     "Songs": "\u0627\u0644\u0623\u063a\u0627\u0646\u064a",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "\u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0623\u0641\u0644\u0627\u0645",
     "NameSeasonNumber": "\u0627\u0644\u0645\u0648\u0633\u0645 {0}",

Emby.Server.Implementations/Localization/Core/bg-BG.json

@@ -27,6 +27,7 @@
     "Artists": "\u0418\u0437\u043f\u044a\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
     "Folders": "\u041f\u0430\u043f\u043a\u0438",
     "Songs": "\u041f\u0435\u0441\u043d\u0438",
+    "TvShows": "TV Shows",
     "Shows": "\u0421\u0435\u0440\u0438\u0430\u043b\u0438",
     "Genres": "\u0416\u0430\u043d\u0440\u043e\u0432\u0435",
     "NameSeasonNumber": "\u0421\u0435\u0437\u043e\u043d {0}",

Emby.Server.Implementations/Localization/Core/ca.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "G\u00e8neres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/cs.json

@@ -27,6 +27,7 @@
     "Artists": "Um\u011blci",
     "Folders": "Slo\u017eky",
     "Songs": "Skladby",
+    "TvShows": "TV Shows",
     "Shows": "Seri\u00e1ly",
     "Genres": "\u017d\u00e1nry",
     "NameSeasonNumber": "Sez\u00f3na {0}",

Emby.Server.Implementations/Localization/Core/da.json

@@ -27,6 +27,7 @@
     "Artists": "Kunstner",
     "Folders": "Mapper",
     "Songs": "Sange",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "Genre",
     "NameSeasonNumber": "S\u00e6son {0}",

Emby.Server.Implementations/Localization/Core/de.json

@@ -27,6 +27,7 @@
     "Artists": "Interpreten",
     "Folders": "Verzeichnisse",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Serien",
     "Genres": "Genres",
     "NameSeasonNumber": "Staffel {0}",

Emby.Server.Implementations/Localization/Core/en-GB.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/en-US.json

@@ -27,6 +27,7 @@
   "Artists": "Artists",
   "Folders": "Folders",
   "Songs": "Songs",
+  "TvShows": "TV Shows",
   "Shows": "Shows",
   "Genres": "Genres",
   "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/es-AR.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Series",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/es-MX.json

@@ -27,6 +27,7 @@
     "Artists": "Artistas",
     "Folders": "Carpetas",
     "Songs": "Canciones",
+    "TvShows": "TV Shows",
     "Shows": "Programas",
     "Genres": "G\u00e9neros",
     "NameSeasonNumber": "Temporada {0}",

Emby.Server.Implementations/Localization/Core/es.json

@@ -27,6 +27,7 @@
     "Artists": "Artistas",
     "Folders": "Carpetas",
     "Songs": "Canciones",
+    "TvShows": "TV Shows",
     "Shows": "Series",
     "Genres": "G\u00e9neros",
     "NameSeasonNumber": "Temporada {0}",

Emby.Server.Implementations/Localization/Core/fr-CA.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Series",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/fr.json

@@ -27,6 +27,7 @@
     "Artists": "Artistes",
     "Folders": "Dossiers",
     "Songs": "Chansons",
+    "TvShows": "TV Shows",
     "Shows": "\u00c9missions",
     "Genres": "Genres",
     "NameSeasonNumber": "Saison {0}",

Emby.Server.Implementations/Localization/Core/he.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "\u05d6'\u05d0\u05e0\u05e8\u05d9\u05dd",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/hr.json

@@ -27,6 +27,7 @@
     "Artists": "Izvo\u0111a\u010di",
     "Folders": "Mape",
     "Songs": "Pjesme",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "\u017danrovi",
     "NameSeasonNumber": "Sezona {0}",

Emby.Server.Implementations/Localization/Core/hu.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "M\u0171fajok",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/it.json

@@ -27,6 +27,7 @@
     "Artists": "Artisti",
     "Folders": "Cartelle",
     "Songs": "Canzoni",
+    "TvShows": "TV Shows",
     "Shows": "Programmi",
     "Genres": "Generi",
     "NameSeasonNumber": "Stagione {0}",

Emby.Server.Implementations/Localization/Core/kk.json

@@ -27,6 +27,7 @@
     "Artists": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u043b\u0430\u0440",
     "Folders": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
     "Songs": "\u04d8\u0443\u0435\u043d\u0434\u0435\u0440",
+    "TvShows": "TV Shows",
     "Shows": "\u041a\u04e9\u0440\u0441\u0435\u0442\u0456\u043c\u0434\u0435\u0440",
     "Genres": "\u0416\u0430\u043d\u0440\u043b\u0430\u0440",
     "NameSeasonNumber": "{0}-\u043c\u0430\u0443\u0441\u044b\u043c",

Emby.Server.Implementations/Localization/Core/ko.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/lt-LT.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "\u017danrai",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/ms.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Series",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/nb.json

@@ -27,6 +27,7 @@
     "Artists": "Artister",
     "Folders": "Mapper",
     "Songs": "Sanger",
+    "TvShows": "TV Shows",
     "Shows": "Programmer",
     "Genres": "Sjanger",
     "NameSeasonNumber": "Sesong {0}",

Emby.Server.Implementations/Localization/Core/nl.json

@@ -27,6 +27,7 @@
     "Artists": "Artiesten",
     "Folders": "Mappen",
     "Songs": "Titels",
+    "TvShows": "TV Shows",
     "Shows": "Series",
     "Genres": "Genres",
     "NameSeasonNumber": "Seizoen {0}",

Emby.Server.Implementations/Localization/Core/pl.json

@@ -27,6 +27,7 @@
     "Artists": "Wykonawcy",
     "Folders": "Foldery",
     "Songs": "Utwory",
+    "TvShows": "TV Shows",
     "Shows": "Seriale",
     "Genres": "Gatunki",
     "NameSeasonNumber": "Sezon {0}",

Emby.Server.Implementations/Localization/Core/pt-BR.json

@@ -27,6 +27,7 @@
     "Artists": "Artistas",
     "Folders": "Pastas",
     "Songs": "M\u00fasicas",
+    "TvShows": "TV Shows",
     "Shows": "S\u00e9ries",
     "Genres": "G\u00eaneros",
     "NameSeasonNumber": "Temporada {0}",

Emby.Server.Implementations/Localization/Core/pt-PT.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/ru.json

@@ -27,6 +27,7 @@
     "Artists": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u0438",
     "Folders": "\u041f\u0430\u043f\u043a\u0438",
     "Songs": "\u041a\u043e\u043c\u043f\u043e\u0437\u0438\u0446\u0438\u0438",
+    "TvShows": "TV Shows",
     "Shows": "\u041f\u0435\u0440\u0435\u0434\u0430\u0447\u0438",
     "Genres": "\u0416\u0430\u043d\u0440\u044b",
     "NameSeasonNumber": "\u0421\u0435\u0437\u043e\u043d {0}",

Emby.Server.Implementations/Localization/Core/sk.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Series",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/sl-SI.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Serije",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/sv.json

@@ -27,6 +27,7 @@
     "Artists": "Artister",
     "Folders": "Mappar",
     "Songs": "L\u00e5tar",
+    "TvShows": "TV Shows",
     "Shows": "Serier",
     "Genres": "Genrer",
     "NameSeasonNumber": "S\u00e4song {0}",

Emby.Server.Implementations/Localization/Core/tr.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

Emby.Server.Implementations/Localization/Core/zh-CN.json

@@ -27,6 +27,7 @@
     "Artists": "\u827a\u672f\u5bb6",
     "Folders": "\u6587\u4ef6\u5939",
     "Songs": "\u6b4c\u66f2",
+    "TvShows": "TV Shows",
     "Shows": "\u8282\u76ee",
     "Genres": "\u98ce\u683c",
     "NameSeasonNumber": "\u5b63 {0}",

Emby.Server.Implementations/Localization/Core/zh-HK.json

@@ -27,6 +27,7 @@
     "Artists": "Artists",
     "Folders": "Folders",
     "Songs": "Songs",
+    "TvShows": "TV Shows",
     "Shows": "Shows",
     "Genres": "Genres",
     "NameSeasonNumber": "Season {0}",

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.33.11")]
+[assembly: AssemblyVersion("3.2.33.12")]

SocketHttpListener/Net/HttpConnection.cs

@@ -528,8 +528,14 @@ namespace SocketHttpListener.Net
                 finally
                 {
                     if (s != null)
+                    {
+                        try
+                        {
                             s.Close();
                         }
+                        catch { }
+                    }
+                }
                 Unbind();
                 RemoveConnection();
                 return;