aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MediaBrowser.Controller/Entities/BaseItem.cs7
-rw-r--r--MediaBrowser.Controller/Providers/BaseItemXmlParser.cs39
-rw-r--r--MediaBrowser.Providers/Games/GameProviderFromXml.cs4
-rw-r--r--MediaBrowser.Providers/Games/GameXmlParser.cs110
-rw-r--r--MediaBrowser.Providers/MediaBrowser.Providers.csproj1
-rw-r--r--MediaBrowser.Providers/Movies/MovieDbProvider.cs3
-rw-r--r--MediaBrowser.Providers/Savers/GameXmlSaver.cs19
-rw-r--r--MediaBrowser.Tests/MediaBrowser.Tests.csproj5
-rw-r--r--MediaBrowser.Tests/Providers/MovieDbProviderTests.cs36
-rw-r--r--MediaBrowser.WebDashboard/ApiClient.js50
-rw-r--r--MediaBrowser.WebDashboard/packages.config2
11 files changed, 219 insertions, 57 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 67221a9ac..8174dded2 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1337,6 +1337,13 @@ namespace MediaBrowser.Controller.Entities
var data = userManager.GetUserData(user.Id, key);
+ if (datePlayed.HasValue)
+ {
+ // Incremenet
+ data.PlayCount++;
+ }
+
+ // Ensure it's at least one
data.PlayCount = Math.Max(data.PlayCount, 1);
data.LastPlayedDate = datePlayed ?? data.LastPlayedDate;
diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
index e1b38bc71..e9bb7f66d 100644
--- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs
@@ -552,32 +552,6 @@ namespace MediaBrowser.Controller.Providers
}
break;
- case "GamesDbId":
- var gamesdbId = reader.ReadElementContentAsString();
- if (!string.IsNullOrWhiteSpace(gamesdbId))
- {
- item.SetProviderId(MetadataProviders.Gamesdb, gamesdbId);
- }
- break;
-
- case "Players":
- {
- var val = reader.ReadElementContentAsString();
- if (!string.IsNullOrWhiteSpace(val))
- {
- int num;
-
- if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num))
- {
- var game = item as Game;
- if (game != null)
- {
- game.PlayersSupported = num;
- }
- }
- }
- break;
- }
case "VoteCount":
{
var val = reader.ReadElementContentAsString();
@@ -592,19 +566,6 @@ namespace MediaBrowser.Controller.Providers
}
break;
}
- case "GameSystem":
- {
- var val = reader.ReadElementContentAsString();
- if (!string.IsNullOrWhiteSpace(val))
- {
- var game = item as Game;
- if (game != null)
- {
- game.GameSystem = val;
- }
- }
- break;
- }
case "MusicbrainzId":
{
var mbz = reader.ReadElementContentAsString();
diff --git a/MediaBrowser.Providers/Games/GameProviderFromXml.cs b/MediaBrowser.Providers/Games/GameProviderFromXml.cs
index 6292cec46..44680b832 100644
--- a/MediaBrowser.Providers/Games/GameProviderFromXml.cs
+++ b/MediaBrowser.Providers/Games/GameProviderFromXml.cs
@@ -3,11 +3,11 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.IO;
using MediaBrowser.Controller.Providers;
using MediaBrowser.Model.Logging;
+using MediaBrowser.Providers.Savers;
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
-using MediaBrowser.Providers.Savers;
namespace MediaBrowser.Providers.Games
{
@@ -78,7 +78,7 @@ namespace MediaBrowser.Providers.Games
try
{
- new BaseItemXmlParser<Game>(Logger).Fetch(game, metaFile, cancellationToken);
+ new GameXmlParser(Logger).Fetch(game, metaFile, cancellationToken);
}
finally
{
diff --git a/MediaBrowser.Providers/Games/GameXmlParser.cs b/MediaBrowser.Providers/Games/GameXmlParser.cs
new file mode 100644
index 000000000..53cc12388
--- /dev/null
+++ b/MediaBrowser.Providers/Games/GameXmlParser.cs
@@ -0,0 +1,110 @@
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Logging;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Xml;
+
+namespace MediaBrowser.Providers.Games
+{
+ /// <summary>
+ /// Class EpisodeXmlParser
+ /// </summary>
+ public class GameXmlParser : BaseItemXmlParser<Game>
+ {
+ private Task _chaptersTask = null;
+ private readonly CultureInfo _usCulture = new CultureInfo("en-US");
+
+ public GameXmlParser(ILogger logger)
+ : base(logger)
+ {
+ }
+
+ public async Task FetchAsync(Game item, string metadataFile, CancellationToken cancellationToken)
+ {
+ _chaptersTask = null;
+
+ Fetch(item, metadataFile, cancellationToken);
+
+ cancellationToken.ThrowIfCancellationRequested();
+
+ if (_chaptersTask != null)
+ {
+ await _chaptersTask.ConfigureAwait(false);
+ }
+ }
+
+ /// <summary>
+ /// Fetches the data from XML node.
+ /// </summary>
+ /// <param name="reader">The reader.</param>
+ /// <param name="item">The item.</param>
+ protected override void FetchDataFromXmlNode(XmlReader reader, Game item)
+ {
+ switch (reader.Name)
+ {
+ case "GameSystem":
+ {
+ var val = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(val))
+ {
+ item.GameSystem = val;
+ }
+ break;
+ }
+
+ case "GamesDbId":
+ {
+ var val = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(val))
+ {
+ item.SetProviderId(MetadataProviders.Gamesdb, val);
+ }
+ break;
+ }
+
+ case "NesBox":
+ {
+ var val = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(val))
+ {
+ item.SetProviderId(MetadataProviders.NesBox, val);
+ }
+ break;
+ }
+
+ case "NesBoxRom":
+ {
+ var val = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(val))
+ {
+ item.SetProviderId(MetadataProviders.NesBoxRom, val);
+ }
+ break;
+ }
+
+ case "Players":
+ {
+ var val = reader.ReadElementContentAsString();
+ if (!string.IsNullOrWhiteSpace(val))
+ {
+ int num;
+
+ if (int.TryParse(val, NumberStyles.Integer, _usCulture, out num))
+ {
+ item.PlayersSupported = num;
+ }
+ }
+ break;
+ }
+
+
+ default:
+ base.FetchDataFromXmlNode(reader, item);
+ break;
+ }
+ }
+ }
+}
diff --git a/MediaBrowser.Providers/MediaBrowser.Providers.csproj b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
index e687e14d9..63bd8c953 100644
--- a/MediaBrowser.Providers/MediaBrowser.Providers.csproj
+++ b/MediaBrowser.Providers/MediaBrowser.Providers.csproj
@@ -49,6 +49,7 @@
<ItemGroup>
<Compile Include="FanartBaseProvider.cs" />
<Compile Include="FolderProviderFromXml.cs" />
+ <Compile Include="Games\GameXmlParser.cs" />
<Compile Include="Games\GameProviderFromXml.cs" />
<Compile Include="Games\GameSystemProviderFromXml.cs" />
<Compile Include="ImageFromMediaLocationProvider.cs" />
diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
index 9ed0860b2..63a237d2c 100644
--- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs
@@ -189,6 +189,7 @@ namespace MediaBrowser.Providers.Movies
static readonly Regex[] NameMatches = new[] {
new Regex(@"(?<name>.*)\((?<year>\d{4})\)"), // matches "My Movie (2001)" and gives us the name and the year
+ new Regex(@"(?<name>.*)(\.(?<year>\d{4})(\.|$)).*$"),
new Regex(@"(?<name>.*)") // last resort matches the whole string as the name
};
@@ -320,7 +321,7 @@ namespace MediaBrowser.Providers.Movies
/// <param name="name">The name.</param>
/// <param name="justName">Name of the just.</param>
/// <param name="year">The year.</param>
- protected void ParseName(string name, out string justName, out int? year)
+ public static void ParseName(string name, out string justName, out int? year)
{
justName = null;
year = null;
diff --git a/MediaBrowser.Providers/Savers/GameXmlSaver.cs b/MediaBrowser.Providers/Savers/GameXmlSaver.cs
index 5564b71ce..f35e4d131 100644
--- a/MediaBrowser.Providers/Savers/GameXmlSaver.cs
+++ b/MediaBrowser.Providers/Savers/GameXmlSaver.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
using MediaBrowser.Providers.Movies;
using System;
using System.Collections.Generic;
@@ -70,6 +71,20 @@ namespace MediaBrowser.Providers.Savers
builder.Append("<GameSystem>" + SecurityElement.Escape(game.GameSystem) + "</GameSystem>");
}
+ var val = game.GetProviderId(MetadataProviders.NesBox);
+
+ if (!string.IsNullOrEmpty(val))
+ {
+ builder.Append("<NesBox>" + SecurityElement.Escape(val) + "</NesBox>");
+ }
+
+ val = game.GetProviderId(MetadataProviders.NesBoxRom);
+
+ if (!string.IsNullOrEmpty(val))
+ {
+ builder.Append("<NesBoxRom>" + SecurityElement.Escape(val) + "</NesBoxRom>");
+ }
+
XmlSaverHelpers.AddCommonNodes(item, builder);
builder.Append("</Item>");
@@ -79,7 +94,9 @@ namespace MediaBrowser.Providers.Savers
XmlSaverHelpers.Save(builder, xmlFilePath, new List<string>
{
"Players",
- "GameSystem"
+ "GameSystem",
+ "NesBox",
+ "NesBoxRom"
});
// Set last refreshed so that the provider doesn't trigger after the file save
diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
index a7a7ac243..95e55fda0 100644
--- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj
+++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj
@@ -50,6 +50,7 @@
</Otherwise>
</Choose>
<ItemGroup>
+ <Compile Include="Providers\MovieDbProviderTests.cs" />
<Compile Include="Resolvers\MovieResolverTests.cs" />
<Compile Include="Resolvers\TvUtilTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -63,6 +64,10 @@
<Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
<Name>MediaBrowser.Model</Name>
</ProjectReference>
+ <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
+ <Project>{442B5058-DCAF-4263-BB6A-F21E31120A1B}</Project>
+ <Name>MediaBrowser.Providers</Name>
+ </ProjectReference>
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
diff --git a/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs b/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs
new file mode 100644
index 000000000..f7a87c9d4
--- /dev/null
+++ b/MediaBrowser.Tests/Providers/MovieDbProviderTests.cs
@@ -0,0 +1,36 @@
+using MediaBrowser.Providers.Movies;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace MediaBrowser.Tests.Providers {
+ [TestClass]
+ public class MovieDbProviderTests {
+ [TestMethod]
+ public void TestNameMatches() {
+ var name = string.Empty;
+ int? year = null;
+ MovieDbProvider.ParseName("My Movie (2013)", out name, out year);
+ Assert.AreEqual("My Movie", name);
+ Assert.AreEqual(2013, year);
+ name = string.Empty;
+ year = null;
+ MovieDbProvider.ParseName("My Movie 2 (2013)", out name, out year);
+ Assert.AreEqual("My Movie 2", name);
+ Assert.AreEqual(2013, year);
+ name = string.Empty;
+ year = null;
+ MovieDbProvider.ParseName("My Movie 2001 (2013)", out name, out year);
+ Assert.AreEqual("My Movie 2001", name);
+ Assert.AreEqual(2013, year);
+ name = string.Empty;
+ year = null;
+ MovieDbProvider.ParseName("My Movie - 2 (2013)", out name, out year);
+ Assert.AreEqual("My Movie - 2", name);
+ Assert.AreEqual(2013, year);
+ name = string.Empty;
+ year = null;
+ MovieDbProvider.ParseName("curse.of.chucky.2013.stv.unrated.multi.1080p.bluray.x264-rough", out name, out year);
+ Assert.AreEqual("curse.of.chucky", name);
+ Assert.AreEqual(2013, year);
+ }
+ }
+} \ No newline at end of file
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 97a443e84..8e64e4300 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -2731,16 +2731,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
});
};
- /**
- * Marks an item as played or unplayed
- * This should not be used to update playstate following playback.
- * There are separate playstate check-in methods for that. This should be used for a
- * separate option to reset playstate.
- * @param {String} userId
- * @param {String} itemId
- * @param {Boolean} wasPlayed
- */
- self.updatePlayedStatus = function (userId, itemId, wasPlayed) {
+ self.getDateParamValue = function (date) {
+ function formatDigit(i) {
+ return i < 10 ? "0" + i : i;
+ }
+
+ var d = date;
+
+ return "" + d.getFullYear() + formatDigit(d.getMonth() + 1) + formatDigit(d.getDate()) + formatDigit(d.getHours()) + formatDigit(d.getMinutes()) + formatDigit(d.getSeconds());
+ };
+
+ self.markPlayed = function (userId, itemId, date) {
if (!userId) {
throw new Error("null userId");
@@ -2750,12 +2751,35 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
throw new Error("null itemId");
}
- var url = self.getUrl("Users/" + userId + "/PlayedItems/" + itemId);
+ var options = {};
+
+ if (date) {
+ options.DatePlayed = self.getDateParamValue(date);
+ }
- var method = wasPlayed ? "POST" : "DELETE";
+ var url = self.getUrl("Users/" + userId + "/PlayedItems/" + itemId, options);
return self.ajax({
- type: method,
+ type: "POST",
+ url: url,
+ dataType: "json"
+ });
+ };
+
+ self.markUnplayed = function (userId, itemId) {
+
+ if (!userId) {
+ throw new Error("null userId");
+ }
+
+ if (!itemId) {
+ throw new Error("null itemId");
+ }
+
+ var url = self.getUrl("Users/" + userId + "/PlayedItems/" + itemId);
+
+ return self.ajax({
+ type: "DELETE",
url: url,
dataType: "json"
});
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 9c48b3809..02daa2cae 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.181" targetFramework="net45" />
+ <package id="MediaBrowser.ApiClient.Javascript" version="3.0.182" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.62" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.62" targetFramework="net45" />
</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-27 16:10:44 +0000