From 04041105d836cd37dc091e1fbe6adeae32eca0b9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 30 Jun 2015 19:59:45 -0400 Subject: add new sharing function --- MediaBrowser.Server.Implementations/Localization/Server/server.json | 3 +++ 1 file changed, 3 insertions(+) (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json') diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index d8628575a..bec5755b9 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -313,6 +313,9 @@ "OptionAllowRemoteControlOthers": "Allow remote control of other users", "OptionAllowRemoteSharedDevices": "Allow remote control of shared devices", "OptionAllowRemoteSharedDevicesHelp": "Dlna devices are considered shared until a user begins controlling it.", + "OptionAllowLinkSharing": "Allow social media sharing", + "OptionAllowLinkSharingHelp": "Only web pages containing media information are shared. Media files are never shared publicly. Shares are time-limited and will expire based on your server sharing settings.", + "HeaderSharing": "Sharing", "HeaderRemoteControl": "Remote Control", "OptionMissingTmdbId": "Missing Tmdb Id", "OptionIsHD": "HD", -- cgit v1.2.3 From 14f05c9bd073b95e3ac817ba282ef4204c001f75 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 3 Jul 2015 13:55:29 -0400 Subject: re-organize user preferences --- .../Localization/Server/server.json | 6 +++++- MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj | 12 ++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json') diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index bec5755b9..55e754085 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1462,5 +1462,9 @@ "LabelUsername": "Username:", "HeaderSignUp": "Sign Up", "LabelPasswordConfirm": "Password (confirm):", - "ButtonAddServer": "Add Server" + "ButtonAddServer": "Add Server", + "TabHomeScreen": "Home Screen", + "HeaderDisplay": "Display", + "HeaderNavigation": "Navigation", + "LegendTheseSettingsShared": "These settings are shared on all devices" } diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 21ca33339..f57b16188 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -178,6 +178,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -187,6 +190,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -662,9 +668,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -929,9 +932,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest -- cgit v1.2.3 From b1be4939dfd35f0bc11097e40bfee536fead8d4f Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 13 Jul 2015 17:26:11 -0400 Subject: update components --- .../Updates/InstallationManager.cs | 2 +- MediaBrowser.Model/Dlna/StreamBuilder.cs | 10 ++++++---- MediaBrowser.Providers/Manager/MetadataService.cs | 3 +-- .../MediaInfo/FFProbeProvider.cs | 2 +- .../Library/LibraryManager.cs | 21 ++++++++++---------- .../Localization/Server/server.json | 3 ++- .../Sync/CloudSyncProfile.cs | 14 +++++++++++++ MediaBrowser.WebDashboard/Api/DashboardService.cs | 8 ++++++-- MediaBrowser.WebDashboard/Api/PackageCreator.cs | 9 ++------- .../MediaBrowser.WebDashboard.csproj | 23 ++++++++++++---------- MediaBrowser.XbmcMetadata/EntryPoint.cs | 6 +++--- 11 files changed, 60 insertions(+), 41 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json') diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs index 264e63b47..23785083b 100644 --- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs +++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs @@ -195,7 +195,7 @@ namespace MediaBrowser.Common.Implementations.Updates cacheLength = TimeSpan.FromMinutes(3); break; default: - cacheLength = TimeSpan.FromHours(3); + cacheLength = TimeSpan.FromHours(24); break; } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 340af3ac1..ab1492391 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -362,8 +362,8 @@ namespace MediaBrowser.Model.Dlna MediaStream videoStream = item.VideoStream; // TODO: This doesn't accout for situation of device being able to handle media bitrate, but wifi connection not fast enough - bool isEligibleForDirectPlay = IsEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options), subtitleStream, options); - bool isEligibleForDirectStream = IsEligibleForDirectPlay(item, options.GetMaxBitrate(), subtitleStream, options); + bool isEligibleForDirectPlay = IsEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options), subtitleStream, options, PlayMethod.DirectPlay); + bool isEligibleForDirectStream = IsEligibleForDirectPlay(item, options.GetMaxBitrate(), subtitleStream, options, PlayMethod.DirectStream); _logger.Debug("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}", options.Profile.Name ?? "Unknown Profile", @@ -706,7 +706,8 @@ namespace MediaBrowser.Model.Dlna private bool IsEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate, MediaStream subtitleStream, - VideoOptions options) + VideoOptions options, + PlayMethod playMethod) { if (subtitleStream != null) { @@ -714,6 +715,7 @@ namespace MediaBrowser.Model.Dlna if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed) { + _logger.Debug("Not eligible for {0} due to unsupported subtitles", playMethod); return false; } } @@ -781,7 +783,7 @@ namespace MediaBrowser.Model.Dlna return true; } - _logger.Debug("Audio Bitrate exceeds DirectPlay limit"); + _logger.Debug("Bitrate exceeds DirectPlay limit"); return false; } diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs index de41a0f96..c3d1ec080 100644 --- a/MediaBrowser.Providers/Manager/MetadataService.cs +++ b/MediaBrowser.Providers/Manager/MetadataService.cs @@ -330,12 +330,11 @@ namespace MediaBrowser.Providers.Manager protected async Task SaveItem(MetadataResult result, ItemUpdateType reason, CancellationToken cancellationToken) { - await result.Item.UpdateToRepository(reason, cancellationToken).ConfigureAwait(false); - if (result.Item.SupportsPeople) { await LibraryManager.UpdatePeople(result.Item as BaseItem, result.People); } + await result.Item.UpdateToRepository(reason, cancellationToken).ConfigureAwait(false); } public bool CanRefresh(IHasMetadata item) diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs index af7fc3df4..c05f1b64b 100644 --- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs +++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs @@ -138,7 +138,7 @@ namespace MediaBrowser.Providers.MediaInfo if (item.IsShortcut) { FetchShortcutInfo(item); - return Task.FromResult(ItemUpdateType.MetadataEdit); + return Task.FromResult(ItemUpdateType.MetadataImport); } var prober = new FFProbeVideoInfo(_logger, _isoManager, _mediaEncoder, _itemRepo, _blurayExaminer, _localization, _appPaths, _json, _encodingManager, _fileSystem, _config, _subtitleManager, _chapterManager, _libraryManager); diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs index c3793b3a3..bdc94b88b 100644 --- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs +++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs @@ -345,7 +345,7 @@ namespace MediaBrowser.Server.Implementations.Library try { - await UpdateItem(season, ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false); + await UpdateItem(season, ItemUpdateType.MetadataDownload, cancellationToken).ConfigureAwait(false); } catch (Exception ex) { @@ -2071,10 +2071,17 @@ namespace MediaBrowser.Server.Implementations.Library public List GetPeople(BaseItem item) { - return item.People ?? GetPeople(new InternalPeopleQuery + var people = GetPeople(new InternalPeopleQuery { ItemId = item.Id }); + + if (people.Count > 0) + { + return people; + } + + return item.People ?? new List(); } public List GetPeopleItems(InternalPeopleQuery query) @@ -2106,15 +2113,9 @@ namespace MediaBrowser.Server.Implementations.Library .ToList(); } - public async Task UpdatePeople(BaseItem item, List people) + public Task UpdatePeople(BaseItem item, List people) { - await ItemRepository.UpdatePeople(item.Id, people).ConfigureAwait(false); - - if (item.People != null) - { - item.People = null; - await item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false); - } + return ItemRepository.UpdatePeople(item.Id, people); } } } diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 55e754085..aa9fafb1b 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1466,5 +1466,6 @@ "TabHomeScreen": "Home Screen", "HeaderDisplay": "Display", "HeaderNavigation": "Navigation", - "LegendTheseSettingsShared": "These settings are shared on all devices" + "LegendTheseSettingsShared": "These settings are shared on all devices", + "OptionEnableAutomaticServerUpdates": "Enable automatic server updates" } diff --git a/MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs b/MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs index 6272fe926..175dbbc01 100644 --- a/MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs +++ b/MediaBrowser.Server.Implementations/Sync/CloudSyncProfile.cs @@ -209,6 +209,13 @@ namespace MediaBrowser.Server.Implementations.Sync IsRequired = false }, new ProfileCondition + { + Condition = ProfileConditionType.LessThanEqual, + Property = ProfileConditionValue.AudioBitrate, + Value = "320000", + IsRequired = true + }, + new ProfileCondition { Condition = ProfileConditionType.Equals, Property = ProfileConditionValue.IsSecondaryAudio, @@ -231,6 +238,13 @@ namespace MediaBrowser.Server.Implementations.Sync IsRequired = true }, new ProfileCondition + { + Condition = ProfileConditionType.LessThanEqual, + Property = ProfileConditionValue.AudioBitrate, + Value = "320000", + IsRequired = true + }, + new ProfileCondition { Condition = ProfileConditionType.Equals, Property = ProfileConditionValue.IsSecondaryAudio, diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 6eed91b6c..2346e15d3 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -1,5 +1,4 @@ -using System.Text; -using MediaBrowser.Common.Extensions; +using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; @@ -16,6 +15,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; +using System.Text; using System.Threading.Tasks; using WebMarkupMin.Core.Minifiers; @@ -324,6 +324,10 @@ namespace MediaBrowser.WebDashboard.Api CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "webcomponentsjs", "webcomponents-lite.js"), Path.Combine(path, "bower_components", "webcomponentsjs", "webcomponents-lite.js")); CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "webcomponentsjs", "webcomponents-lite.min.js"), Path.Combine(path, "bower_components", "webcomponentsjs", "webcomponents-lite.min.js")); CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "velocity", "velocity.min.js"), Path.Combine(path, "bower_components", "velocity", "velocity.min.js")); + CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "requirejs", "require.js"), Path.Combine(path, "bower_components", "requirejs", "require.js")); + CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "fastclick", "lib", "fastclick.js"), Path.Combine(path, "bower_components", "fastclick", "lib", "fastclick.js")); + CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "jquery", "dist", "jquery.min.js"), Path.Combine(path, "bower_components", "jquery", "dist", "jquery.min.js")); + CopyDirectory(Path.Combine(creator.DashboardUIPath, "bower_components", "swipebox", "src", "css"), Path.Combine(path, "bower_components", "swipebox", "src", "css")); CopyDirectory(Path.Combine(creator.DashboardUIPath, "bower_components", "swipebox", "src", "js"), Path.Combine(path, "bower_components", "swipebox", "src", "js")); CopyDirectory(Path.Combine(creator.DashboardUIPath, "bower_components", "swipebox", "src", "img"), Path.Combine(path, "bower_components", "swipebox", "src", "img")); diff --git a/MediaBrowser.WebDashboard/Api/PackageCreator.cs b/MediaBrowser.WebDashboard/Api/PackageCreator.cs index 6cc838ac4..f50147552 100644 --- a/MediaBrowser.WebDashboard/Api/PackageCreator.cs +++ b/MediaBrowser.WebDashboard/Api/PackageCreator.cs @@ -443,11 +443,6 @@ namespace MediaBrowser.WebDashboard.Api "bower_components/webcomponentsjs/webcomponents-lite.js" + versionString }; - if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) - { - files.Insert(0, "cordova.js"); - } - var tags = files.Select(s => string.Format("", s)).ToArray(); builder.Append(string.Join(string.Empty, tags)); @@ -493,9 +488,9 @@ namespace MediaBrowser.WebDashboard.Api var memoryStream = new MemoryStream(); var newLineBytes = Encoding.UTF8.GetBytes(Environment.NewLine); - await AppendResource(memoryStream, "thirdparty/jquery-2.1.1.min.js", newLineBytes).ConfigureAwait(false); + await AppendResource(memoryStream, "bower_components/jquery/dist/jquery.min.js", newLineBytes).ConfigureAwait(false); - await AppendResource(memoryStream, "thirdparty/require.js", newLineBytes).ConfigureAwait(false); + await AppendResource(memoryStream, "bower_components/requirejs/require.js", newLineBytes).ConfigureAwait(false); await AppendResource(memoryStream, "thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.min.js", newLineBytes).ConfigureAwait(false); diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 09d4766e9..18d379ca4 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -87,6 +87,15 @@ + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -258,7 +267,7 @@ PreserveNewest - + PreserveNewest @@ -297,6 +306,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -1099,9 +1111,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -1117,9 +1126,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest @@ -1753,9 +1759,6 @@ PreserveNewest - - PreserveNewest - PreserveNewest diff --git a/MediaBrowser.XbmcMetadata/EntryPoint.cs b/MediaBrowser.XbmcMetadata/EntryPoint.cs index c3bc6e30f..1c68a5046 100644 --- a/MediaBrowser.XbmcMetadata/EntryPoint.cs +++ b/MediaBrowser.XbmcMetadata/EntryPoint.cs @@ -36,7 +36,7 @@ namespace MediaBrowser.XbmcMetadata void _libraryManager_ItemUpdated(object sender, ItemChangeEventArgs e) { - if (e.UpdateReason == ItemUpdateType.ImageUpdate) + if (e.UpdateReason >= ItemUpdateType.ImageUpdate) { var person = e.Item as Person; @@ -57,7 +57,7 @@ namespace MediaBrowser.XbmcMetadata foreach (var item in items) { - SaveMetadataForItem(item, ItemUpdateType.MetadataEdit); + SaveMetadataForItem(item, e.UpdateReason); } } } @@ -71,7 +71,7 @@ namespace MediaBrowser.XbmcMetadata if (!string.IsNullOrWhiteSpace(_config.GetNfoConfiguration().UserId)) { - SaveMetadataForItem(item, ItemUpdateType.MetadataEdit); + SaveMetadataForItem(item, ItemUpdateType.MetadataDownload); } } } -- cgit v1.2.3 From 7736bab31400073daa64df3d4b283c26fcb9ee3e Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 14 Jul 2015 12:39:34 -0400 Subject: update selection buttons --- MediaBrowser.Api/ApiEntryPoint.cs | 2 +- MediaBrowser.Model/Dlna/StreamBuilder.cs | 25 ++++++++++++++++++---- MediaBrowser.Model/Dlna/StreamInfo.cs | 2 +- .../EntryPoints/Notifications/Notifications.cs | 10 ++++++++- .../Library/Resolvers/BaseVideoResolver.cs | 5 +---- .../Localization/Server/server.json | 3 ++- 6 files changed, 35 insertions(+), 12 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json') diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index 68087309b..54c28d390 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -340,7 +340,7 @@ namespace MediaBrowser.Api // We can really reduce the timeout for apps that are using the newer api if (!string.IsNullOrWhiteSpace(job.PlaySessionId)) { - timerDuration = 120000; + timerDuration = 300000; } } diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index ab1492391..d1abda17e 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -383,7 +383,7 @@ namespace MediaBrowser.Model.Dlna if (subtitleStream != null) { - SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options.Profile.SubtitleProfiles, options.Context); + SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options.Profile.SubtitleProfiles, options.Context, directPlay.Value); playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method; playlistItem.SubtitleFormat = subtitleProfile.Format; @@ -413,7 +413,7 @@ namespace MediaBrowser.Model.Dlna if (subtitleStream != null) { - SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options.Profile.SubtitleProfiles, options.Context); + SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options.Profile.SubtitleProfiles, options.Context, PlayMethod.Transcode); playlistItem.SubtitleDeliveryMethod = subtitleProfile.Method; playlistItem.SubtitleFormat = subtitleProfile.Format; @@ -711,7 +711,7 @@ namespace MediaBrowser.Model.Dlna { if (subtitleStream != null) { - SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options.Profile.SubtitleProfiles, options.Context); + SubtitleProfile subtitleProfile = GetSubtitleProfile(subtitleStream, options.Profile.SubtitleProfiles, options.Context, playMethod); if (subtitleProfile.Method != SubtitleDeliveryMethod.External && subtitleProfile.Method != SubtitleDeliveryMethod.Embed) { @@ -723,8 +723,25 @@ namespace MediaBrowser.Model.Dlna return IsAudioEligibleForDirectPlay(item, maxBitrate); } - public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, EncodingContext context) + public static SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, SubtitleProfile[] subtitleProfiles, EncodingContext context, PlayMethod playMethod) { + if (playMethod != PlayMethod.Transcode) + { + // Look for supported embedded subs + foreach (SubtitleProfile profile in subtitleProfiles) + { + if (!profile.SupportsLanguage(subtitleStream.Language)) + { + continue; + } + + if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) + { + return profile; + } + } + } + // Look for an external profile that matches the stream type (text/graphical) foreach (SubtitleProfile profile in subtitleProfiles) { diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index 92eb0372c..8f7412097 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -329,7 +329,7 @@ namespace MediaBrowser.Model.Dlna private SubtitleStreamInfo GetSubtitleStreamInfo(MediaStream stream, string baseUrl, string accessToken, long startPositionTicks, SubtitleProfile[] subtitleProfiles) { - SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(stream, subtitleProfiles, Context); + SubtitleProfile subtitleProfile = StreamBuilder.GetSubtitleProfile(stream, subtitleProfiles, Context, PlayMethod); SubtitleStreamInfo info = new SubtitleStreamInfo { IsForced = stream.IsForced, diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs index 2fc249744..8d21d9a77 100644 --- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs +++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs @@ -256,7 +256,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications NotificationType = type }; - notification.Variables["ItemName"] = item.Name; + if (e.Item != null) + { + notification.Variables["ItemName"] = GetItemName(e.Item); + } + else + { + notification.Variables["ItemName"] = item.Name; + } + notification.Variables["UserName"] = user == null ? "Unknown user" : user.Name; notification.Variables["AppName"] = e.ClientName; notification.Variables["DeviceName"] = e.DeviceName; diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs index 3333719b7..343b6d3a4 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/BaseVideoResolver.cs @@ -1,13 +1,10 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; -using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; -using MediaBrowser.Naming.Common; using MediaBrowser.Naming.Video; +using MediaBrowser.Server.Implementations.Logging; using System; using System.IO; -using System.Linq; -using MediaBrowser.Server.Implementations.Logging; namespace MediaBrowser.Server.Implementations.Library.Resolvers { diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index aa9fafb1b..8c21f47c3 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -1467,5 +1467,6 @@ "HeaderDisplay": "Display", "HeaderNavigation": "Navigation", "LegendTheseSettingsShared": "These settings are shared on all devices", - "OptionEnableAutomaticServerUpdates": "Enable automatic server updates" + "OptionEnableAutomaticServerUpdates": "Enable automatic server updates", + "OptionOtherTrailers": "Include trailers from older movies" } -- cgit v1.2.3 From c6a64efab781269f9dc512282f27f2a2d3fdb1f2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 16 Jul 2015 08:56:38 -0400 Subject: 3.0.5675.1 --- MediaBrowser.Providers/Movies/MovieDbImageProvider.cs | 18 ++++++++++++++++-- .../Localization/Server/server.json | 2 +- MediaBrowser.WebDashboard/Api/DashboardService.cs | 1 + SharedVersion.cs | 2 +- 4 files changed, 19 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Server.Implementations/Localization/Server/server.json') diff --git a/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs b/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs index 192addfb8..9bf0b3722 100644 --- a/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbImageProvider.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.Net; +using System.Globalization; +using MediaBrowser.Common.Net; using MediaBrowser.Controller.Channels; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; @@ -191,7 +192,20 @@ namespace MediaBrowser.Providers.Movies var tmdbId = item.GetProviderId(MetadataProviders.Tmdb); var language = item.GetPreferredMetadataLanguage(); - if (string.IsNullOrEmpty(tmdbId)) + if (string.IsNullOrWhiteSpace(tmdbId)) + { + var imdbId = item.GetProviderId(MetadataProviders.Imdb); + if (!string.IsNullOrWhiteSpace(imdbId)) + { + var movieInfo = await MovieDbProvider.Current.FetchMainResult(imdbId, false, language, cancellationToken).ConfigureAwait(false); + if (movieInfo != null) + { + tmdbId = movieInfo.id.ToString(CultureInfo.InvariantCulture); + } + } + } + + if (string.IsNullOrWhiteSpace(tmdbId)) { return null; } diff --git a/MediaBrowser.Server.Implementations/Localization/Server/server.json b/MediaBrowser.Server.Implementations/Localization/Server/server.json index 8c21f47c3..138c87712 100644 --- a/MediaBrowser.Server.Implementations/Localization/Server/server.json +++ b/MediaBrowser.Server.Implementations/Localization/Server/server.json @@ -86,7 +86,7 @@ "OptionDetectArchiveFilesAsMedia": "Detect archive files as media", "OptionDetectArchiveFilesAsMediaHelp": "If enabled, files with .rar and .zip extensions will be detected as media files.", "LabelEnterConnectUserName": "Username or email:", - "LabelEnterConnectUserNameHelp": "This is your Emby online account username or password.", + "LabelEnterConnectUserNameHelp": "This is your Emby online account username or email.", "LabelEnableEnhancedMovies": "Enable enhanced movie displays", "LabelEnableEnhancedMoviesHelp": "When enabled, movies will be displayed as folders to include trailers, extras, cast & crew, and other related content.", "HeaderSyncJobInfo": "Sync Job", diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs index 7747a1569..d6adfc68e 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardService.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs @@ -317,6 +317,7 @@ namespace MediaBrowser.WebDashboard.Api File.Delete(Path.Combine(path, "thirdparty", "jquerymobile-1.4.5", "jquery.mobile-1.4.5.min.map")); + Directory.Delete(Path.Combine(path, "bower_components"), true); Directory.Delete(Path.Combine(path, "thirdparty", "viblast"), true); // But we do need this diff --git a/SharedVersion.cs b/SharedVersion.cs index f77f32df3..bcd792885 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5675.0")] +[assembly: AssemblyVersion("3.0.5675.1")] -- cgit v1.2.3