fixes #347 - File Properties in Video file formats override local xml

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -764,7 +764,7 @@ namespace MediaBrowser.Controller.Entities
                 return false;
             }));
 
-            var trailers = LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
+            return LibraryManager.ResolvePaths<Trailer>(files, null).Select(video =>
             {
                 // Try to retrieve it from the db. If we don't find it, use the resolved version
                 var dbItem = LibraryManager.RetrieveItem(video.Id) as Trailer;
@@ -776,9 +776,8 @@ namespace MediaBrowser.Controller.Entities
                 }
 
                 return video;
-            }).ToList();
 
-            return trailers;
+            }).ToList();
         }
 
         /// <summary>

MediaBrowser.Providers/MediaInfo/BaseFFProbeProvider.cs

@@ -37,9 +37,7 @@ namespace MediaBrowser.Providers.MediaInfo
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            // Give this second priority
+            get { return MetadataProviderPriority.First; }
-            // Give metadata xml providers a chance to fill in data first, so that we can skip this whenever possible
-            get { return MetadataProviderPriority.Second; }
         }
 
         protected readonly CultureInfo UsCulture = new CultureInfo("en-US");

MediaBrowser.Providers/Movies/FanArtMovieProvider.cs

@@ -85,6 +85,14 @@ namespace MediaBrowser.Providers.Movies
             }
         }
 
+        public override MetadataProviderPriority Priority
+        {
+            get
+            {
+                return MetadataProviderPriority.Fourth;
+            }
+        }
+
         /// <summary>
         /// The fan art base URL
         /// </summary>

MediaBrowser.Providers/Movies/MovieDbImagesProvider.cs

@@ -64,7 +64,7 @@ namespace MediaBrowser.Providers.Movies
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            get { return MetadataProviderPriority.Fourth; }
+            get { return MetadataProviderPriority.Last; }
         }
 
         /// <summary>

MediaBrowser.Providers/Movies/MovieDbProvider.cs

@@ -83,7 +83,7 @@ namespace MediaBrowser.Providers.Movies
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            get { return MetadataProviderPriority.Second; }
+            get { return MetadataProviderPriority.Third; }
         }
 
         /// <summary>

MediaBrowser.Providers/Movies/MovieProviderFromJson.cs

@@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Movies
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            get { return MetadataProviderPriority.First; }
+            get { return MetadataProviderPriority.Second; }
         }
 
         /// <summary>

MediaBrowser.Providers/Movies/MovieProviderFromXml.cs

@@ -42,7 +42,7 @@ namespace MediaBrowser.Providers.Movies
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            get { return MetadataProviderPriority.First; }
+            get { return MetadataProviderPriority.Second; }
         }
 
         /// <summary>

MediaBrowser.Providers/TV/EpisodeProviderFromXml.cs

@@ -37,7 +37,7 @@ namespace MediaBrowser.Providers.TV
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            get { return MetadataProviderPriority.First; }
+            get { return MetadataProviderPriority.Second; }
         }
 
         /// <summary>

MediaBrowser.Providers/TV/RemoteEpisodeProvider.cs

@@ -65,7 +65,7 @@ namespace MediaBrowser.Providers.TV
         /// <value>The priority.</value>
         public override MetadataProviderPriority Priority
         {
-            get { return MetadataProviderPriority.Second; }
+            get { return MetadataProviderPriority.Third; }
         }
 
         /// <summary>