diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index d477008a5..e65e98f21 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -882,15 +882,6 @@ namespace Emby.Server.Implementations.Dto
dto.AspectRatio = hasAspectRatio.AspectRatio;
}
- if (fields.Contains(ItemFields.Metascore))
- {
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null)
- {
- dto.Metascore = hasMetascore.Metascore;
- }
- }
-
if (fields.Contains(ItemFields.AwardSummary))
{
var hasAwards = item as IHasAwards;
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 5166d5413..4b1418007 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -247,7 +247,6 @@
-
diff --git a/Emby.Server.Implementations/Sorting/MetascoreComparer.cs b/Emby.Server.Implementations/Sorting/MetascoreComparer.cs
deleted file mode 100644
index 9759e0228..000000000
--- a/Emby.Server.Implementations/Sorting/MetascoreComparer.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Sorting;
-using MediaBrowser.Model.Querying;
-
-namespace Emby.Server.Implementations.Sorting
-{
- public class MetascoreComparer : IBaseItemComparer
- {
- ///
- /// Compares the specified x.
- ///
- /// The x.
- /// The y.
- /// System.Int32.
- public int Compare(BaseItem x, BaseItem y)
- {
- return GetValue(x).CompareTo(GetValue(y));
- }
-
- private float GetValue(BaseItem x)
- {
- var hasMetascore = x as IHasMetascore;
-
- if (hasMetascore != null)
- {
- return hasMetascore.Metascore ?? 0;
- }
-
- return 0;
- }
-
- ///
- /// Gets the name.
- ///
- /// The name.
- public string Name
- {
- get { return ItemSortBy.Metascore; }
- }
- }
-}
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index cadf52be1..686a3a296 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -336,12 +336,6 @@ namespace MediaBrowser.Api
video.Video3DFormat = request.Video3DFormat;
}
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null)
- {
- hasMetascore.Metascore = request.Metascore;
- }
-
var hasAwards = item as IHasAwards;
if (hasAwards != null)
{
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index a323a2439..be41d896d 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -761,11 +761,6 @@ namespace MediaBrowser.Controller.Entities
Logger.Debug("Query requires post-filtering due to ItemSortBy.GameSystem");
return true;
}
- if (query.SortBy.Contains(ItemSortBy.Metascore, StringComparer.OrdinalIgnoreCase))
- {
- Logger.Debug("Query requires post-filtering due to ItemSortBy.Metascore");
- return true;
- }
if (query.SortBy.Contains(ItemSortBy.Players, StringComparer.OrdinalIgnoreCase))
{
Logger.Debug("Query requires post-filtering due to ItemSortBy.Players");
@@ -778,12 +773,6 @@ namespace MediaBrowser.Controller.Entities
}
}
- if (query.ItemIds.Length > 0)
- {
- Logger.Debug("Query requires post-filtering due to ItemIds");
- return true;
- }
-
if (query.IsInBoxSet.HasValue)
{
Logger.Debug("Query requires post-filtering due to IsInBoxSet");
diff --git a/MediaBrowser.Controller/Entities/IHasMetascore.cs b/MediaBrowser.Controller/Entities/IHasMetascore.cs
deleted file mode 100644
index a3445bbba..000000000
--- a/MediaBrowser.Controller/Entities/IHasMetascore.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-namespace MediaBrowser.Controller.Entities
-{
- ///
- /// Interface IHasMetascore
- ///
- public interface IHasMetascore
- {
- ///
- /// Gets or sets the metascore.
- ///
- /// The metascore.
- float? Metascore { get; set; }
- }
-}
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index dfa9ac416..ce671a2dc 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -17,7 +17,7 @@ namespace MediaBrowser.Controller.Entities.Movies
///
/// Class Movie
///
- public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasAwards, IHasMetascore, IHasLookupInfo, ISupportsBoxSetGrouping
+ public class Movie : Video, IHasSpecialFeatures, IHasTrailers, IHasAwards, IHasLookupInfo, ISupportsBoxSetGrouping
{
public List SpecialFeatureIds { get; set; }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 88153868f..1f10fab73 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -114,7 +114,6 @@
-
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 996009524..36f0f67bd 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1741,13 +1741,13 @@ namespace MediaBrowser.Controller.MediaEncoding
return "-c:v h264_qsv ";
}
break;
- case "hevc":
- case "h265":
- if (_mediaEncoder.SupportsDecoder("hevc_qsv"))
- {
- return "-c:v hevc_qsv ";
- }
- break;
+ //case "hevc":
+ //case "h265":
+ // if (_mediaEncoder.SupportsDecoder("hevc_qsv"))
+ // {
+ // return "-c:v hevc_qsv ";
+ // }
+ // break;
case "mpeg2video":
if (_mediaEncoder.SupportsDecoder("mpeg2_qsv"))
{
diff --git a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
index a1fd71ab2..e56bfb49c 100644
--- a/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
+++ b/MediaBrowser.LocalMetadata/Parsers/BaseItemXmlParser.cs
@@ -207,22 +207,6 @@ namespace MediaBrowser.LocalMetadata.Parsers
break;
}
- case "Metascore":
- {
- var text = reader.ReadElementContentAsString();
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null)
- {
- float value;
- if (float.TryParse(text, NumberStyles.Any, _usCulture, out value))
- {
- hasMetascore.Metascore = value;
- }
- }
-
- break;
- }
-
case "AwardSummary":
{
var text = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
index 6a2e2263b..105e685f4 100644
--- a/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
+++ b/MediaBrowser.LocalMetadata/Savers/BaseXmlSaver.cs
@@ -68,7 +68,6 @@ namespace MediaBrowser.LocalMetadata.Savers
"LockData",
"LockedFields",
"Format3D",
- "Metascore",
// Deprecated. No longer saving in this field.
"MPAARating",
@@ -421,12 +420,6 @@ namespace MediaBrowser.LocalMetadata.Savers
writer.WriteElementString("DisplayOrder", hasDisplayOrder.DisplayOrder);
}
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null && hasMetascore.Metascore.HasValue)
- {
- writer.WriteElementString("Metascore", hasMetascore.Metascore.Value.ToString(UsCulture));
- }
-
var hasAwards = item as IHasAwards;
if (hasAwards != null && !string.IsNullOrEmpty(hasAwards.AwardSummary))
{
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 5122227e1..ae7d13868 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -81,8 +81,6 @@ namespace MediaBrowser.Model.Dto
public string AwardSummary { get; set; }
- public float? Metascore { get; set; }
-
///
/// Gets or sets a value indicating whether [supports synchronize].
///
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index 82e4acaec..0caf64538 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -122,11 +122,6 @@
///
MediaSources,
- ///
- /// The metascore
- ///
- Metascore,
-
OfficialRatingDescription,
OriginalTitle,
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index b379298a5..66bdc8aa5 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -71,7 +71,6 @@ namespace MediaBrowser.Model.Querying
public const string SeriesSortName = "SeriesSortName";
public const string VideoBitRate = "VideoBitRate";
public const string AirTime = "AirTime";
- public const string Metascore = "Metascore";
public const string Studio = "Studio";
public const string Players = "Players";
public const string GameSystem = "GameSystem";
diff --git a/MediaBrowser.Providers/Manager/ProviderUtils.cs b/MediaBrowser.Providers/Manager/ProviderUtils.cs
index 5281b8788..34cf63350 100644
--- a/MediaBrowser.Providers/Manager/ProviderUtils.cs
+++ b/MediaBrowser.Providers/Manager/ProviderUtils.cs
@@ -195,7 +195,6 @@ namespace MediaBrowser.Providers.Manager
}
MergeAlbumArtist(source, target, lockedFields, replaceData);
- MergeMetascore(source, target, lockedFields, replaceData);
MergeCriticRating(source, target, lockedFields, replaceData);
MergeAwards(source, target, lockedFields, replaceData);
MergeTrailers(source, target, lockedFields, replaceData);
@@ -246,20 +245,6 @@ namespace MediaBrowser.Providers.Manager
}
}
- private static void MergeMetascore(BaseItem source, BaseItem target, List lockedFields, bool replaceData)
- {
- var sourceCast = source as IHasMetascore;
- var targetCast = target as IHasMetascore;
-
- if (sourceCast != null && targetCast != null)
- {
- if (replaceData || !targetCast.Metascore.HasValue)
- {
- targetCast.Metascore = sourceCast.Metascore;
- }
- }
- }
-
private static void MergeAwards(BaseItem source, BaseItem target, List lockedFields, bool replaceData)
{
var sourceCast = source as IHasAwards;
diff --git a/MediaBrowser.Providers/Omdb/OmdbProvider.cs b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
index 024853778..148bfc8a8 100644
--- a/MediaBrowser.Providers/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Omdb/OmdbProvider.cs
@@ -409,17 +409,6 @@ namespace MediaBrowser.Providers.Omdb
}
}
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null)
- {
- float metascore;
-
- if (!string.IsNullOrEmpty(result.Metascore) && float.TryParse(result.Metascore, NumberStyles.Any, _usCulture, out metascore) && metascore >= 0)
- {
- hasMetascore.Metascore = metascore;
- }
- }
-
var hasAwards = item as IHasAwards;
if (hasAwards != null && !string.IsNullOrEmpty(result.Awards))
{
diff --git a/MediaBrowser.ServerApplication/MainStartup.cs b/MediaBrowser.ServerApplication/MainStartup.cs
index b02c5d6ac..3643aab48 100644
--- a/MediaBrowser.ServerApplication/MainStartup.cs
+++ b/MediaBrowser.ServerApplication/MainStartup.cs
@@ -207,7 +207,7 @@ namespace MediaBrowser.ServerApplication
{
_logger.Info("Found a duplicate process. Giving it time to exit.");
- if (!duplicate.WaitForExit(30000))
+ if (!duplicate.WaitForExit(40000))
{
_logger.Info("The duplicate process did not exit.");
return true;
diff --git a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
index 650d7a138..c44970ff5 100644
--- a/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
+++ b/MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs
@@ -320,22 +320,6 @@ namespace MediaBrowser.XbmcMetadata.Parsers
break;
}
- case "metascore":
- {
- var text = reader.ReadElementContentAsString();
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null)
- {
- float value;
- if (float.TryParse(text, NumberStyles.Any, _usCulture, out value))
- {
- hasMetascore.Metascore = value;
- }
- }
-
- break;
- }
-
case "awardsummary":
{
var text = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
index 100b9c36c..02929f83d 100644
--- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
+++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs
@@ -87,7 +87,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
"awardsummary",
"enddate",
"lockedfields",
- "metascore",
"zap2itid",
"tvrageid",
"gamesdbid",
@@ -683,12 +682,6 @@ namespace MediaBrowser.XbmcMetadata.Savers
writer.WriteElementString("votes", item.VoteCount.Value.ToString(UsCulture));
}
- var hasMetascore = item as IHasMetascore;
- if (hasMetascore != null && hasMetascore.Metascore.HasValue)
- {
- writer.WriteElementString("metascore", hasMetascore.Metascore.Value.ToString(UsCulture));
- }
-
// Use original runtime here, actual file runtime later in MediaInfo
var runTimeTicks = item.RunTimeTicks;
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 9de987955..6f5bd9b1f 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.10.2")]
+[assembly: AssemblyVersion("3.2.10.3")]