Merge pull request #3128 from MediaBrowser/dev

Dev
MediaBrowser · Jan 17, 2018 · 193cc39 · 193cc39
2 parents 0df3223 + b612f22
commit 193cc39
Show file tree

Hide file tree

Showing 41 changed files with 245 additions and 229 deletions.
diff --git a/Emby.Server.Implementations/Localization/Core/pl.json b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -53,7 +53,7 @@
     "UserCreatedWithName": "U\u017cytkownik {0} zosta\u0142 utworzony",
     "UserPasswordChangedWithName": "Has\u0142o u\u017cytkownika {0} zosta\u0142o zmienione",
     "UserDeletedWithName": "U\u017cytkownik {0} zosta\u0142 usuni\u0119ty",
-    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserPolicyUpdatedWithName": "Zmieniono zasady u\u017cytkowania dla {0}",
     "MessageServerConfigurationUpdated": "Konfiguracja serwera zosta\u0142a zaktualizowana",
     "MessageNamedServerConfigurationUpdatedWithValue": "Sekcja {0} konfiguracji serwera zosta\u0142a zaktualizowana",
     "MessageApplicationUpdated": "Serwer Emby zosta\u0142 zaktualizowany",

diff --git a/Emby.Server.Implementations/Localization/Core/zh-CN.json b/Emby.Server.Implementations/Localization/Core/zh-CN.json
@@ -27,7 +27,7 @@
     "Artists": "\u827a\u672f\u5bb6",
     "Folders": "\u6587\u4ef6\u5939",
     "Songs": "\u6b4c\u66f2",
-    "TvShows": "TV Shows",
+    "TvShows": "\u7535\u89c6\u8282\u76ee",
     "Shows": "\u8282\u76ee",
     "Genres": "\u98ce\u683c",
     "NameSeasonNumber": "\u5b63 {0}",
@@ -53,7 +53,7 @@
     "UserCreatedWithName": "\u7528\u6237 {0} \u5df2\u521b\u5efa",
     "UserPasswordChangedWithName": "\u5df2\u4e3a\u7528\u6237 {0} \u66f4\u6539\u5bc6\u7801",
     "UserDeletedWithName": "\u7528\u6237 {0} \u5df2\u5220\u9664",
-    "UserPolicyUpdatedWithName": "User policy has been updated for {0}",
+    "UserPolicyUpdatedWithName": "\u7528\u6237\u534f\u8bae\u5df2\u7ecf\u88ab\u66f4\u65b0\u4e3a {0}",
     "MessageServerConfigurationUpdated": "\u670d\u52a1\u5668\u914d\u7f6e\u5df2\u66f4\u65b0",
     "MessageNamedServerConfigurationUpdatedWithValue": "\u670d\u52a1\u5668\u914d\u7f6e {0} \u90e8\u5206\u5df2\u66f4\u65b0",
     "MessageApplicationUpdated": "Emby \u670d\u52a1\u5668\u5df2\u66f4\u65b0",

diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
+using System;
 
 namespace MediaBrowser.Model.Dto
 {
@@ -47,6 +48,8 @@ public class MediaSourceInfo
 
         public bool RequiresLooping { get; set; }
 
+        public bool SupportsProbing { get; set; }
+
         public VideoType? VideoType { get; set; }
 
         public IsoType? IsoType { get; set; }
@@ -76,6 +79,7 @@ public MediaSourceInfo()
             SupportsTranscoding = true;
             SupportsDirectStream = true;
             SupportsDirectPlay = true;
+            SupportsProbing = true;
         }
 
         public void InferTotalBitrate(bool force = false)

diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -41,6 +41,19 @@ protected MetadataService(IServerConfigurationManager serverConfigurationManager
             _subtitleResolver = new SubtitleResolver(BaseItem.LocalizationManager, fileSystem);
         }
 
+        private FileSystemMetadata TryGetFile(string path, IDirectoryService directoryService)
+        {
+            try
+            {
+                return directoryService.GetFile(path);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error getting file {0}", ex, path);
+                return null;
+            }
+        }
+
         public async Task<ItemUpdateType> RefreshMetadata(BaseItem item, MetadataRefreshOptions refreshOptions, CancellationToken cancellationToken)
         {
             var itemOfType = (TItemType)item;
@@ -59,7 +72,7 @@ public async Task<ItemUpdateType> RefreshMetadata(BaseItem item, MetadataRefresh
             DateTime? newDateModified = null;
             if (item.LocationType == LocationType.FileSystem)
             {
-                var file = refreshOptions.DirectoryService.GetFile(item.Path);
+                var file = TryGetFile(item.Path, refreshOptions.DirectoryService);
                 if (file != null)
                 {
                     newDateModified = file.LastWriteTimeUtc;

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/addplugin.html b/MediaBrowser.WebDashboard/dashboard-ui/addplugin.html
@@ -34,8 +34,6 @@ <h1>${HeaderInstall}</h1>
                                 <form name="_xclick" action="https://www.paypal.com/cgi-bin/webscr" method="post">
                                     <p id="regStatus">
                                     </p>
-                                    <p id="regInfo">
-                                    </p>
                                     <div class="supporterDescription">
 
                                         <p>${MessagePluginRequiresSubscription}</p>

diff --git a/....WebDashboard/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/....WebDashboard/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js
diff --git a/...shboard/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js b/...shboard/dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.js
diff --git a/...ashboard/dashboard-ui/bower_components/emby-webcomponents/playback/playbackorientation.js b/...ashboard/dashboard-ui/bower_components/emby-webcomponents/playback/playbackorientation.js
diff --git a/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/bg-bg.json b/...aBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/bg-bg.json
@@ -1,12 +1,12 @@
 {
-    "HeaderFavoritePlaylists": "Favorite Playlists",
+    "HeaderFavoritePlaylists": "\u041b\u044e\u0431\u0438\u043c\u0438 \u0441\u043f\u0438\u0441\u044a\u0446\u0438",
     "MessageUnlockAppWithPurchaseOrSupporter": "Unlock this feature with a small one-time purchase, or with an active Emby Premiere subscription.",
     "MessageUnlockAppWithSupporter": "Unlock this feature with an active Emby Premiere subscription.",
     "MessageToValidateSupporter": "If you have an active Emby Premiere subscription, ensure you've setup Emby Premiere in your Emby Server Dashboard, which you can access by clicking Emby Premiere within the main menu.",
     "ValueSpecialEpisodeName": "Special - {0}",
     "Share": "\u0421\u043f\u043e\u0434\u0435\u043b\u044f\u043d\u0435",
     "Add": "\u0414\u043e\u0431\u0430\u0432\u044f\u043d\u0435",
-    "ServerUpdateNeeded": "This Emby Server needs to be updated. To download the latest version, please visit {0}",
+    "ServerUpdateNeeded": "\u0421\u044a\u0440\u0432\u044a\u0440\u044a\u0442 \u0442\u0440\u044f\u0431\u0432\u0430 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043e\u0431\u043d\u043e\u0432\u0435\u043d. \u041c\u043e\u043b\u044f, \u043f\u043e\u0441\u0435\u0442\u0435\u0442\u0435 {0}, \u0437\u0430 \u0434\u0430 \u0441\u0432\u0430\u043b\u0438\u0442\u0435 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u0432\u0435\u0440\u0441\u0438\u044f.",
     "LiveTvRequiresUnlock": "\u0422\u0435\u043b\u0435\u0432\u0438\u0437\u0438\u044f\u0442\u0430 \u043d\u0430 \u0436\u0438\u0432\u043e \u0438\u0437\u0438\u0441\u043a\u0432\u0430 \u0430\u043a\u0442\u0438\u0432\u0435\u043d \u0430\u0431\u043e\u043d\u0430\u043c\u0435\u043d\u0442 \u0437\u0430 \u043f\u0440\u0435\u043c\u0438\u0435\u0440\u043d\u043e\u0442\u043e \u0438\u0437\u0434\u0430\u043d\u0438\u0435.",
     "AttributeNew": "New",
     "Premiere": "\u041f\u0440\u0435\u043c\u0438\u0435\u0440\u0430",
@@ -149,7 +149,7 @@
     "PlayFromBeginning": "Play from beginning",
     "ResumeAt": "\u041f\u0440\u043e\u0434\u044a\u043b\u0436\u0430\u0432\u0430\u043d\u0435 \u043e\u0442 {0}",
     "RemoveFromPlaylist": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043e\u0442 \u0441\u043f\u0438\u0441\u044a\u043a\u0430",
-    "RemoveFromCollection": "Remove from collection",
+    "RemoveFromCollection": "\u041f\u0440\u0435\u043c\u0430\u0445\u0432\u0430\u043d\u0435 \u043e\u0442 \u043a\u043e\u043b\u0435\u043a\u0446\u0438\u044f\u0442\u0430",
     "Trailer": "\u0422\u0440\u0435\u0439\u043b\u044a\u0440",
     "MarkPlayed": "\u041e\u0442\u0431\u0435\u043b\u044f\u0437\u0432\u0430\u043d\u0435 \u043a\u0430\u0442\u043e \u043f\u0443\u0441\u043a\u0430\u043d\u043e",
     "MarkUnplayed": "\u041e\u0442\u0431\u0435\u043b\u044f\u0437\u0432\u0430\u043d\u0435 \u043a\u0430\u0442\u043e \u043d\u0435\u043f\u0443\u0441\u043a\u0430\u043d\u043e",
@@ -192,8 +192,8 @@
     "LabelCustomRating": "Custom rating:",
     "LabelOriginalAspectRatio": "\u041e\u0440\u0438\u0433\u0438\u043d\u0430\u043b\u043d\u043e \u0441\u044a\u043e\u0442\u043d\u043e\u0448\u0435\u043d\u0438\u0435:",
     "Label3DFormat": "\u0422\u0440\u0438\u0438\u0437\u043c\u0435\u0440\u0435\u043d \u0444\u043e\u0440\u043c\u0430\u0442:",
-    "FormatValue": "Format: {0}",
-    "DownloadsValue": "Downloads: {0}",
+    "FormatValue": "\u0424\u043e\u0440\u043c\u0430\u0442: {0}",
+    "DownloadsValue": "\u0418\u0437\u0442\u0435\u0433\u043b\u044f\u043d\u0438\u044f: {0}",
     "PerfectMatch": "Perfect match",
     "EnableExternalVideoPlayers": "Enable external video players",
     "EnableExternalVideoPlayersHelp": "An external player menu will be shown when starting video playback.",
@@ -259,12 +259,12 @@
     "PackageInstallCompleted": "{0} installation completed.",
     "PackageInstallFailed": "{0} installation failed.",
     "PackageInstallCancelled": "{0} installation cancelled.",
-    "SeriesYearToPresent": "{0} - Present",
+    "SeriesYearToPresent": "{0} - \u041d\u0430\u0441\u0442\u043e\u044f\u0449\u0435",
     "ValueOneItem": "1 item",
     "ValueOneSong": "1 song",
     "ValueSongCount": "{0} songs",
     "ValueOneMovie": "1 movie",
-    "ValueMovieCount": "{0} movies",
+    "ValueMovieCount": "{0} \u0444\u0438\u043b\u043c\u0430",
     "ValueOneSeries": "1 series",
     "ValueSeriesCount": "{0} series",
     "ValueOneEpisode": "1 episode",
@@ -300,7 +300,7 @@
     "LabelBitrateMbps": "Bitrate (Mbps):",
     "SyncUnwatchedVideosOnly": "Download unwatched videos only",
     "SyncUnwatchedVideosOnlyHelp": "Only unwatched videos will be downloaded, and videos will be removed from the device as they are watched.",
-    "AutomaticallySyncNewContent": "Automatically download new content",
+    "AutomaticallySyncNewContent": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e \u0441\u0432\u0430\u043b\u044f\u043d\u0435 \u043d\u0430 \u043d\u043e\u0432\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435",
     "AutomaticallySyncNewContentHelp": "New content added to this folder will be automatically downloaded to the device.",
     "LabelItemLimit": "Item limit:",
     "LabelItemLimitHelp": "Optional. Set a limit to the number of items that will be downloaded.",
@@ -314,8 +314,8 @@
     "ShowIndicatorsFor": "Show indicators for:",
     "NewEpisodes": "\u041d\u043e\u0432\u0438 \u0435\u043f\u0438\u0437\u043e\u0434\u0438",
     "Episodes": "\u0415\u043f\u0438\u0437\u043e\u0434\u0438",
-    "HDPrograms": "HD programs",
-    "Programs": "Programs",
+    "HDPrograms": "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u0438 \u0441 \u0432\u0438\u0441\u043e\u043a\u0430 \u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u043d\u0430 \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442",
+    "Programs": "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u0438",
     "LiveBroadcasts": "Live broadcasts",
     "Premieres": "\u041f\u0440\u0435\u043c\u0438\u0435\u0440\u0438",
     "RepeatEpisodes": "Repeat episodes",
@@ -340,7 +340,7 @@
     "All": "All",
     "AllChannels": "All channels",
     "LabelRecord": "Record:",
-    "NewEpisodesOnly": "New episodes only",
+    "NewEpisodesOnly": "\u0421\u0430\u043c\u043e \u043d\u043e\u0432\u0438 \u0435\u043f\u0438\u0437\u043e\u0434\u0438",
     "AllEpisodes": "All episodes",
     "LabelStartWhenPossible": "Start when possible:",
     "LabelStopWhenPossible": "Stop when possible:",
@@ -355,9 +355,9 @@
     "UntilIDelete": "Until I delete",
     "UntilSpaceNeeded": "Until space needed",
     "Categories": "Categories",
-    "Sports": "Sports",
-    "News": "News",
-    "Movies": "Movies",
+    "Sports": "\u0421\u043f\u043e\u0440\u0442\u043d\u0438",
+    "News": "\u041d\u043e\u0432\u0438\u043d\u0438",
+    "Movies": "\u0424\u0438\u043b\u043c\u0438",
     "Kids": "Kids",
     "EnableColorCodedBackgrounds": "Enable color coded backgrounds",
     "SortChannelsBy": "Sort channels by:",
@@ -431,7 +431,7 @@
     "LabelSyncTo": "\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0438\u0440\u0430\u043d\u0435 \u043a\u044a\u043c:",
     "Next": "Next",
     "LabelSource": "Source:",
-    "LabelVersion": "Version:",
+    "LabelVersion": "\u0412\u0435\u0440\u0441\u0438\u044f:",
     "AllLanguages": "All languages",
     "Previous": "Previous",
     "HeaderNextUp": "\u0421\u043b\u0435\u0434\u0432\u0430",
@@ -450,14 +450,14 @@
     "LabelSelectHomeScreenItemsFolders": "Allow items to appear on my home screen from:",
     "HeaderLibraryOrder": "\u041f\u043e\u0434\u0440\u0435\u0434\u0431\u0430 \u043d\u0430 \u0431\u0438\u0431\u043b\u0438\u043e\u0442\u0435\u043a\u0430\u0442\u0430",
     "HideWatchedContentFromLatestMedia": "\u0421\u043a\u0440\u0438\u0432\u0430\u043d\u0435 \u043d\u0430 \u0433\u043b\u0435\u0434\u0430\u043d\u043e\u0442\u043e \u0441\u044a\u0434\u044a\u0440\u0436\u0430\u043d\u0438\u0435 \u043e\u0442 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0430\u0442\u0430 \u043c\u0435\u0434\u0438\u044f",
-    "HeaderOnNow": "On Now",
+    "HeaderOnNow": "\u041d\u0430 \u0436\u0438\u0432\u043e \u0441\u0435\u0433\u0430",
     "HeaderPlaybackError": "Playback Error",
     "PlaybackErrorNotAllowed": "You're currently not authorized to play this content. Please contact your system administrator for details.",
     "PlaybackErrorNoCompatibleStream": "No compatible streams are currently available. Please try again later or contact your system administrator for details.",
     "PlaybackErrorPlaceHolder": "Please insert the disc in order to play this video.",
-    "Guide": "\u0420\u044a\u043a\u043e\u0432\u043e\u0434\u0441\u0442\u0432\u043e",
+    "Guide": "\u0421\u043f\u0440\u0430\u0432\u043e\u0447\u043d\u0438\u043a",
     "Suggestions": "\u041f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f",
-    "HeaderFavoriteCollections": "Favorite Collections",
+    "HeaderFavoriteCollections": "\u041b\u044e\u0431\u0438\u043c\u0438 \u043a\u043e\u043b\u0435\u043a\u0446\u0438\u0438",
     "Collections": "\u041a\u043e\u043b\u0435\u043a\u0446\u0438\u0438",
     "LabelSelectFolderGroups": "Automatically group content from the following folders into views such as Movies, Music and TV:",
     "LabelSelectFolderGroupsHelp": "Folders that are unchecked will be displayed by themselves in their own view.",
@@ -475,7 +475,7 @@
     "Yes": "Yes",
     "No": "No",
     "LiveTV": "\u0422\u0435\u043b\u0435\u0432\u0438\u0437\u0438\u044f \u043d\u0430 \u0436\u0438\u0432\u043e",
-    "Schedule": "Schedule",
+    "Schedule": "\u0420\u0430\u0437\u043f\u0438\u0441\u0430\u043d\u0438\u0435",
     "Recordings": "Recordings",
     "MarkWatched": "\u041e\u0442\u0431\u0435\u043b\u044f\u0437\u0432\u0430\u043d\u0435 \u043a\u0430\u0442\u043e \u0438\u0437\u0433\u043b\u0435\u0434\u0430\u043d\u043e",
     "ScanForNewAndUpdatedFiles": "Scan for new and updated files",
@@ -612,12 +612,12 @@
     "AllowSeasonalThemesHelp": "If enabled, seasonal themes will occasionally override your theme setting.",
     "AutoBasedOnLanguageSetting": "\u0410\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u043d\u043e (\u0441\u043f\u043e\u0440\u0435\u0434 \u0435\u0437\u0438\u043a\u0430)",
     "LabelDateTimeLocale": "\u041c\u0435\u0441\u0442\u043e\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0437\u0430 \u0434\u0430\u0442\u0430 \u0438 \u0447\u0430\u0441:",
-    "DirectorValue": "Director: {0}",
-    "DirectorsValue": "Directors: {0}",
-    "GenreValue": "Genre: {0}",
-    "GenresValue": "Genres: {0}",
-    "LinksValue": "Links: {0}",
-    "TagsValue": "Tags: {0}",
+    "DirectorValue": "\u0420\u0435\u0436\u0438\u0441\u044c\u043e\u0440: {0}",
+    "DirectorsValue": "\u0420\u0435\u0436\u0438\u0441\u044c\u043e\u0440\u0438: {0}",
+    "GenreValue": "\u0416\u0430\u043d\u0440: {0}",
+    "GenresValue": "\u0416\u0430\u043d\u0440\u043e\u0432\u0435: {0}",
+    "LinksValue": "\u041f\u0440\u0435\u043f\u0440\u0430\u0442\u043a\u0438: {0}",
+    "TagsValue": "\u0415\u0442\u0438\u043a\u0435\u0442\u0438: {0}",
     "LabelAudio": "Audio:",
     "LabelVideo": "Video:",
     "LabelSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u0438:",

diff --git a/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json b/MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/strings/fr.json
@@ -471,7 +471,7 @@
     "RepeatMode": "Mode de r\u00e9p\u00e9tition",
     "RepeatOne": "R\u00e9p\u00e9ter un m\u00e9dia",
     "RepeatAll": "Tout r\u00e9p\u00e9ter",
-    "ConfirmEndPlayerSession": "Voulez-vous fermer Emby sur l'appareil ?",
+    "ConfirmEndPlayerSession": "Voulez-vous arr\u00eater Emby sur {0} ?",
     "Yes": "Oui",
     "No": "Non",
     "LiveTV": "TV en direct",