aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Controller/Dto/DtoBuilder.cs17
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs7
-rw-r--r--MediaBrowser.Controller/Entities/Folder.cs6
-rw-r--r--MediaBrowser.Controller/Providers/BaseItemXmlParser.cs16
-rw-r--r--MediaBrowser.Providers/Savers/XmlSaverHelpers.cs20
-rw-r--r--MediaBrowser.WebDashboard/ApiClient.js5
-rw-r--r--MediaBrowser.WebDashboard/packages.config2
7 files changed, 56 insertions, 17 deletions
diff --git a/MediaBrowser.Controller/Dto/DtoBuilder.cs b/MediaBrowser.Controller/Dto/DtoBuilder.cs
index 7086b2c4f..16b708a58 100644
--- a/MediaBrowser.Controller/Dto/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Dto/DtoBuilder.cs
@@ -275,11 +275,9 @@ namespace MediaBrowser.Controller.Dto
dto.DisplayPreferencesId = ((Folder)item).GetDisplayPreferencesId(user.Id).ToString();
}
- var addUserData = fields.Contains(ItemFields.UserData);
-
if (item.IsFolder)
{
- if (fields.Contains(ItemFields.ItemCounts) || addUserData)
+ if (fields.Contains(ItemFields.ItemCounts))
{
var folder = (Folder)item;
@@ -290,16 +288,13 @@ namespace MediaBrowser.Controller.Dto
}
}
- if (addUserData)
- {
- var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
+ var userData = _userDataRepository.GetUserData(user.Id, item.GetUserDataKey());
- dto.UserData = GetUserItemDataDto(userData);
+ dto.UserData = GetUserItemDataDto(userData);
- if (item.IsFolder)
- {
- dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
- }
+ if (item.IsFolder)
+ {
+ dto.UserData.Played = dto.PlayedPercentage.HasValue && dto.PlayedPercentage.Value >= 100;
}
}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index c89a7f0b2..c0d681de2 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -992,10 +992,15 @@ namespace MediaBrowser.Controller.Entities
return true;
}
- var rating = CustomRating ?? OfficialRating;
+ var rating = CustomRating;
if (string.IsNullOrEmpty(rating))
{
+ rating = OfficialRating;
+ }
+
+ if (string.IsNullOrEmpty(rating))
+ {
return !user.Configuration.BlockNotRated;
}
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index e46ec8d3b..d1f2f87ed 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1,5 +1,6 @@
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Progress;
+using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Localization;
@@ -139,6 +140,11 @@ namespace MediaBrowser.Controller.Entities
{
get
{
+ if (this is Series)
+ {
+ return base.OfficialRating;
+ }
+
return !string.IsNullOrEmpty(base.OfficialRating) ? base.OfficialRating : "None";
}
set
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index 4fbda1025..953c99fbb 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -464,6 +464,22 @@ namespace MediaBrowser.Controller.Providers
break;
}
+ case "TvDbId":
+ var tvdbId = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(tvdbId))
+ {
+ item.SetProviderId(MetadataProviders.Tvdb, tvdbId);
+ }
+ break;
+
+ case "GamesDbId":
+ var gamesdbId = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(gamesdbId))
+ {
+ item.SetProviderId(MetadataProviders.Gamesdb, gamesdbId);
+ }
+ break;
+
case "MusicbrainzId":
var mbz = reader.ReadElementContentAsString();
if (!string.IsNullOrWhiteSpace(mbz))
diff --git a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
index 3683e00ad..5756e304d 100644
--- a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
+++ b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs
@@ -73,7 +73,8 @@ namespace MediaBrowser.Providers.Savers
"LockData",
"Trailer",
"CriticRating",
- "CriticRatingSummary"
+ "CriticRatingSummary",
+ "GamesDbId"
});
var position = xml.ToString().LastIndexOf("</", StringComparison.OrdinalIgnoreCase);
@@ -269,6 +270,16 @@ namespace MediaBrowser.Providers.Savers
builder.Append("<TMDbId>" + SecurityElement.Escape(tmdb) + "</TMDbId>");
}
+ if (!(item is Series))
+ {
+ var tvdb = item.GetProviderId(MetadataProviders.Tvdb);
+
+ if (!string.IsNullOrEmpty(tvdb))
+ {
+ builder.Append("<TvDbId>" + SecurityElement.Escape(tvdb) + "</TvDbId>");
+ }
+ }
+
var tvcom = item.GetProviderId(MetadataProviders.Tvcom);
if (!string.IsNullOrEmpty(tvcom))
@@ -290,6 +301,13 @@ namespace MediaBrowser.Providers.Savers
builder.Append("<MusicbrainzId>" + SecurityElement.Escape(mbz) + "</MusicbrainzId>");
}
+ var gamesdb = item.GetProviderId(MetadataProviders.Gamesdb);
+
+ if (!string.IsNullOrEmpty(gamesdb))
+ {
+ builder.Append("<GamesDbId>" + SecurityElement.Escape(gamesdb) + "</GamesDbId>");
+ }
+
var tmdbCollection = item.GetProviderId(MetadataProviders.TmdbCollection);
if (!string.IsNullOrEmpty(tmdbCollection))
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 6228c9106..7a2fae3e9 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -637,10 +637,9 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
};
/**
- * Instructs the server to perform a pending kernel reload or app restart.
- * If a restart is not currently required, nothing will happen.
+ * Instructs the server to perform a restart.
*/
- self.performPendingRestart = function () {
+ self.restartServer = function () {
var url = self.getUrl("System/Restart");
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index cdfd8ba8f..e92bbf470 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="MediaBrowser.ApiClient.Javascript" version="3.0.144" targetFramework="net45" />
+ <package id="MediaBrowser.ApiClient.Javascript" version="3.0.145" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.54" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.54" targetFramework="net45" />
</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 08:59:16 +0000