From cc5acf37f75d2c652d9cd855ebc34a1e7d414a9f Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sat, 26 Oct 2019 22:53:53 +0200 Subject: Make probesize and analyzeduration configurable and simplify circular dependencies Makes the probesize and analyzeduration configurable with env args. (`JELLYFIN_FFmpeg_probesize` and `FFmpeg_analyzeduration`) --- Emby.Server.Implementations/ApplicationHost.cs | 23 ++++++++++++++-------- .../ConfigurationOptions.cs | 9 ++++++--- .../Emby.Server.Implementations.csproj | 1 - .../HttpServer/HttpListenerHost.cs | 2 +- 4 files changed, 22 insertions(+), 13 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index bd5e973c0..1c034ca79 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -886,16 +886,14 @@ namespace Emby.Server.Implementations serviceCollection.AddSingleton(ChapterManager); MediaEncoder = new MediaBrowser.MediaEncoding.Encoder.MediaEncoder( - LoggerFactory, - JsonSerializer, - StartupOptions.FFmpegPath, + LoggerFactory.CreateLogger(), ServerConfigurationManager, FileSystemManager, - () => SubtitleEncoder, - () => MediaSourceManager, ProcessFactory, - 5000, - LocalizationManager); + LocalizationManager, + () => SubtitleEncoder, + _configuration, + StartupOptions.FFmpegPath); serviceCollection.AddSingleton(MediaEncoder); EncodingManager = new MediaEncoder.EncodingManager(FileSystemManager, LoggerFactory, MediaEncoder, ChapterManager, LibraryManager); @@ -912,10 +910,19 @@ namespace Emby.Server.Implementations AuthService = new AuthService(authContext, ServerConfigurationManager, SessionManager, NetworkManager); serviceCollection.AddSingleton(AuthService); - SubtitleEncoder = new MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder(LibraryManager, LoggerFactory, ApplicationPaths, FileSystemManager, MediaEncoder, JsonSerializer, HttpClient, MediaSourceManager, ProcessFactory); + SubtitleEncoder = new MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder( + LibraryManager, + LoggerFactory.CreateLogger(), + ApplicationPaths, + FileSystemManager, + MediaEncoder, + HttpClient, + MediaSourceManager, + ProcessFactory); serviceCollection.AddSingleton(SubtitleEncoder); serviceCollection.AddSingleton(typeof(IResourceFileManager), typeof(ResourceFileManager)); + serviceCollection.AddSingleton(); _displayPreferencesRepository.Initialize(); diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs index 62408ee70..445a554b2 100644 --- a/Emby.Server.Implementations/ConfigurationOptions.cs +++ b/Emby.Server.Implementations/ConfigurationOptions.cs @@ -1,13 +1,16 @@ using System.Collections.Generic; +using static MediaBrowser.Controller.Extensions.ConfigurationExtensions; namespace Emby.Server.Implementations { public static class ConfigurationOptions { - public static readonly Dictionary Configuration = new Dictionary + public static Dictionary Configuration => new Dictionary { - { "HttpListenerHost:DefaultRedirectPath", "web/index.html" }, - { "MusicBrainz:BaseUrl", "https://www.musicbrainz.org" } + { "HttpListenerHost_DefaultRedirectPath", "web/index.html" }, + { "MusicBrainz_BaseUrl", "https://www.musicbrainz.org" }, + { FfmpegProbeSizeKey, "1G" }, + { FfmpegAnalyzeDuration, "200M" } }; } } diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index 214ea5aff..618f54ce7 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -28,7 +28,6 @@ - diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index dc1a56e27..2736339b1 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -56,7 +56,7 @@ namespace Emby.Server.Implementations.HttpServer _appHost = applicationHost; _logger = logger; _config = config; - _defaultRedirectPath = configuration["HttpListenerHost:DefaultRedirectPath"]; + _defaultRedirectPath = configuration["HttpListenerHost_DefaultRedirectPath"]; _baseUrlPrefix = _config.Configuration.BaseUrl; _networkManager = networkManager; _jsonSerializer = jsonSerializer; -- cgit v1.2.3 From c6d48f51f608601775d98fc7866eefc367bfd63b Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Mon, 25 Nov 2019 12:12:48 +0100 Subject: Fix naming const --- Emby.Server.Implementations/ConfigurationOptions.cs | 2 +- MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs index 445a554b2..a55a9eb2d 100644 --- a/Emby.Server.Implementations/ConfigurationOptions.cs +++ b/Emby.Server.Implementations/ConfigurationOptions.cs @@ -10,7 +10,7 @@ namespace Emby.Server.Implementations { "HttpListenerHost_DefaultRedirectPath", "web/index.html" }, { "MusicBrainz_BaseUrl", "https://www.musicbrainz.org" }, { FfmpegProbeSizeKey, "1G" }, - { FfmpegAnalyzeDuration, "200M" } + { FfmpegAnalyzeDurationKey, "200M" } }; } } diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs index 80a98ad5f..4048207bd 100644 --- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs +++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs @@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Extensions /// /// The key for the FFmpeg analyse duration option. /// - public const string FfmpegAnalyzeDuration = "FFmpeg_analyzeduration"; + public const string FfmpegAnalyzeDurationKey = "FFmpeg_analyzeduration"; /// /// Retrieves the FFmpeg probe size from the . @@ -31,6 +31,6 @@ namespace MediaBrowser.Controller.Extensions /// This configuration. /// The FFmpeg analyse duration option. public static string GetAnalyzeDuration(this IConfiguration configuration) - => configuration[FfmpegAnalyzeDuration]; + => configuration[FfmpegAnalyzeDurationKey]; } } -- cgit v1.2.3 From ec70f3ac75dad10b076a475bbec6d71ded9881a6 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Fri, 6 Dec 2019 22:06:16 +0100 Subject: Fix plugin installation and correct api behaviour The `/Packages/{Name}` endpoint would return a package that had either the corrent name or the correct guid. In reality it shoud check if both are correct. --- Emby.Server.Implementations/Updates/InstallationManager.cs | 3 +-- MediaBrowser.Api/PackageService.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Updates/InstallationManager.cs b/Emby.Server.Implementations/Updates/InstallationManager.cs index 09a5a0dca..2705e0628 100644 --- a/Emby.Server.Implementations/Updates/InstallationManager.cs +++ b/Emby.Server.Implementations/Updates/InstallationManager.cs @@ -141,8 +141,7 @@ namespace Emby.Server.Implementations.Updates if (guid != Guid.Empty) { - var strGuid = guid.ToString("N", CultureInfo.InvariantCulture); - availablePackages = availablePackages.Where(x => x.guid.Equals(strGuid, StringComparison.OrdinalIgnoreCase)); + availablePackages = availablePackages.Where(x => Guid.Parse(x.guid) == guid); } return availablePackages; diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs index 1e5a93210..325acfb7b 100644 --- a/MediaBrowser.Api/PackageService.cs +++ b/MediaBrowser.Api/PackageService.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Threading; using System.Threading.Tasks; using MediaBrowser.Common; using MediaBrowser.Common.Extensions; @@ -133,10 +132,11 @@ namespace MediaBrowser.Api /// System.Object. public object Get(GetPackage request) { - var packages = _installationManager.GetAvailablePackages().Result; - - var result = packages.FirstOrDefault(p => string.Equals(p.guid, request.AssemblyGuid ?? "none", StringComparison.OrdinalIgnoreCase)) - ?? packages.FirstOrDefault(p => p.name.Equals(request.Name, StringComparison.OrdinalIgnoreCase)); + var packages = _installationManager.GetAvailablePackages().GetAwaiter().GetResult(); + var result = _installationManager.FilterPackages( + packages, + request.Name, + string.IsNullOrEmpty(request.AssemblyGuid) ? default : Guid.Parse(request.AssemblyGuid)).FirstOrDefault(); return ToOptimizedResult(result); } @@ -181,7 +181,7 @@ namespace MediaBrowser.Api var package = _installationManager.GetCompatibleVersions( packages, request.Name, - new Guid(request.AssemblyGuid), + string.IsNullOrEmpty(request.AssemblyGuid) ? Guid.Empty : Guid.Parse(request.AssemblyGuid), string.IsNullOrEmpty(request.Version) ? null : Version.Parse(request.Version), request.UpdateClass).FirstOrDefault(); -- cgit v1.2.3 From 2c0259f920406b67569457f5bed844339d0d1c9b Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Thu, 12 Dec 2019 16:57:16 +0100 Subject: Replace '_' with ':' in config keys --- Emby.Server.Implementations/ConfigurationOptions.cs | 4 ++-- Emby.Server.Implementations/HttpServer/HttpListenerHost.cs | 2 +- MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs | 4 ++-- MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/ConfigurationOptions.cs b/Emby.Server.Implementations/ConfigurationOptions.cs index a55a9eb2d..2ea7ff6e9 100644 --- a/Emby.Server.Implementations/ConfigurationOptions.cs +++ b/Emby.Server.Implementations/ConfigurationOptions.cs @@ -7,8 +7,8 @@ namespace Emby.Server.Implementations { public static Dictionary Configuration => new Dictionary { - { "HttpListenerHost_DefaultRedirectPath", "web/index.html" }, - { "MusicBrainz_BaseUrl", "https://www.musicbrainz.org" }, + { "HttpListenerHost:DefaultRedirectPath", "web/index.html" }, + { "MusicBrainz:BaseUrl", "https://www.musicbrainz.org" }, { FfmpegProbeSizeKey, "1G" }, { FfmpegAnalyzeDurationKey, "200M" } }; diff --git a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs index b77c53d87..2aefc9fe5 100644 --- a/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/Emby.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -57,7 +57,7 @@ namespace Emby.Server.Implementations.HttpServer _appHost = applicationHost; _logger = logger; _config = config; - _defaultRedirectPath = configuration["HttpListenerHost_DefaultRedirectPath"]; + _defaultRedirectPath = configuration["HttpListenerHost:DefaultRedirectPath"]; _baseUrlPrefix = _config.Configuration.BaseUrl; _networkManager = networkManager; _jsonSerializer = jsonSerializer; diff --git a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs index 4048207bd..7ab62b262 100644 --- a/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs +++ b/MediaBrowser.Controller/Extensions/ConfigurationExtensions.cs @@ -10,12 +10,12 @@ namespace MediaBrowser.Controller.Extensions /// /// The key for the FFmpeg probe size option. /// - public const string FfmpegProbeSizeKey = "FFmpeg_probesize"; + public const string FfmpegProbeSizeKey = "FFmpeg:probesize"; /// /// The key for the FFmpeg analyse duration option. /// - public const string FfmpegAnalyzeDurationKey = "FFmpeg_analyzeduration"; + public const string FfmpegAnalyzeDurationKey = "FFmpeg:analyzeduration"; /// /// Retrieves the FFmpeg probe size from the . diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs index e9ca7938e..8e71b625e 100644 --- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs +++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs @@ -57,7 +57,7 @@ namespace MediaBrowser.Providers.Music _appHost = appHost; _logger = logger; - _musicBrainzBaseUrl = configuration["MusicBrainz_BaseUrl"]; + _musicBrainzBaseUrl = configuration["MusicBrainz:BaseUrl"]; // Use a stopwatch to ensure we don't exceed the MusicBrainz rate limit _stopWatchMusicBrainz.Start(); -- cgit v1.2.3 From a4ca259a64d12629d88a1c801c4bc869c8a5d44b Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Thu, 12 Dec 2019 17:25:58 +0100 Subject: Add improved error error for #2141 --- Emby.Server.Implementations/LiveTv/LiveTvManager.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index 2ecf4e184..ee7db1413 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -304,9 +304,12 @@ namespace Emby.Server.Implementations.LiveTv } private ILiveTvService GetService(string name) - { - return _services.FirstOrDefault(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase)); - } + => Array.Find(_services, x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase)) + ?? throw new KeyNotFoundException( + string.Format( + CultureInfo.InvariantCulture, + "No service with the name '{0}' can be found.", + name)); private static void Normalize(MediaSourceInfo mediaSource, ILiveTvService service, bool isVideo) { -- cgit v1.2.3 From 6231fc18eac67966340fddc121dc2895fd99ab5e Mon Sep 17 00:00:00 2001 From: Cromefire_ <26320625+cromefire@users.noreply.github.com> Date: Fri, 13 Dec 2019 15:27:12 +0100 Subject: Fixed invalid username handling --- Emby.Server.Implementations/Session/SessionManager.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index b87ca3a11..80079ae6c 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1393,6 +1393,13 @@ namespace Emby.Server.Implementations.Session } } + if (user == null) + { + AuthenticationFailed?.Invoke(this, new GenericEventArgs(request)); + + throw new SecurityException("Invalid user or password entered."); + } + if (enforcePassword) { user = await _userManager.AuthenticateUser( @@ -1403,13 +1410,6 @@ namespace Emby.Server.Implementations.Session true).ConfigureAwait(false); } - if (user == null) - { - AuthenticationFailed?.Invoke(this, new GenericEventArgs(request)); - - throw new SecurityException("Invalid user or password entered."); - } - var token = GetAuthorizationToken(user, request.DeviceId, request.App, request.AppVersion, request.DeviceName); var session = LogSessionActivity( -- cgit v1.2.3 From 7e987b9642fd1826b9adb8dc6e208454c44da4dc Mon Sep 17 00:00:00 2001 From: Cromefire_ <26320625+cromefire@users.noreply.github.com> Date: Fri, 13 Dec 2019 15:30:08 +0100 Subject: Remove whitespace Co-Authored-By: Claus Vium --- Emby.Server.Implementations/Session/SessionManager.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 80079ae6c..367e1d498 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -1396,7 +1396,6 @@ namespace Emby.Server.Implementations.Session if (user == null) { AuthenticationFailed?.Invoke(this, new GenericEventArgs(request)); - throw new SecurityException("Invalid user or password entered."); } -- cgit v1.2.3 From c36467c4966b79162d11d75a7dd65f5586dfb027 Mon Sep 17 00:00:00 2001 From: Óskar Freyr Date: Wed, 11 Dec 2019 00:15:47 +0000 Subject: Translated using Weblate (Icelandic) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/is/ --- .../Localization/Core/is.json | 44 +++++++++++++++++++--- 1 file changed, 38 insertions(+), 6 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/is.json b/Emby.Server.Implementations/Localization/Core/is.json index 982232afd..af0da4169 100644 --- a/Emby.Server.Implementations/Localization/Core/is.json +++ b/Emby.Server.Implementations/Localization/Core/is.json @@ -7,11 +7,11 @@ "HeaderRecordingGroups": "Upptökuhópar", "HeaderNextUp": "Næst á dagskrá", "HeaderLiveTV": "Sjónvarp í beinni útsendingu", - "HeaderFavoriteSongs": "Uppáhalds lög", - "HeaderFavoriteShows": "Uppáhalds sjónvarpsþættir", - "HeaderFavoriteEpisodes": "Uppáhalds þættir", - "HeaderFavoriteArtists": "Uppáhalds listamenn", - "HeaderFavoriteAlbums": "Uppáhalds plötur", + "HeaderFavoriteSongs": "Uppáhalds Lög", + "HeaderFavoriteShows": "Uppáhalds Sjónvarpsþættir", + "HeaderFavoriteEpisodes": "Uppáhalds Þættir", + "HeaderFavoriteArtists": "Uppáhalds Listamenn", + "HeaderFavoriteAlbums": "Uppáhalds Plötur", "HeaderContinueWatching": "Halda áfram að horfa", "HeaderCameraUploads": "Myndavéla upphal", "HeaderAlbumArtists": "Höfundur plötu", @@ -30,5 +30,37 @@ "Artists": "Listamaður", "Application": "Forrit", "AppDeviceValues": "Snjallforrit: {0}, Tæki: {1}", - "Albums": "Plötur" + "Albums": "Plötur", + "Plugin": "Viðbót", + "Photos": "Myndir", + "NotificationOptionVideoPlaybackStopped": "Myndbandafspilun stöðvuð", + "NotificationOptionVideoPlayback": "Myndbandafspilun hafin", + "NotificationOptionUserLockedOut": "Notandi læstur úti", + "NotificationOptionServerRestartRequired": "Endurræsing miðlara nauðsynileg", + "NotificationOptionPluginUpdateInstalled": "Viðbótar uppfærsla uppsett", + "NotificationOptionPluginUninstalled": "Viðbót fjarlægð", + "NotificationOptionPluginInstalled": "Viðbót settur upp", + "NotificationOptionPluginError": "Bilun í viðbót", + "NotificationOptionInstallationFailed": "Uppsetning tókst ekki", + "NotificationOptionCameraImageUploaded": "Myndavélarmynd hlaðið upp", + "NotificationOptionAudioPlaybackStopped": "Hljóðafspilun stöðvuð", + "NotificationOptionAudioPlayback": "Hljóðafspilun hafin", + "NotificationOptionApplicationUpdateInstalled": "Uppfærsla uppsett", + "NotificationOptionApplicationUpdateAvailable": "Uppfærsla í boði", + "NameSeasonUnknown": "Sería óþekkt", + "NameSeasonNumber": "Sería {0}", + "MixedContent": "Blandað efni", + "MessageServerConfigurationUpdated": "Stillingar miðlarans hefur verið uppfærð", + "MessageApplicationUpdatedTo": "Jellyfin Server hefur verið uppfærður í {0}", + "MessageApplicationUpdated": "Jellyfin Server hefur verið uppfærður", + "Latest": "Nýjasta", + "LabelRunningTimeValue": "Keyrslutími kerfis: {0}", + "User": "Notandi", + "System": "Kerfi", + "NotificationOptionNewLibraryContent": "Nýju efni bætt við", + "NewVersionIsAvailable": "Ný útgáfa af Jellyfin Server er fáanleg til niðurhals.", + "NameInstallFailed": "{0} uppsetning mistókst", + "MusicVideos": "Tónlistarmyndbönd", + "Music": "Tónlist", + "Movies": "Kvikmyndir" } -- cgit v1.2.3 From 02928128b998608e0a6fd2f8ac611be5961fa78f Mon Sep 17 00:00:00 2001 From: dkanada Date: Sat, 14 Dec 2019 11:36:06 +0900 Subject: track progress for any item that supports the feature --- Emby.Server.Implementations/Library/UserDataManager.cs | 8 +++----- Emby.Server.Implementations/Session/SessionManager.cs | 8 ++------ 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Library/UserDataManager.cs b/Emby.Server.Implementations/Library/UserDataManager.cs index 48d33c26c..071681b08 100644 --- a/Emby.Server.Implementations/Library/UserDataManager.cs +++ b/Emby.Server.Implementations/Library/UserDataManager.cs @@ -226,24 +226,21 @@ namespace Emby.Server.Implementations.Library { var pctIn = decimal.Divide(positionTicks, runtimeTicks) * 100; - // Don't track in very beginning if (pctIn < _config.Configuration.MinResumePct) { + // ignore progress during the beginning positionTicks = 0; } - - // If we're at the end, assume completed else if (pctIn > _config.Configuration.MaxResumePct || positionTicks >= runtimeTicks) { + // mark as completed close to the end positionTicks = 0; data.Played = playedToCompletion = true; } - else { // Enforce MinResumeDuration var durationSeconds = TimeSpan.FromTicks(runtimeTicks).TotalSeconds; - if (durationSeconds < _config.Configuration.MinResumeDurationSeconds) { positionTicks = 0; @@ -263,6 +260,7 @@ namespace Emby.Server.Implementations.Library positionTicks = 0; data.Played = false; } + if (!item.SupportsPositionTicksResume) { positionTicks = 0; diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index b87ca3a11..34ffceebd 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -667,12 +667,9 @@ namespace Emby.Server.Implementations.Session data.PlayCount++; data.LastPlayedDate = DateTime.UtcNow; - if (item.SupportsPlayedStatus) + if (item.SupportsPlayedStatus && !item.SupportsPositionTicksResume) { - if (!(item is Video)) - { - data.Played = true; - } + data.Played = true; } else { @@ -769,7 +766,6 @@ namespace Emby.Server.Implementations.Session { _userDataManager.SaveUserData(user, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None); } - } private static bool UpdatePlaybackSettings(User user, PlaybackProgressInfo info, UserItemData data) -- cgit v1.2.3 From c824c564cdd1d59b04ae64df4400a90e2944ee8f Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Sat, 14 Dec 2019 06:45:29 +0100 Subject: Move Emby.XmlTv to a NuGet package (#2042) * Move Emby.XmlTv to a NuGet package * Update Emby.Server.Implementations/Emby.Server.Implementations.csproj Co-Authored-By: Anthony Lavado --- .../Emby.Server.Implementations.csproj | 2 +- .../LiveTv/Listings/XmlTvListingsProvider.cs | 4 +- Emby.XmlTv/.gitattributes | 63 -- Emby.XmlTv/.gitignore | 212 ---- Emby.XmlTv/Emby.XmlTv.Console/App.config | 6 - .../Emby.XmlTv.Console/Classes/EntityExtensions.cs | 58 - .../Emby.XmlTv.Console/Emby.XmlTv.Console.csproj | 22 - Emby.XmlTv/Emby.XmlTv.Console/Program.cs | 103 -- .../Emby.XmlTv.Console/Properties/AssemblyInfo.cs | 36 - Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj | 124 --- .../Emby.XmlTv.Test/Properties/AssemblyInfo.cs | 36 - .../Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs | 91 -- .../Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs | 181 ---- Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs | 219 ---- Emby.XmlTv/Emby.XmlTv.sln | 44 - Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs | 1107 -------------------- Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj | 13 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs | 50 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs | 13 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs | 17 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs | 52 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs | 27 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs | 15 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs | 13 - Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs | 93 -- Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs | 40 - Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs | 21 - Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd | 575 ---------- Emby.XmlTv/License.txt | 21 - Emby.XmlTv/Nuget/Emby.XmlTv.nuspec | 20 - Emby.XmlTv/README.md | 1 - MediaBrowser.sln | 6 - 32 files changed, 3 insertions(+), 3282 deletions(-) delete mode 100644 Emby.XmlTv/.gitattributes delete mode 100644 Emby.XmlTv/.gitignore delete mode 100644 Emby.XmlTv/Emby.XmlTv.Console/App.config delete mode 100644 Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj delete mode 100644 Emby.XmlTv/Emby.XmlTv.Console/Program.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj delete mode 100644 Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv.sln delete mode 100644 Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs delete mode 100644 Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd delete mode 100644 Emby.XmlTv/License.txt delete mode 100644 Emby.XmlTv/Nuget/Emby.XmlTv.nuspec delete mode 100644 Emby.XmlTv/README.md (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj index fde4d7059..4b6ba1fab 100644 --- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj +++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj @@ -15,12 +15,12 @@ - + diff --git a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs index 88693f22a..1f38de2d8 100644 --- a/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs +++ b/Emby.Server.Implementations/LiveTv/Listings/XmlTvListingsProvider.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using Emby.XmlTv.Classes; -using Emby.XmlTv.Entities; +using Jellyfin.XmlTv; +using Jellyfin.XmlTv.Entities; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Configuration; diff --git a/Emby.XmlTv/.gitattributes b/Emby.XmlTv/.gitattributes deleted file mode 100644 index 1ff0c4230..000000000 --- a/Emby.XmlTv/.gitattributes +++ /dev/null @@ -1,63 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain diff --git a/Emby.XmlTv/.gitignore b/Emby.XmlTv/.gitignore deleted file mode 100644 index b06e864a3..000000000 --- a/Emby.XmlTv/.gitignore +++ /dev/null @@ -1,212 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -build/ -bld/ -[Bb]in/ -[Oo]bj/ - -# Visual Studio 2015 cache/options directory -.vs/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opensdf -*.sdf -*.cachefile - -# Visual Studio profiler -*.psess -*.vsp -*.vspx - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -## TODO: Comment the next line if you want to checkin your -## web deploy settings but do note that will include unencrypted -## passwords -#*.pubxml - -*.publishproj - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config - -# Windows Azure Build Output -csx/ -*.build.csdef - -# Windows Store app package directory -AppPackages/ - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -[Ss]tyle[Cc]op.* -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# LightSwitch generated files -GeneratedArtifacts/ -_Pvt_Extensions/ -ModelManifest.xml diff --git a/Emby.XmlTv/Emby.XmlTv.Console/App.config b/Emby.XmlTv/Emby.XmlTv.Console/App.config deleted file mode 100644 index 2d2a12d81..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Console/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs b/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs deleted file mode 100644 index 96e508f12..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Console/Classes/EntityExtensions.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Linq; -using System.Text; - -using Emby.XmlTv.Entities; - -namespace Emby.XmlTv.Console.Classes -{ - public static class EntityExtensions - { - public static string GetHeader(this string text) - { - var channelHeaderString = " " + text; - - var builder = new StringBuilder(); - builder.AppendLine("".PadRight(5 + channelHeaderString.Length + 5, Char.Parse("*"))); - builder.AppendLine("".PadRight(5, Char.Parse("*")) + channelHeaderString + "".PadRight(5, Char.Parse("*"))); - builder.AppendLine("".PadRight(5 + channelHeaderString.Length + 5, Char.Parse("*"))); - - return builder.ToString(); - } - - public static string GetChannelDetail(this XmlTvChannel channel) - { - var builder = new StringBuilder(); - builder.AppendFormat("Id: {0}\r\n", channel.Id); - builder.AppendFormat("Display-Name: {0}\r\n", channel.DisplayName); - builder.AppendFormat("Url: {0}\r\n", channel.Url); - builder.AppendFormat("Icon: {0}\r\n", channel.Icon != null ? channel.Icon.ToString() : string.Empty); - builder.AppendLine("-------------------------------------------------------"); - - return builder.ToString(); - } - - public static string GetProgrammeDetail(this XmlTvProgram programme, XmlTvChannel channel) - { - var builder = new StringBuilder(); - builder.AppendFormat("Channel: {0} - {1}\r\n", channel.Id, channel.DisplayName); - builder.AppendFormat("Start Date: {0:G}\r\n", programme.StartDate); - builder.AppendFormat("End Date: {0:G}\r\n", programme.EndDate); - builder.AppendFormat("Name: {0}\r\n", programme.Title); - builder.AppendFormat("Episode Detail: {0}\r\n", programme.Episode); - builder.AppendFormat("Episode Title: {0}\r\n", programme.Episode.Title); - builder.AppendFormat("Description: {0}\r\n", programme.Description); - builder.AppendFormat("Categories: {0}\r\n", string.Join(", ", programme.Categories)); - builder.AppendFormat("Countries: {0}\r\n", string.Join(", ", programme.Countries)); - builder.AppendFormat("Credits: {0}\r\n", string.Join(", ", programme.Credits)); - builder.AppendFormat("Rating: {0}\r\n", programme.Rating); - builder.AppendFormat("Star Rating: {0}\r\n", programme.StarRating.HasValue ? programme.StarRating.Value.ToString() : string.Empty); - builder.AppendFormat("Previously Shown: {0:G}\r\n", programme.PreviouslyShown); - builder.AppendFormat("Copyright Date: {0:G}\r\n", programme.CopyrightDate); - builder.AppendFormat("Is Repeat: {0}\r\n", programme.IsPreviouslyShown); - builder.AppendFormat("Icon: {0}\r\n", programme.Icon != null ? programme.Icon.ToString() : string.Empty); - builder.AppendLine("-------------------------------------------------------"); - return builder.ToString(); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj b/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj deleted file mode 100644 index c10b28e82..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Console/Emby.XmlTv.Console.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - {0d023565-5942-4d79-9098-a1b4b6665a40} - Emby.XmlTv - - - - netcoreapp2.1 - false - - - diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs b/Emby.XmlTv/Emby.XmlTv.Console/Program.cs deleted file mode 100644 index 3e0c7d125..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Console/Program.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - -using Emby.XmlTv.Classes; -using Emby.XmlTv.Console.Classes; -using Emby.XmlTv.Entities; - -namespace Emby.XmlTv.Console -{ - public class Program - { - static void Main(string[] args) - { - var filename = @"C:\Temp\QLD.GoldCoast.xml"; - - if (args.Length == 1 && File.Exists(args[0])) - { - filename = args[0]; - } - - var timer = Stopwatch.StartNew(); - System.Console.WriteLine("Running XMLTv Parsing"); - - var resultsFile = String.Format("C:\\Temp\\{0}_Results_{1:HHmmss}.txt", - Path.GetFileNameWithoutExtension(filename), - DateTimeOffset.UtcNow); - - System.Console.Write("Enter the language required: "); - var lang = System.Console.ReadLine(); - - ReadSourceXmlTvFile(filename, resultsFile, lang).Wait(); - - System.Console.WriteLine("Completed in {0:g} - press any key to open the file...", timer.Elapsed); - System.Console.ReadKey(); - - Process.Start(resultsFile); - } - - public static async Task ReadSourceXmlTvFile(string filename, string resultsFile, string lang) - { - System.Console.WriteLine("Writing to file: {0}", resultsFile); - - using (var resultsFileStream = new StreamWriter(resultsFile) { AutoFlush = true }) - { - var reader = new XmlTvReader(filename, lang); - await ReadOutChannels(reader, resultsFileStream); - - resultsFileStream.Close(); - } - } - - public static async Task ReadOutChannels(XmlTvReader reader, StreamWriter resultsFileStream) - { - var channels = reader.GetChannels().Distinct().ToList(); - - resultsFileStream.Write(EntityExtensions.GetHeader("Channels")); - - foreach (var channel in channels) - { - System.Console.WriteLine("Retrieved Channel: {0} - {1}", channel.Id, channel.DisplayName); - resultsFileStream.Write(channel.GetChannelDetail()); - } - - var totalProgrammeCount = 0; - - resultsFileStream.Write("\r\n"); - foreach (var channel in channels) - { - System.Console.WriteLine("Processing Channel: {0}", channel.DisplayName); - - resultsFileStream.Write(EntityExtensions.GetHeader("Programs for " + channel.DisplayName)); - var channelProgrammeCount = await ReadOutChannelProgrammes(reader, channel, resultsFileStream); - - totalProgrammeCount += channelProgrammeCount; - await resultsFileStream.WriteLineAsync(String.Format("Total Programmes for {1}: {0}", channelProgrammeCount, channel.DisplayName)); - } - - await resultsFileStream.WriteLineAsync(String.Format("Total Programmes: {0}", totalProgrammeCount)); - } - - private static async Task ReadOutChannelProgrammes(XmlTvReader reader, XmlTvChannel channel, StreamWriter resultsFileStream) - { - //var startDate = new DateTime(2015, 11, 28); - //var endDate = new DateTime(2015, 11, 29); - var startDate = DateTimeOffset.MinValue; - var endDate = DateTimeOffset.MaxValue; - - var count = 0; - - foreach (var programme in reader.GetProgrammes(channel.Id, startDate, endDate, new CancellationToken()).Distinct()) - { - count++; - await resultsFileStream.WriteLineAsync(programme.GetProgrammeDetail(channel)); - } - - return count; - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs deleted file mode 100644 index ff59f890f..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Console/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Emby.XmlTv.Console")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Emby.XmlTv.Console")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("add1d993-6d74-480a-b1fc-7fd9fd05a769")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj b/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj deleted file mode 100644 index d7c4ad0b7..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Test/Emby.XmlTv.Test.csproj +++ /dev/null @@ -1,124 +0,0 @@ - - - - Debug - AnyCPU - {C8298223-2468-466C-9B06-FBF61926CECB} - Library - Properties - Emby.XmlTv.Test - Emby.XmlTv.Test - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - False - - - - - - - - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Designer - - - - - {0D023565-5942-4D79-9098-A1B4B6665A40} - Emby.XmlTv - - - - - - - False - - - False - - - False - - - False - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - netstandard2.0 - false - - diff --git a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 902860363..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Emby.XmlTv.Test")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Emby.XmlTv.Test")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c8298223-2468-466c-9b06-fbf61926cecb")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs deleted file mode 100644 index 857cc339c..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderDateTimeTests.cs +++ /dev/null @@ -1,91 +0,0 @@ -using System; -using System.IO; - -using Emby.XmlTv.Classes; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Emby.XmlTv.Test -{ - [TestClass] - public class XmlTvReaderDateTimeTests - { - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_HandlePartDates() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); - - Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("2016")); - Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("201601")); - Assert.AreEqual(Parse("01 Jan 2016 00:00:00"), reader.ParseDate("20160101")); - Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("2016010112")); - Assert.AreEqual(Parse("01 Jan 2016 12:34:00"), reader.ParseDate("201601011234")); - Assert.AreEqual(Parse("01 Jan 2016 12:34:56"), reader.ParseDate("20160101123456")); - } - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_HandleDateWithOffset() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); - - // parse variations on 1:00AM - Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +0000")); - Assert.AreEqual(Parse("01 Jan 2016 02:00:00"), reader.ParseDate("20160101120000 +1000")); - Assert.AreEqual(Parse("01 Jan 2016 11:00:00"), reader.ParseDate("20160101120000 +0100")); - Assert.AreEqual(Parse("01 Jan 2016 11:50:00"), reader.ParseDate("20160101120000 +0010")); - Assert.AreEqual(Parse("01 Jan 2016 11:59:00"), reader.ParseDate("20160101120000 +0001")); - - Assert.AreEqual(Parse("01 Jan 2016 22:00:00"), reader.ParseDate("20160101120000 -1000")); - Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("20160101120000 -0100")); - Assert.AreEqual(Parse("01 Jan 2016 12:10:00"), reader.ParseDate("20160101120000 -0010")); - Assert.AreEqual(Parse("01 Jan 2016 12:01:00"), reader.ParseDate("20160101120000 -0001")); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_HandlePartDatesWithOffset() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); - - Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("2016 -0100")); - Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("201601 -0100")); - Assert.AreEqual(Parse("01 Jan 2016 01:00:00"), reader.ParseDate("20160101 -0100")); - Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("2016010112 -0100")); - Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("201601011200 -0100")); - Assert.AreEqual(Parse("01 Jan 2016 13:00:00"), reader.ParseDate("20160101120000 -0100")); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_HandleSpaces() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); - - // parse variations on 1:00AM - Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +000")); - Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +00")); - Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 +0")); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_HandleSpaces2() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); - - // parse variations on 1:00AM - Assert.AreEqual(Parse("01 Jan 2016 12:00:00"), reader.ParseDate("20160101120000 0")); - } - - private DateTimeOffset Parse(string value) - { - return new DateTimeOffset(DateTimeOffset.Parse(value).Ticks, TimeSpan.Zero); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs deleted file mode 100644 index 32a0431d2..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderLanguageTests.cs +++ /dev/null @@ -1,181 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Threading; - -using Emby.XmlTv.Classes; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Emby.XmlTv.Test -{ - [TestClass] - public class XmlTvReaderLanguageTests - { - /* Homes Under the Hammer - Spanish - * Homes Under the Hammer - Spanish 2 - * Homes Under the Hammer - English - * Homes Under the Hammer - English 2 - * Homes Under the Hammer - Empty Language - * Homes Under the Hammer - Empty Language 2 - * Homes Under the Hammer - No Language - * Homes Under the Hammer - No Language 2 - */ - - /* Expected Behaviour: - * - Language = Null Homes Under the Hammer - No Language - * - Language = "" Homes Under the Hammer - No Language - * - Language = es Homes Under the Hammer - Spanish - * - Language = en Homes Under the Hammer - English - */ - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_The_First_Matching_Language_ES() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); - var channel = reader.GetChannels().FirstOrDefault(); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); - - Assert.IsNotNull(programme); - Assert.AreEqual("Homes Under the Hammer - Spanish", programme.Title); - Assert.AreEqual(1, programme.Categories.Count); - Assert.AreEqual("Property - Spanish", programme.Categories[0]); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_The_First_Matching_Language_EN() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "en"); - - var channel = reader.GetChannels().FirstOrDefault(); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); - - Assert.IsNotNull(programme); - Assert.AreEqual("Homes Under the Hammer - English", programme.Title); - Assert.AreEqual(1, programme.Categories.Count); - Assert.AreEqual("Property - English", programme.Categories[0]); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_The_First_Matching_With_No_Language() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, null); - - var channel = reader.GetChannels().FirstOrDefault(); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); - - Assert.IsNotNull(programme); - Assert.AreEqual("Homes Under the Hammer - No Language", programme.Title); - Assert.AreEqual(1, programme.Categories.Count); - Assert.AreEqual("Property - No Language", programme.Categories[0]); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_The_First_Matching_With_Empty_Language() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, String.Empty); - - var channel = reader.GetChannels().FirstOrDefault(); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).FirstOrDefault(); - - Assert.IsNotNull(programme); - Assert.AreEqual("Homes Under the Hammer - Empty Language", programme.Title); - Assert.AreEqual(1, programme.Categories.Count); - Assert.AreEqual("Property - Empty Language", programme.Categories[0]); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_The_First_When_NoMatchFound() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); // There are no titles or categories for spanish - - var channel = reader.GetChannels().FirstOrDefault(); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).Skip(1).FirstOrDefault(); - - Assert.IsNotNull(programme); - Assert.AreEqual("Homes Under the Hammer - English", programme.Title); - - // Should return all categories - Assert.AreEqual(2, programme.Categories.Count); - Assert.IsTrue(programme.Categories.Contains("Property - English")); - Assert.IsTrue(programme.Categories.Contains("Property - Empty Language")); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_The_First_When_NoLanguage() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile, null); - - var channel = reader.GetChannels().FirstOrDefault(); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programme = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).Skip(1).FirstOrDefault(); - - Assert.IsNotNull(programme); - Assert.AreEqual("Homes Under the Hammer - English", programme.Title); // Should return the first in the list - - // Should return all categories - Assert.AreEqual(2, programme.Categories.Count); - Assert.IsTrue(programme.Categories.Contains("Property - English")); - Assert.IsTrue(programme.Categories.Contains("Property - Empty Language")); - } - - [TestMethod] - [DeploymentItem("Xml Files\\MultilanguageData.xml")] - public void Should_Return_All_Languages() - { - var testFile = Path.GetFullPath(@"MultilanguageData.xml"); - var reader = new XmlTvReader(testFile); - var cancellationToken = new CancellationToken(); - - var results = reader.GetLanguages(cancellationToken); - Assert.IsNotNull(results); - - foreach (var result in results) - { - Console.WriteLine("{0} - {1}", result.Name, result.Relevance); - } - - Assert.AreEqual(2, results.Count); - Assert.AreEqual("en", results[0].Name); - Assert.AreEqual(11, results[0].Relevance); - Assert.AreEqual("es", results[1].Name); - Assert.AreEqual(3, results[1].Relevance); - } - - } -} diff --git a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs b/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs deleted file mode 100644 index b1dffc59c..000000000 --- a/Emby.XmlTv/Emby.XmlTv.Test/XmlTvReaderTests.cs +++ /dev/null @@ -1,219 +0,0 @@ -using System; -using System.IO; -using System.Linq; -using System.Threading; - -using Emby.XmlTv.Classes; - -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace Emby.XmlTv.Test -{ - [TestClass] - public class XmlTvReaderTests - { - [TestMethod] - [DeploymentItem("Xml Files\\UK_Data.xml")] - public void UK_DataTest_ChannelsTest() - { - var testFile = Path.GetFullPath(@"UK_Data.xml"); - var reader = new XmlTvReader(testFile); - - var channels = reader.GetChannels().ToList(); - Assert.AreEqual(5, channels.Count); - - // Check each channel - var channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2667"); - Assert.IsNotNull(channel); - Assert.AreEqual("BBC1 HD", channel.DisplayName); - Assert.AreEqual("7.1", channel.Number); - Assert.IsNotNull(channel.Icon); - Assert.AreEqual("Logo_UK_RT_2667", channel.Icon.Source); - Assert.AreEqual(100, channel.Icon.Width); - Assert.AreEqual(200, channel.Icon.Height); - - channel = channels.SingleOrDefault(c => c.Id == "UK_RT_105"); - Assert.IsNotNull(channel); - Assert.AreEqual("BBC2", channel.DisplayName); - Assert.IsNotNull(channel.Icon); - Assert.AreEqual("Logo_UK_RT_105", channel.Icon.Source); - Assert.IsFalse(channel.Icon.Width.HasValue); - Assert.IsFalse(channel.Icon.Height.HasValue); - - channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2118"); - Assert.IsNotNull(channel); - Assert.AreEqual("ITV1 HD", channel.DisplayName); - Assert.IsNotNull(channel.Icon); - Assert.AreEqual("Logo_UK_RT_2118", channel.Icon.Source); - Assert.AreEqual(100, channel.Icon.Width); - Assert.IsFalse(channel.Icon.Height.HasValue); - - channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2056"); - Assert.IsNotNull(channel); - Assert.AreEqual("Channel 4 HD", channel.DisplayName); - Assert.IsNotNull(channel.Icon); - Assert.AreEqual("Logo_UK_RT_2056", channel.Icon.Source); - Assert.IsFalse(channel.Icon.Width.HasValue); - Assert.AreEqual(200, channel.Icon.Height); - - channel = channels.SingleOrDefault(c => c.Id == "UK_RT_134"); - Assert.IsNotNull(channel); - Assert.AreEqual("Channel 5", channel.DisplayName); - Assert.IsNull(channel.Icon); - } - - [TestMethod] - [DeploymentItem("Xml Files\\UK_Data.xml")] - public void UK_DataTest_GeneralTest() - { - var testFile = Path.GetFullPath(@"UK_Data.xml"); - var reader = new XmlTvReader(testFile, null); - - var channels = reader.GetChannels().ToList(); - Assert.AreEqual(5, channels.Count); - - // Pick a channel to check the data for - var channel = channels.SingleOrDefault(c => c.Id == "UK_RT_2056"); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programmes = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).ToList(); - - Assert.AreEqual(27, programmes.Count); - var programme = programmes.SingleOrDefault(p => p.Title == "The Secret Life of"); - - Assert.IsNotNull(programme); - Assert.AreEqual(new DateTime(2015, 11, 26, 20, 0, 0), programme.StartDate); - Assert.AreEqual(new DateTime(2015, 11, 26, 21, 0, 0), programme.EndDate); - Assert.AreEqual("Cameras follow the youngsters' development after two weeks apart and time has made the heart grow fonder for Alfie and Emily, who are clearly happy to be back together. And although Alfie struggled to empathise with the rest of his peers before, a painting competition proves to be a turning point for him. George takes the children's rejection of his family recipe to heart, but goes on to triumph elsewhere, and romance is in the air when newcomer Sienna captures Arthur's heart.", programme.Description); - Assert.AreEqual("Documentary", programme.Categories.Single()); - Assert.IsNotNull(programme.Episode); - Assert.AreEqual("The Secret Life of 5 Year Olds", programme.Episode.Title); - Assert.AreEqual(1, programme.Episode.Series); - Assert.IsNull(programme.Episode.SeriesCount); - Assert.AreEqual(4, programme.Episode.Episode); - Assert.AreEqual(6, programme.Episode.EpisodeCount); - Assert.IsNotNull(programme.Premiere); - //Assert.AreEqual("First showing on national terrestrial TV", programme.Premiere.Details); - Assert.IsTrue(programme.IsNew); - } - - [TestMethod] - [DeploymentItem("Xml Files\\UK_Data.xml")] - public void UK_DataTest_MultipleTitles_SameLanguage_Should_ReturnFirstValue() - { - var testFile = Path.GetFullPath(@"UK_Data.xml"); - var reader = new XmlTvReader(testFile, null); - - /* - Homes Under the Hammer - Title 1 - Homes Under the Hammer - Title 2 - Homes Under the Hammer - Title 3 - */ - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programmes = reader.GetProgrammes("UK_RT_2667", startDate, startDate.AddDays(1), cancellationToken).ToList(); - var programme = programmes.SingleOrDefault(p => p.Title == "Homes Under the Hammer - Title 1"); - - Assert.IsNotNull(programme); - } - - [TestMethod] - [DeploymentItem("Xml Files\\UK_Data.xml")] - public void UK_DataTest_MultipleTitles_NoLanguage_Should_ReturnFirstValue() - { - var testFile = Path.GetFullPath(@"UK_Data.xml"); - var reader = new XmlTvReader(testFile, null); - - /* - Oxford Street Revealed - Title 1 - Oxford Street Revealed - Title 2 - Oxford Street Revealed - Title 3 - */ - - var startDate = new DateTime(2015, 11, 26); - var cancellationToken = new CancellationToken(); - var programmes = reader.GetProgrammes("UK_RT_2667", startDate, startDate.AddDays(1), cancellationToken).ToList(); - var programme = programmes.SingleOrDefault(p => p.Title == "Oxford Street Revealed - Title 1"); - - Assert.IsNotNull(programme); - } - - [TestMethod] - [DeploymentItem("Xml Files\\ES_MultiLanguageData.xml")] - public void ES_MultiLanguageDataTest() - { - var testFile = Path.GetFullPath(@"ES_MultiLanguageData.xml"); - var reader = new XmlTvReader(testFile, "es"); // Specify the spanish language explicitly - - var channels = reader.GetChannels().ToList(); - Assert.AreEqual(141, channels.Count); - - // Pick a channel to check the data for - var channel = channels.SingleOrDefault(c => c.Id == "Canal + HD" && c.DisplayName == "Canal + HD"); - Assert.IsNotNull(channel); - - var startDate = new DateTime(2016, 02, 18); - var cancellationToken = new CancellationToken(); - var programmes = reader.GetProgrammes(channel.Id, startDate, startDate.AddDays(1), cancellationToken).ToList(); - - Assert.AreEqual(22, programmes.Count); - var programme = programmes.SingleOrDefault(p => p.Title == "This is Comedy. Judd Apatow & Co."); - - /* - - This is Comedy. Judd Apatow & Co. - This is Comedy - El resurgir creativo de la comedia estadounidense en los últimos 15 años ha tenido un nombre indiscutible, Judd Apatow, y unos colaboradores indispensables, sus amigos (actores, cómicos, escritores) Jonah Hill, Steve Carrell, Paul Rudd, Seth Rogen, Lena Dunham... A través de extractos de sus filmes y de entrevistas a algunos los miembros de su 'banda' (Adam Sandler, Lena Dunham o Jason Segel), este documental muestra la carrera de un productor y director excepcional que ha sido capaz de llevar la risa a su máxima expresión - - Jacky Goldberg - - 2014 - Documentales - Sociedad - - Francia - - TV-G - - - 3/5 - - - */ - - Assert.IsNotNull(programme); - Assert.AreEqual(new DateTime(2016, 02, 18, 4, 51, 0), programme.StartDate); - Assert.AreEqual(new DateTime(2016, 02, 18, 5, 54, 0), programme.EndDate); - Assert.AreEqual("El resurgir creativo de la comedia estadounidense en los últimos 15 años ha tenido un nombre indiscutible, Judd Apatow, y unos colaboradores indispensables, sus amigos (actores, cómicos, escritores) Jonah Hill, Steve Carrell, Paul Rudd, Seth Rogen, Lena Dunham... A través de extractos de sus filmes y de entrevistas a algunos los miembros de su 'banda' (Adam Sandler, Lena Dunham o Jason Segel), este documental muestra la carrera de un productor y director excepcional que ha sido capaz de llevar la risa a su máxima expresión", programme.Description); - Assert.AreEqual(2, programme.Categories.Count); - Assert.AreEqual("Documentales", programme.Categories[0]); - Assert.AreEqual("Sociedad", programme.Categories[1]); - Assert.IsNotNull(programme.Episode); - Assert.IsNull(programme.Episode.Episode); - Assert.IsNull(programme.Episode.EpisodeCount); - Assert.IsNull(programme.Episode.Part); - Assert.IsNull(programme.Episode.PartCount); - Assert.IsNull(programme.Episode.Series); - Assert.IsNull(programme.Episode.SeriesCount); - Assert.IsNull(programme.Episode.Title); - } - - [TestMethod] - [DeploymentItem("Xml Files\\honeybee.xml")] - public void HoneybeeTest() - { - var testFile = Path.GetFullPath(@"honeybee.xml"); - var reader = new XmlTvReader(testFile, null); - - var channels = reader.GetChannels().ToList(); - Assert.AreEqual(16, channels.Count); - - var programs = reader.GetProgrammes("2013.honeybee.it", DateTime.UtcNow.AddYears(-1), - DateTime.UtcNow.AddYears(1), CancellationToken.None).ToList(); - Assert.AreEqual(297, programs.Count); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv.sln b/Emby.XmlTv/Emby.XmlTv.sln deleted file mode 100644 index 8243d4b72..000000000 --- a/Emby.XmlTv/Emby.XmlTv.sln +++ /dev/null @@ -1,44 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv.Console", "Emby.XmlTv.Console\Emby.XmlTv.Console.csproj", "{ADD1D993-6D74-480A-B1FC-7FD9FD05A769}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv.csproj", "{0D023565-5942-4D79-9098-A1B4B6665A40}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{BB0FD191-A9D0-4CC9-A79E-ECBCF1275268}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{E9F625D5-979E-48E8-9987-F4BCADD79A41}" - ProjectSection(SolutionItems) = preProject - Nuget\Emby.XmlTv.nuspec = Nuget\Emby.XmlTv.nuspec - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ADD1D993-6D74-480A-B1FC-7FD9FD05A769}.Release|Any CPU.Build.0 = Release|Any CPU - {0D023565-5942-4D79-9098-A1B4B6665A40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D023565-5942-4D79-9098-A1B4B6665A40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D023565-5942-4D79-9098-A1B4B6665A40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D023565-5942-4D79-9098-A1B4B6665A40}.Release|Any CPU.Build.0 = Release|Any CPU - {C8298223-2468-466C-9B06-FBF61926CECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C8298223-2468-466C-9B06-FBF61926CECB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C8298223-2468-466C-9B06-FBF61926CECB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C8298223-2468-466C-9B06-FBF61926CECB}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs b/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs deleted file mode 100644 index 46bf6cc21..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Classes/XmlTvReader.cs +++ /dev/null @@ -1,1107 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text.RegularExpressions; -using System.Threading; -using System.Xml; -using Emby.XmlTv.Entities; - -namespace Emby.XmlTv.Classes -{ - // Reads an XmlTv file - public class XmlTvReader - { - private readonly string _fileName; - private readonly string _language; - - /// - /// Initializes a new instance of the class. - /// - /// Name of the file. - /// The specific language to return. - public XmlTvReader(string fileName, string language = null) - { - _fileName = fileName; - - // Normalize null/string.empty - if (string.IsNullOrWhiteSpace(language)) - { - language = null; - } - _language = language; - } - - private static XmlReader CreateXmlTextReader(string path) - { - var settings = new XmlReaderSettings(); - - // https://msdn.microsoft.com/en-us/library/system.xml.xmlreadersettings.xmlresolver(v=vs.110).aspx - // Looks like we don't need this anyway? - // Starting with the .NET Framework 4.5.2, this setting has a default value of null. - //settings.XmlResolver = null; - - settings.DtdProcessing = DtdProcessing.Ignore; - - settings.CheckCharacters = false; - settings.IgnoreProcessingInstructions = true; - settings.IgnoreComments = true; - //settings.ValidationType = ValidationType.None; - - return XmlReader.Create(path, settings); - } - - /// - /// Gets the list of channels present in the XML - /// - /// - public IEnumerable GetChannels() - { - var list = new List(); - - using (var reader = CreateXmlTextReader(_fileName)) - { - if (reader.ReadToDescendant("tv")) - { - if (reader.ReadToDescendant("channel")) - { - do - { - var channel = GetChannel(reader); - if (channel != null) - { - list.Add(channel); - } - } - while (reader.ReadToFollowing("channel")); - } - } - } - - return list; - } - - private XmlTvChannel GetChannel(XmlReader reader) - { - var id = reader.GetAttribute("id"); - - if (string.IsNullOrEmpty(id)) - { - // LogError("No id found for channel row"); - // Log.Error(" channel#{0} doesnt contain an id", iChannel); - return null; - } - - var result = new XmlTvChannel() { Id = id }; - - using (var xmlChannel = reader.ReadSubtree()) - { - xmlChannel.MoveToContent(); - xmlChannel.Read(); - - // Read out the data for each node and process individually - while (!xmlChannel.EOF && xmlChannel.ReadState == ReadState.Interactive) - { - if (xmlChannel.NodeType == XmlNodeType.Element) - { - switch (xmlChannel.Name) - { - case "display-name": - ProcessNode(xmlChannel, s => result.DisplayName = s, _language, s => SetChannelNumber(result, s)); - break; - case "url": - result.Url = xmlChannel.ReadElementContentAsString(); - break; - case "icon": - result.Icon = ProcessIconNode(xmlChannel); - xmlChannel.Skip(); - break; - default: - xmlChannel.Skip(); // unknown, skip entire node - break; - } - } - else - { - xmlChannel.Read(); - } - } - } - - if (string.IsNullOrEmpty(result.DisplayName)) - { - // LogError("No display-name found for channel {0}", id); - return null; - } - - return result; - } - - private void SetChannelNumber(XmlTvChannel channel, string value) - { - value = value.Replace("-", "."); - if (double.TryParse(value, NumberStyles.Any, CultureInfo.InvariantCulture, out var number)) - { - channel.Number = value; - } - } - - /// - /// Gets the programmes for a specified channel - /// - /// The channel id. - /// The UTC start date. - /// The UTC end date. - /// A cancellation token. - /// - public IEnumerable GetProgrammes( - string channelId, - DateTimeOffset startDateUtc, - DateTimeOffset endDateUtc, - CancellationToken cancellationToken) - { - var list = new List(); - - using (var reader = CreateXmlTextReader(_fileName)) - { - if (reader.ReadToDescendant("tv")) - { - if (reader.ReadToDescendant("programme")) - { - do - { - if (cancellationToken.IsCancellationRequested) - { - continue; // Break out - } - - var programme = GetProgramme(reader, channelId, startDateUtc, endDateUtc); - if (programme != null) - { - list.Add(programme); - } - } - while (reader.ReadToFollowing("programme")); - } - } - } - - return list; - } - - public XmlTvProgram GetProgramme(XmlReader reader, string channelId, DateTimeOffset startDateUtc, DateTimeOffset endDateUtc) - { - var result = new XmlTvProgram(); - - PopulateHeader(reader, result); - - using (var xmlProg = reader.ReadSubtree()) - { - // First up, validate that this is the correct channel, and programme is within the time we are expecting - if (!string.Equals(result.ChannelId, channelId, StringComparison.OrdinalIgnoreCase)) - { - return null; - } - - if (result.EndDate < startDateUtc || result.StartDate >= endDateUtc) - { - return null; - } - - xmlProg.MoveToContent(); - xmlProg.Read(); - - // Loop through each element - while (!xmlProg.EOF && xmlProg.ReadState == ReadState.Interactive) - { - if (xmlProg.NodeType == XmlNodeType.Element) - { - switch (xmlProg.Name) - { - case "title": - ProcessTitleNode(xmlProg, result); - break; - case "category": - ProcessCategory(xmlProg, result); - break; - case "country": - ProcessCountry(xmlProg, result); - break; - case "desc": - ProcessDescription(xmlProg, result); - break; - case "sub-title": - ProcessSubTitle(xmlProg, result); - break; - case "new": - ProcessNew(xmlProg, result); - break; - case "previously-shown": - ProcessPreviouslyShown(xmlProg, result); - break; - case "quality": - ProcessQuality(xmlProg, result); - break; - case "episode-num": - ProcessEpisodeNum(xmlProg, result); - break; - case "date": // Copyright date - ProcessCopyrightDate(xmlProg, result); - break; - case "star-rating": // Community Rating - ProcessStarRating(xmlProg, result); - break; - case "rating": // Certification Rating - ProcessRating(xmlProg, result); - break; - case "credits": - if (xmlProg.IsEmptyElement) - { - xmlProg.Skip(); - } - else - { - using (var subtree = xmlProg.ReadSubtree()) - { - ProcessCredits(subtree, result); - } - } - break; - case "icon": - result.Icon = ProcessIconNode(xmlProg); - xmlProg.Skip(); - break; - case "premiere": - result.Premiere = new XmlTvPremiere(); - // This was causing data after the premiere node to not be read. Reactivate this and debug if the premiere details are ever needed. - //ProcessPremiereNode(xmlProg, result); - xmlProg.Skip(); - break; - default: - // unknown, skip entire node - xmlProg.Skip(); - break; - } - } - else - { - xmlProg.Read(); - } - } - } - return result; - } - - /// - /// Gets the list of supported languages in the XML - /// - /// - public List GetLanguages(CancellationToken cancellationToken) - { - var results = new Dictionary(); - - //Loop through and parse out all elements and then lang= attributes - //logger.LogInformation("Loading file {0}", _fileName); - using (var reader = CreateXmlTextReader(_fileName)) - { - while (reader.Read()) - { - if (cancellationToken.IsCancellationRequested) - { - continue; // Break out - } - - if (reader.NodeType == XmlNodeType.Element) - { - var language = reader.GetAttribute("lang"); - if (!string.IsNullOrEmpty(language)) - { - if (!results.ContainsKey(language)) - { - results[language] = 0; - } - results[language]++; - } - } - } - } - - return - results.Keys.Select(k => new XmlTvLanguage() { Name = k, Relevance = results[k] }) - .OrderByDescending(l => l.Relevance) - .ToList(); - } - - private void ProcessCopyrightDate(XmlReader xmlProg, XmlTvProgram result) - { - var startValue = xmlProg.ReadElementContentAsString(); - if (string.IsNullOrEmpty(startValue)) - { - // Log.Error(" programme#{0} doesnt contain a start date", iChannel); - result.CopyrightDate = null; - } - else - { - var copyrightDate = ParseDate(startValue); - if (copyrightDate != null) - { - result.CopyrightDate = copyrightDate; - } - } - } - - public void ProcessCredits(XmlReader creditsXml, XmlTvProgram result) - { - creditsXml.MoveToContent(); - creditsXml.Read(); - - // Loop through each element - while (!creditsXml.EOF && creditsXml.ReadState == ReadState.Interactive) - { - if (creditsXml.NodeType == XmlNodeType.Element) - { - XmlTvCredit credit = null; - switch (creditsXml.Name) - { - case "director": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Director }; - break; - case "actor": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Actor }; - break; - case "writer": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Writer }; - break; - case "adapter": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Adapter }; - break; - case "producer": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Producer }; - break; - case "composer": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Composer }; - break; - case "editor": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Editor }; - break; - case "presenter": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Presenter }; - break; - case "commentator": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Commentator }; - break; - case "guest": - credit = new XmlTvCredit() { Type = XmlTvCreditType.Guest }; - break; - } - - if (credit != null) - { - credit.Name = creditsXml.ReadElementContentAsString(); - result.Credits.Add(credit); - } - else - { - creditsXml.Skip(); - } - } - else - creditsXml.Read(); - } - } - - public void ProcessStarRating(XmlReader reader, XmlTvProgram result) - { - /* - - 3/3 - - */ - - reader.ReadToDescendant("value"); - if (reader.Name == "value") - { - var textValue = reader.ReadElementContentAsString(); - if (textValue.Contains("/")) - { - var components = textValue.Split('/'); - if (float.TryParse(components[0], out var value)) - { - result.StarRating = value; - } - } - } - else - { - reader.Skip(); - } - } - - public void ProcessRating(XmlReader reader, XmlTvProgram result) - { - /* - - TV-G - - */ - - var system = reader.GetAttribute("system"); - - reader.ReadToDescendant("value"); - if (reader.Name == "value") - { - result.Rating = new XmlTvRating() - { - System = system, - Value = reader.ReadElementContentAsString() - }; - } - else - { - reader.Skip(); - } - } - - public void ProcessEpisodeNum(XmlReader reader, XmlTvProgram result) - { - /* - EP00003026.0666 - 2706 - .26/0. - */ - - var episodeSystem = reader.GetAttribute("system"); - switch (episodeSystem) - { - case "dd_progid": - ParseEpisodeDataForProgramId(reader, result); - break; - case "icetv": - result.ProviderIds["icetv"] = reader.ReadElementContentAsString(); - break; - case "xmltv_ns": - ParseEpisodeDataForXmlTvNs(reader, result); - break; - case "onscreen": - ParseEpisodeDataForOnScreen(reader, result); - break; - case "thetvdb.com": - ParseTvdbSystem(reader, result); - break; - case "imdb.com": - ParseImdbSystem(reader, result); - break; - case "themoviedb.org": - ParseMovieDbSystem(reader, result); - break; - case "SxxExx": - ParseSxxExxSystem(reader, result); - break; - default: // Handles empty string and nulls - reader.Skip(); - break; - } - } - - public void ParseSxxExxSystem(XmlReader reader, XmlTvProgram result) - { - // S012E32 - - var value = reader.ReadElementContentAsString(); - var res = Regex.Match(value, "s([0-9]+)e([0-9]+)", RegexOptions.IgnoreCase); - - if (res.Success) - { - int parsedInt; - - if (int.TryParse(res.Groups[1].Value, out parsedInt)) - { - result.Episode.Series = parsedInt; - } - - if (int.TryParse(res.Groups[2].Value, out parsedInt)) - { - result.Episode.Episode = parsedInt; - } - } - } - - public void ParseMovieDbSystem(XmlReader reader, XmlTvProgram result) - { - // series/248841 - // episode/4749206 - - var value = reader.ReadElementContentAsString(); - var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); - - if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase)) - { - result.SeriesProviderIds["tmdb"] = parts[1]; - } - - else if (parts.Length == 1 || string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase)) - { - result.ProviderIds["tmdb"] = parts.Last(); - } - } - - public void ParseImdbSystem(XmlReader reader, XmlTvProgram result) - { - // series/tt1837576 - // episode/tt3288596 - - var value = reader.ReadElementContentAsString(); - if (string.IsNullOrWhiteSpace(value)) - { - return; - } - var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); - - if (parts.Length != 2) - { - return; - } - - if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase)) - { - result.SeriesProviderIds["imdb"] = parts[1]; - } - - else if (string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase)) - { - result.ProviderIds["imdb"] = parts[1]; - } - } - - public void ParseTvdbSystem(XmlReader reader, XmlTvProgram result) - { - // series/248841 - // episode/4749206 - - var value = reader.ReadElementContentAsString(); - var parts = value.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); - - if (parts.Length != 2) - { - return; - } - - if (string.Equals(parts[0], "series", StringComparison.OrdinalIgnoreCase)) - { - result.SeriesProviderIds["tvdb"] = parts[1]; - } - - else if (string.Equals(parts[0], "episode", StringComparison.OrdinalIgnoreCase)) - { - result.ProviderIds["tvdb"] = parts[1]; - } - } - - public void ParseEpisodeDataForOnScreen(XmlReader reader, XmlTvProgram result) - { - //// example: 'Episode #FFEE' - //serEpNum = ConvertHTMLToAnsi(nodeEpisodeNum); - //int num1 = serEpNum.IndexOf("#", 0); - //if (num1 < 0) num1 = 0; - //episodeNum = CorrectEpisodeNum(serEpNum.Substring(num1, serEpNum.Length - num1), 0); - - var value = reader.ReadElementContentAsString(); - // value = HttpUtility.HtmlDecode(value); - value = value.Replace(" ", ""); - - var hashIndex = value.IndexOf("#", StringComparison.Ordinal); - if (hashIndex > -1) - { - // Take everything from the hash to the end. - //TODO: This could be textual - how do we populate an Int32 - // result.EpisodeNumber - } - } - - public void ParseEpisodeDataForProgramId(XmlReader reader, XmlTvProgram result) - { - var value = reader.ReadElementContentAsString(); - if (!string.IsNullOrWhiteSpace(value)) - { - result.ProgramId = value; - } - } - - public void ParseEpisodeDataForXmlTvNs(XmlReader reader, XmlTvProgram result) - { - var value = reader.ReadElementContentAsString(); - - value = value.Replace(" ", ""); - - // Episode details - var components = value.Split(new[] { "." }, StringSplitOptions.None); - - int parsedInt; - - if (!string.IsNullOrEmpty(components[0])) - { - // Handle either "5/12" or "5" - var seriesComponents = components[0].Split(new[] { "/" }, StringSplitOptions.None); - - // handle the zero basing! - if (int.TryParse(seriesComponents[0], out parsedInt)) - { - result.Episode.Series = parsedInt + 1; - if (seriesComponents.Length == 2) - { - if (int.TryParse(seriesComponents[1], out parsedInt)) - { - result.Episode.SeriesCount = parsedInt; - } - } - } - } - - if (components.Length >= 2) - { - if (!string.IsNullOrEmpty(components[1])) - { - // Handle either "5/12" or "5" - var episodeComponents = components[1].Split(new[] { "/" }, StringSplitOptions.None); - - // handle the zero basing! - if (int.TryParse(episodeComponents[0], out parsedInt)) - { - result.Episode.Episode = parsedInt + 1; - if (episodeComponents.Count() == 2) - { - if (int.TryParse(episodeComponents[1], out parsedInt)) - { - result.Episode.EpisodeCount = parsedInt; - } - } - } - } - } - - if (components.Length >= 3) - { - if (!string.IsNullOrEmpty(components[2])) - { - // Handle either "5/12" or "5" - var partComponents = components[2].Split(new[] { "/" }, StringSplitOptions.None); - - // handle the zero basing! - if (int.TryParse(partComponents[0], out parsedInt)) - { - result.Episode.Part = parsedInt + 1; - if (partComponents.Count() == 2) - { - if (int.TryParse(partComponents[1], out parsedInt)) - { - result.Episode.PartCount = parsedInt; - } - } - } - } - } - } - - public void ProcessQuality(XmlReader reader, XmlTvProgram result) - { - result.Quality = reader.ReadElementContentAsString(); - } - - public void ProcessPreviouslyShown(XmlReader reader, XmlTvProgram result) - { - // - var value = reader.GetAttribute("start"); - if (!string.IsNullOrEmpty(value)) - { - // TODO: this may not be correct = validate it - result.PreviouslyShown = ParseDate(value); - if (result.PreviouslyShown != result.StartDate) - { - result.IsPreviouslyShown = true; - } - } - else - { - result.IsPreviouslyShown = true; - } - - reader.Skip(); // Move on - } - - public void ProcessNew(XmlReader reader, XmlTvProgram result) - { - result.IsNew = true; - reader.Skip(); // Move on - } - - public void ProcessCategory(XmlReader reader, XmlTvProgram result) - { - /* - News - */ - - result.Categories = result.Categories ?? new List(); - ProcessMultipleNodes(reader, s => result.Categories.Add(s), _language); - - //result.Categories.Add(reader.ReadElementContentAsString()); - } - public void ProcessCountry(XmlReader reader, XmlTvProgram result) - { - /* - Canadá - EE.UU - */ - - result.Countries = result.Countries ?? new List(); - ProcessNode(reader, s => result.Countries.Add(s), _language); - } - - public void ProcessSubTitle(XmlReader reader, XmlTvProgram result) - { - /* - Gino's Italian Escape - Islands in the Sun: Southern Sardinia Celebrate the Sea - 8782 - */ - ProcessNode(reader, s => result.Episode.Title = s, _language); - } - - public void ProcessDescription(XmlReader reader, XmlTvProgram result) - { - ProcessNode(reader, s => result.Description = s, _language); - } - - public void ProcessTitleNode(XmlReader reader, XmlTvProgram result) - { - // Gino's Italian Escape - ProcessNode(reader, s => result.Title = s, _language); - } - - public void ProcessPremiereNode(XmlReader reader, XmlTvProgram result) - { - // Gino's Italian Escape - ProcessNode(reader, - s => - { - if (result.Premiere == null) - { - result.Premiere = new XmlTvPremiere() { Details = s }; - } - else - { - result.Premiere.Details = s; - } - }, _language); - } - - public XmlTvIcon ProcessIconNode(XmlReader reader) - { - var result = new XmlTvIcon(); - var isPopulated = false; - - var source = reader.GetAttribute("src"); - if (!string.IsNullOrEmpty(source)) - { - result.Source = source; - isPopulated = true; - } - - var widthString = reader.GetAttribute("width"); - var width = 0; - if (!string.IsNullOrEmpty(widthString) && int.TryParse(widthString, out width)) - { - result.Width = width; - isPopulated = true; - } - - var heightString = reader.GetAttribute("height"); - var height = 0; - if (!string.IsNullOrEmpty(heightString) && int.TryParse(heightString, out height)) - { - result.Height = height; - isPopulated = true; - } - - return isPopulated ? result : null; - } - - - //public void ProcessNodeWithLanguage(XmlReader reader, Action setter) - //{ - // var currentElementName = reader.Name; - // var result = string.Empty; - // var resultCandidate = reader.ReadElementContentAsString(); - // var exactMatchFound = false; - - // while (reader.Name == currentElementName) - // { - // var language = reader.GetAttribute("lang"); - // resultCandidate = reader.ReadElementContentAsString(); - - // if (language == _language && !exactMatchFound) - // { - // result = resultCandidate; - // } - - // reader.Skip(); - // } - - // result = String.IsNullOrEmpty(result) ? resultCandidate : result; - // setter(result); - //} - - public void ProcessNode(XmlReader reader, Action setter, string languageRequired = null, Action allOccurrencesSetter = null) - { - /* Homes Under the Hammer - Spanish - * Homes Under the Hammer - Spanish 2 - * Homes Under the Hammer - English - * Homes Under the Hammer - English 2 - * Homes Under the Hammer - Empty Language - * Homes Under the Hammer - Empty Language 2 - * Homes Under the Hammer - No Language - * Homes Under the Hammer - No Language 2 - */ - - /* Expected Behaviour: - * - Language = Null Homes Under the Hammer - No Language - * - Language = "" Homes Under the Hammer - No Language - * - Language = es Homes Under the Hammer - Spanish - * - Language = en Homes Under the Hammer - English - */ - - var results = new List>(); - - // We will always use the first value - so that if there are no matches we can return something - var currentElementName = reader.Name; - - var lang = reader.HasAttributes ? reader.GetAttribute("lang") : null; - var currentValue = reader.ReadElementContentAsString(); - results.Add(new Tuple(currentValue, lang)); - - if (allOccurrencesSetter != null) - { - allOccurrencesSetter(currentValue); - } - - while (!reader.EOF && reader.ReadState == ReadState.Interactive) - { - if (reader.NodeType == XmlNodeType.Element) - { - if (reader.Name == currentElementName) - { - lang = reader.HasAttributes ? reader.GetAttribute("lang") : null; - currentValue = reader.ReadElementContentAsString(); - - if (allOccurrencesSetter != null) - { - allOccurrencesSetter(currentValue); - } - - results.Add(new Tuple(currentValue, lang)); - } - else - { - break; - } - } - else - { - reader.Read(); - } - } - - if (languageRequired != null) - { - foreach (var result in results) - { - if (string.Equals(languageRequired, result.Item2, StringComparison.OrdinalIgnoreCase)) - { - setter(result.Item1); - return; - } - } - } - - foreach (var result in results) - { - if (string.IsNullOrWhiteSpace(result.Item2)) - { - setter(result.Item1); - return; - } - } - - foreach (var result in results) - { - setter(result.Item1); - return; - } - } - - public void ProcessMultipleNodes(XmlReader reader, Action setter, string languageRequired = null) - { - /* Property - English - * Property - English 2 - * Property - Spanish - * Property - Spanish 2 - * Property - Empty Language - * Property - Empty Language 2 - * Property - No Language - * Property - No Language 2 - */ - - /* Expected Behaviour: - * - Language = Null Property - No Language / Property - No Language 2 - * - Language = "" Property - Empty Language / Property - Empty Language 2 - * - Language = es Property - Spanish / Property - Spanish 2 - * - Language = en Property - English / Property - English 2 - */ - - var currentElementName = reader.Name; - var values = new[] { new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() } }.ToList(); - - while (reader.Read()) - { - if (reader.NodeType == XmlNodeType.Element && reader.Name != currentElementName) - { - break; - } - - if (reader.NodeType == XmlNodeType.Element && reader.Name == currentElementName) - { - values.Add(new { Language = reader.GetAttribute("lang"), Value = reader.ReadElementContentAsString() }); - } - } - - if (values.Count(v => v.Language == languageRequired) > 0) - { - values.RemoveAll(v => v.Language != languageRequired); - } - - // ENumerate and return all the matches - foreach (var result in values) - { - setter(result.Value); - } - } - - public void ProcessMultipleNodesWithLanguage(XmlReader reader, Action setter) - { - var currentElementName = reader.Name; - while (reader.Name == currentElementName) - { - var language = reader.GetAttribute("lang"); - if (string.IsNullOrEmpty(_language) || string.IsNullOrEmpty(language) || language == _language) - { - setter(reader.ReadElementContentAsString()); - } - reader.Skip(); - } - } - - private void PopulateHeader(XmlReader reader, XmlTvProgram result) - { - result.ChannelId = reader.GetAttribute("channel"); - - var startValue = reader.GetAttribute("start"); - if (string.IsNullOrEmpty(startValue)) - { - // Log.Error(" programme#{0} doesnt contain a start date", iChannel); - result.StartDate = DateTimeOffset.MinValue; - } - else - { - result.StartDate = ParseDate(startValue).GetValueOrDefault(); - } - - - var endValue = reader.GetAttribute("stop"); - if (string.IsNullOrEmpty(endValue)) - { - // Log.Error(" programme#{0} doesnt contain an end date", iChannel); - result.EndDate = DateTimeOffset.MinValue; - } - else - { - result.EndDate = ParseDate(endValue).GetValueOrDefault(); - } - } - - public const string _regDateWithOffset = @"^(?[0-9]{4,14})(\s(?[+-]*[0-9]{1,4}))?$"; - - public DateTimeOffset? ParseDate(string dateValue) - { - /* - All dates and times in this DTD follow the same format, loosely based - on ISO 8601. They can be 'YYYYMMDDhhmmss' or some initial - substring, for example if you only know the year and month you can - have 'YYYYMM'. You can also append a timezone to the end; if no - explicit timezone is given, UTC is assumed. Examples: - '200007281733 BST', '200209', '19880523083000 +0300'. (BST == +0100.) - */ - - if (string.IsNullOrEmpty(dateValue)) - { - return null; - } - - var completeDate = "20000101000000"; - var dateComponent = string.Empty; - var dateOffset = "+00:00"; - var match = Regex.Match(dateValue, _regDateWithOffset); - if (match.Success) - { - dateComponent = match.Groups["dateDigits"].Value; - if (!string.IsNullOrEmpty(match.Groups["dateOffset"].Value)) - { - dateOffset = match.Groups["dateOffset"].Value; // Add in the colon to ease parsing later - if (dateOffset.Length == 5) - { - dateOffset = dateOffset.Insert(3, ":"); // Add in the colon to ease parsing later - } - else - { - dateOffset = "+00:00"; - } - } - } - - // Pad out the date component part to 14 characaters so 2016061509 becomes 20160615090000 - if (dateComponent.Length < 14) - { - dateComponent = dateComponent + completeDate.Substring(dateComponent.Length, completeDate.Length - dateComponent.Length); - } - - var standardDate = string.Format("{0} {1}", dateComponent, dateOffset); - if (DateTimeOffset.TryParseExact(standardDate, "yyyyMMddHHmmss zzz", CultureInfo.CurrentCulture, DateTimeStyles.None, out DateTimeOffset parsedDateTime)) - { - return parsedDateTime.ToUniversalTime(); - } - - // Logger.LogWarning("Unable to parse the date {0} from standardised form {1}", dateValue, standardDate); - - return null; - } - - public string StandardiseDate(string value) - { - var completeDate = "20000101000000"; - var dateComponent = string.Empty; - var dateOffset = "+0000"; - - var match = Regex.Match(value, _regDateWithOffset); - if (match.Success) - { - dateComponent = match.Groups["dateDigits"].Value; - dateOffset = match.Groups["dateOffset"].Value; - } - - // Pad out the date component part to 14 characaters so 2016061509 becomes 20160615090000 - if (dateComponent.Length < 14) - { - dateComponent = dateComponent + completeDate.Substring(dateComponent.Length, completeDate.Length - dateComponent.Length); - } - - return string.Format("{0} {1}", dateComponent, dateOffset); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj b/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj deleted file mode 100644 index 04f558173..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj +++ /dev/null @@ -1,13 +0,0 @@ - - - - netstandard2.0 - false - true - - - - - - - diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs deleted file mode 100644 index 2673d711c..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvChannel.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using System.Text; - -namespace Emby.XmlTv.Entities -{ - public class XmlTvChannel : IEquatable - { - public string Id { get; set; } - public string DisplayName { get; set; } - public string Number { get; set; } - public string Url { get; set; } - public XmlTvIcon Icon { get; set; } - - public bool Equals(XmlTvChannel other) - { - // If both are null, or both are same instance, return true. - if (ReferenceEquals(this, other)) - { - return true; - } - - // If the other is null then return false - if (other == null) - { - return false; - } - - // Return true if the fields match: - return Id == other.Id; - } - - public override int GetHashCode() - { - return (Id.GetHashCode() * 17); - } - - public override string ToString() - { - var builder = new StringBuilder(); - builder.AppendFormat("{0} - {1} ", Id, DisplayName); - - if (!string.IsNullOrEmpty(Url)) - { - builder.AppendFormat(" ({0})", Url); - } - - return builder.ToString(); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs deleted file mode 100644 index d959ce76f..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCredit.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Emby.XmlTv.Entities -{ - public class XmlTvCredit - { - public XmlTvCreditType Type { get; set; } - public string Name { get; set; } - - public override string ToString() - { - return string.Format("{0} - ({1})", Name, Type); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs deleted file mode 100644 index 31c7f5e44..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvCreditType.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace Emby.XmlTv.Entities -{ - public enum XmlTvCreditType - { - NotSpecified = 0, - Director, - Actor, - Writer, - Adapter, - Producer, - Composer, - Editor, - Presenter, - Commentator, - Guest - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs deleted file mode 100644 index 47525b57c..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvEpisode.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System.Text; - -namespace Emby.XmlTv.Entities -{ - public class XmlTvEpisode - { - public int? Series { get; set; } - public int? SeriesCount { get; set; } - public int? Episode { get; set; } - public int? EpisodeCount { get; set; } - public string Title { get; set; } - public int? Part { get; set; } - public int? PartCount { get; set; } - - public override string ToString() - { - var builder = new StringBuilder(); - if (Series.HasValue || SeriesCount.HasValue) - { - builder.AppendFormat("Series {0}", Series.HasValue ? Series.Value.ToString() : "?"); - if (SeriesCount.HasValue) - { - builder.AppendFormat(" of {0}", SeriesCount); - } - } - - if (Episode.HasValue || EpisodeCount.HasValue) - { - builder.Append(builder.Length > 0 ? ", " : string.Empty); - builder.AppendFormat("Episode {0}", Episode.HasValue ? Episode.Value.ToString() : "?"); - if (EpisodeCount.HasValue) - { - builder.AppendFormat(" of {0}", EpisodeCount); - } - } - - if (Part.HasValue || PartCount.HasValue) - { - builder.Append(builder.Length > 0 ? ", " : string.Empty); - builder.AppendFormat("Part {0}", Part.HasValue ? Part.Value.ToString() : "?"); - if (PartCount.HasValue) - { - builder.AppendFormat(" of {0}", PartCount); - } - } - - return builder.ToString(); - } - } - - -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs deleted file mode 100644 index 77ef8d5fd..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvIcon.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Text; - -namespace Emby.XmlTv.Entities -{ - public class XmlTvIcon - { - public string Source { get; set; } - public int? Width { get; set; } - public int? Height { get; set; } - - public override string ToString() - { - var builder = new StringBuilder(); - builder.AppendFormat("Source: {0}", Source); - if (Width.HasValue) - { - builder.AppendFormat(", Width: {0}", Width); - } - if (Height.HasValue) - { - builder.AppendFormat(", Height: {0}", Height); - } - - return builder.ToString(); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs deleted file mode 100644 index 0fd5573cd..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvLanguage.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace Emby.XmlTv.Entities -{ - public class XmlTvLanguage - { - /// - /// The name. - /// - public string Name { get; set; } - - /// - /// The relevance (number of occurances) of the language, can be used to order (desc) - /// - public int Relevance { get; set; } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs deleted file mode 100644 index a1920bc77..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvPremiere.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace Emby.XmlTv.Entities -{ - public class XmlTvPremiere - { - /* - - First showing on national terrestrial TV - - */ - - public string Details { get; set; } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs deleted file mode 100644 index 1725e17d7..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvProgram.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace Emby.XmlTv.Entities -{ - public class XmlTvProgram : IEquatable - { - public string ChannelId { get; set; } - - public DateTimeOffset StartDate { get; set; } - - public DateTimeOffset EndDate { get; set; } - - public string Title { get; set; } - - public string Description { get; set; } - public string ProgramId { get; set; } - public string Quality { get; set; } - - public List Categories { get; set; } - - public List Countries { get; set; } - - public DateTimeOffset? PreviouslyShown { get; set; } - - public bool IsPreviouslyShown { get; set; } - public bool IsNew { get; set; } - - public DateTimeOffset? CopyrightDate { get; set; } - - public XmlTvEpisode Episode { get; set; } - - public List Credits { get; set; } - - public XmlTvRating Rating { get; set; } - - public float? StarRating { get; set; } - - public XmlTvIcon Icon { get; set; } - - public XmlTvPremiere Premiere { get; set; } - - public Dictionary ProviderIds { get; set; } - public Dictionary SeriesProviderIds { get; set; } - - public XmlTvProgram() - { - Credits = new List(); - Categories = new List(); - Countries = new List(); - Episode = new XmlTvEpisode(); - - ProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase); - SeriesProviderIds = new Dictionary(StringComparer.OrdinalIgnoreCase); - } - - public bool Equals(XmlTvProgram other) - { - // If both are null, or both are same instance, return true. - if (ReferenceEquals(this, other)) - { - return true; - } - - // If the other is null then return false - if (other == null) - { - return false; - } - - // Return true if the fields match: - return ChannelId == other.ChannelId && - StartDate == other.StartDate && - EndDate == other.EndDate; - } - - public override int GetHashCode() - { - return (ChannelId.GetHashCode() * 17) + (StartDate.GetHashCode() * 17) + (EndDate.GetHashCode() * 17); - } - - public override string ToString() - { - var builder = new StringBuilder(); - builder.AppendFormat("ChannelId: \t\t{0}\r\n", ChannelId); - builder.AppendFormat("Title: \t\t{0}\r\n", Title); - builder.AppendFormat("StartDate: \t\t{0}\r\n", StartDate); - builder.AppendFormat("EndDate: \t\t{0}\r\n", EndDate); - return builder.ToString(); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs b/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs deleted file mode 100644 index e37113d7a..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Entities/XmlTvRating.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Text; - -namespace Emby.XmlTv.Entities -{ - /// - /// Describes the rating (certification) applied to a program - /// - /// Example XML: - /// - public class XmlTvRating - { - /// - /// The literal name of the rating system - /// - /// MPAA - public string System { get; set; } - - /// - /// Describes the rating using the system specificed - /// - /// TV-14 - public string Value { get; set; } - - public override string ToString() - { - var builder = new StringBuilder(); - if (!string.IsNullOrEmpty(Value)) - { - builder.Append(Value); - } - - if (!string.IsNullOrEmpty(System)) - { - builder.AppendFormat(" ({0})", System); - } - - return builder.ToString(); - } - } -} diff --git a/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs b/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs deleted file mode 100644 index 7beec09cb..000000000 --- a/Emby.XmlTv/Emby.XmlTv/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System.Reflection; -using System.Resources; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("XmlTv")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Jellyfin Project")] -[assembly: AssemblyProduct("Jellyfin Server")] -[assembly: AssemblyCopyright("Copyright © 2019 Jellyfin Contributors. Code released under the GNU General Public License")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: NeutralResourcesLanguage("en")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] diff --git a/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd b/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd deleted file mode 100644 index 889939224..000000000 --- a/Emby.XmlTv/Emby.XmlTv/XmlTvSchema.dtd +++ /dev/null @@ -1,575 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Emby.XmlTv/License.txt b/Emby.XmlTv/License.txt deleted file mode 100644 index 3c4f73ddb..000000000 --- a/Emby.XmlTv/License.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Alex Stevens - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec b/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec deleted file mode 100644 index 087ce1e6e..000000000 --- a/Emby.XmlTv/Nuget/Emby.XmlTv.nuspec +++ /dev/null @@ -1,20 +0,0 @@ - - - - Emby.XmlTv - 1.0.19 - Emby.XmlTv - Emby Team - ebr,Luke,scottisafool - https://github.com/MediaBrowser/Emby.XmlTv - http://www.mb3admin.com/images/mb3icons1-1.png - false - An XmlTv parsing library. - Copyright © Emby 2013 - - - - - - - \ No newline at end of file diff --git a/Emby.XmlTv/README.md b/Emby.XmlTv/README.md deleted file mode 100644 index 86e777bb2..000000000 --- a/Emby.XmlTv/README.md +++ /dev/null @@ -1 +0,0 @@ -# Emby.XmlTv diff --git a/MediaBrowser.sln b/MediaBrowser.sln index da828927b..cf3f56cd9 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -36,8 +36,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Notifications", "Emby. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Naming", "Emby.Naming\Emby.Naming.csproj", "{E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.XmlTv", "Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj", "{6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediaBrowser.MediaEncoding", "MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj", "{960295EE-4AF4-4440-A525-B4C295B01A61}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Server", "Jellyfin.Server\Jellyfin.Server.csproj", "{07E39F42-A2C6-4B32-AF8C-725F957A73FF}" @@ -136,10 +134,6 @@ Global {E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5AF7B26-2239-4CE0-B477-0AA2018EDAA2}.Release|Any CPU.Build.0 = Release|Any CPU - {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6EAFA7F0-8A82-49E6-B2FA-086C5CAEA95B}.Release|Any CPU.Build.0 = Release|Any CPU {960295EE-4AF4-4440-A525-B4C295B01A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {960295EE-4AF4-4440-A525-B4C295B01A61}.Debug|Any CPU.Build.0 = Debug|Any CPU {960295EE-4AF4-4440-A525-B4C295B01A61}.Release|Any CPU.ActiveCfg = Release|Any CPU -- cgit v1.2.3 From c6851bd72c88070126ac3517eeb63496900d9f9b Mon Sep 17 00:00:00 2001 From: schbal Date: Sun, 15 Dec 2019 03:06:42 +0000 Subject: Translated using Weblate (Korean) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ko/ --- Emby.Server.Implementations/Localization/Core/ko.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/ko.json b/Emby.Server.Implementations/Localization/Core/ko.json index 3d2350c07..0320a0a1b 100644 --- a/Emby.Server.Implementations/Localization/Core/ko.json +++ b/Emby.Server.Implementations/Localization/Core/ko.json @@ -5,13 +5,13 @@ "Artists": "아티스트", "AuthenticationSucceededWithUserName": "{0}이 성공적으로 인증됨", "Books": "도서", - "CameraImageUploadedFrom": "{0}에서 새로운 카메라 이미지가 업로드되었습니다", + "CameraImageUploadedFrom": "{0}에서 새로운 카메라 이미지가 업로드됨", "Channels": "채널", "ChapterNameValue": "챕터 {0}", "Collections": "컬렉션", - "DeviceOfflineWithName": "{0} 연결 끊김", - "DeviceOnlineWithName": "{0} 연결됨", - "FailedLoginAttemptWithUserName": "{0} 로그인 실패", + "DeviceOfflineWithName": "{0}의 연결 끊김", + "DeviceOnlineWithName": "{0}이 연결됨", + "FailedLoginAttemptWithUserName": "{0}에서 로그인 실패", "Favorites": "즐겨찾기", "Folders": "폴더", "Genres": "장르", -- cgit v1.2.3 From a7a4974d95d65476db931d904296a7644a760fa9 Mon Sep 17 00:00:00 2001 From: Robin Date: Sat, 14 Dec 2019 13:53:29 +0000 Subject: Translated using Weblate (Dutch) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nl/ --- Emby.Server.Implementations/Localization/Core/nl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/nl.json b/Emby.Server.Implementations/Localization/Core/nl.json index 637e514ed..35b35e039 100644 --- a/Emby.Server.Implementations/Localization/Core/nl.json +++ b/Emby.Server.Implementations/Localization/Core/nl.json @@ -5,10 +5,10 @@ "Artists": "Artiesten", "AuthenticationSucceededWithUserName": "{0} is succesvol geverifieerd", "Books": "Boeken", - "CameraImageUploadedFrom": "Er is een nieuwe foto toegevoegd via {0}", + "CameraImageUploadedFrom": "Er is een nieuwe foto toegevoegd van {0}", "Channels": "Kanalen", "ChapterNameValue": "Hoofdstuk {0}", - "Collections": "Collecties", + "Collections": "Verzamelingen", "DeviceOfflineWithName": "{0} heeft de verbinding verbroken", "DeviceOnlineWithName": "{0} is verbonden", "FailedLoginAttemptWithUserName": "Mislukte aanmeld poging van {0}", -- cgit v1.2.3 From 6fb7999a148b85f798bd137d0a1468e0cb2ece0e Mon Sep 17 00:00:00 2001 From: Roland Vet Date: Sat, 14 Dec 2019 13:57:35 +0000 Subject: Translated using Weblate (Dutch) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/nl/ --- Emby.Server.Implementations/Localization/Core/nl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/nl.json b/Emby.Server.Implementations/Localization/Core/nl.json index 35b35e039..4423b7f98 100644 --- a/Emby.Server.Implementations/Localization/Core/nl.json +++ b/Emby.Server.Implementations/Localization/Core/nl.json @@ -58,7 +58,7 @@ "NotificationOptionPluginUpdateInstalled": "Plug-in-update geïnstalleerd", "NotificationOptionServerRestartRequired": "Server herstart nodig", "NotificationOptionTaskFailed": "Geplande taak mislukt", - "NotificationOptionUserLockedOut": "Gebruikersaccount vergrendeld", + "NotificationOptionUserLockedOut": "Gebruiker is vergrendeld", "NotificationOptionVideoPlayback": "Video gestart", "NotificationOptionVideoPlaybackStopped": "Video gestopt", "Photos": "Foto's", -- cgit v1.2.3 From dda431dff198d2b375128cd3e29cac01eb8627e1 Mon Sep 17 00:00:00 2001 From: tanto faz Date: Sat, 14 Dec 2019 15:44:06 +0000 Subject: Translated using Weblate (Portuguese (Brazil)) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/pt_BR/ --- Emby.Server.Implementations/Localization/Core/pt-BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/pt-BR.json b/Emby.Server.Implementations/Localization/Core/pt-BR.json index fcc724a7d..41a389e3b 100644 --- a/Emby.Server.Implementations/Localization/Core/pt-BR.json +++ b/Emby.Server.Implementations/Localization/Core/pt-BR.json @@ -24,7 +24,7 @@ "HeaderFavoriteShows": "Séries Favoritas", "HeaderFavoriteSongs": "Músicas Favoritas", "HeaderLiveTV": "TV ao Vivo", - "HeaderNextUp": "Próximos", + "HeaderNextUp": "A Seguir", "HeaderRecordingGroups": "Grupos de Gravação", "HomeVideos": "Vídeos caseiros", "Inherit": "Herdar", -- cgit v1.2.3 From db61a58c39490f86c86c3ee6c6f11743796fb10e Mon Sep 17 00:00:00 2001 From: Óskar Freyr Date: Sun, 15 Dec 2019 16:22:04 +0000 Subject: Translated using Weblate (Icelandic) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/is/ --- Emby.Server.Implementations/Localization/Core/is.json | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/is.json b/Emby.Server.Implementations/Localization/Core/is.json index af0da4169..c3b5211b8 100644 --- a/Emby.Server.Implementations/Localization/Core/is.json +++ b/Emby.Server.Implementations/Localization/Core/is.json @@ -62,5 +62,17 @@ "NameInstallFailed": "{0} uppsetning mistókst", "MusicVideos": "Tónlistarmyndbönd", "Music": "Tónlist", - "Movies": "Kvikmyndir" + "Movies": "Kvikmyndir", + "UserDeletedWithName": "Notanda {0} hefur verið eytt", + "UserCreatedWithName": "Notandi {0} hefur verið stofnaður", + "TvShows": "Þættir", + "Sync": "Samstilla", + "Songs": "Lög", + "ServerNameNeedsToBeRestarted": "{0} þarf að endurræsa", + "ScheduledTaskStartedWithName": "{0} hafin", + "ScheduledTaskFailedWithName": "{0} mistókst", + "PluginUpdatedWithName": "{0} var uppfært", + "PluginUninstalledWithName": "{0} var fjarlægt", + "PluginInstalledWithName": "{0} var sett upp", + "NotificationOptionTaskFailed": "Tímasett verkefni mistókst" } -- cgit v1.2.3 From 0f444c21e9d2e2e8dbb4c454cc7d3dc467de8d32 Mon Sep 17 00:00:00 2001 From: pagaiba Date: Mon, 16 Dec 2019 17:50:13 +0000 Subject: Translated using Weblate (Catalan) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ca/ --- .../Localization/Core/ca.json | 74 +++++++++++----------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'Emby.Server.Implementations') diff --git a/Emby.Server.Implementations/Localization/Core/ca.json b/Emby.Server.Implementations/Localization/Core/ca.json index 74406a064..9961b0984 100644 --- a/Emby.Server.Implementations/Localization/Core/ca.json +++ b/Emby.Server.Implementations/Localization/Core/ca.json @@ -1,11 +1,11 @@ { "Albums": "Àlbums", - "AppDeviceValues": "App: {0}, Dispositiu: {1}", - "Application": "Application", + "AppDeviceValues": "Aplicació: {0}, Dispositiu: {1}", + "Application": "Aplicació", "Artists": "Artistes", "AuthenticationSucceededWithUserName": "{0} s'ha autenticat correctament", "Books": "Llibres", - "CameraImageUploadedFrom": "A new camera image has been uploaded from {0}", + "CameraImageUploadedFrom": "Una nova imatge de càmera ha sigut pujada des de {0}", "Channels": "Canals", "ChapterNameValue": "Episodi {0}", "Collections": "Col·leccions", @@ -15,8 +15,8 @@ "Favorites": "Preferits", "Folders": "Directoris", "Genres": "Gèneres", - "HeaderAlbumArtists": "Album Artists", - "HeaderCameraUploads": "Camera Uploads", + "HeaderAlbumArtists": "Artistes dels Àlbums", + "HeaderCameraUploads": "Pujades de Càmera", "HeaderContinueWatching": "Continua Veient", "HeaderFavoriteAlbums": "Àlbums Preferits", "HeaderFavoriteArtists": "Artistes Preferits", @@ -27,71 +27,71 @@ "HeaderNextUp": "A continuació", "HeaderRecordingGroups": "Grups d'Enregistrament", "HomeVideos": "Vídeos domèstics", - "Inherit": "Heretat", - "ItemAddedWithName": "{0} afegit a la biblioteca", - "ItemRemovedWithName": "{0} eliminat de la biblioteca", + "Inherit": "Hereta", + "ItemAddedWithName": "{0} ha estat afegit a la biblioteca", + "ItemRemovedWithName": "{0} ha estat eliminat de la biblioteca", "LabelIpAddressValue": "Adreça IP: {0}", - "LabelRunningTimeValue": "Temps en marxa: {0}", + "LabelRunningTimeValue": "Temps en funcionament: {0}", "Latest": "Darreres", - "MessageApplicationUpdated": "El Servidor d'Jellyfin ha estat actualitzat", - "MessageApplicationUpdatedTo": "Jellyfin Server has been updated to {0}", - "MessageNamedServerConfigurationUpdatedWithValue": "La secció de configuració {0} ha estat actualitzada", + "MessageApplicationUpdated": "El Servidor de Jellyfin ha estat actualitzat", + "MessageApplicationUpdatedTo": "El Servidor de Jellyfin ha estat actualitzat a {0}", + "MessageNamedServerConfigurationUpdatedWithValue": "La secció {0} de la configuració del servidor ha estat actualitzada", "MessageServerConfigurationUpdated": "S'ha actualitzat la configuració del servidor", "MixedContent": "Contingut mesclat", "Movies": "Pel·lícules", "Music": "Música", "MusicVideos": "Vídeos musicals", - "NameInstallFailed": "{0} installation failed", + "NameInstallFailed": "Instalació de {0} fallida", "NameSeasonNumber": "Temporada {0}", - "NameSeasonUnknown": "Season Unknown", - "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.", + "NameSeasonUnknown": "Temporada Desconeguda", + "NewVersionIsAvailable": "Una nova versió del Servidor Jellyfin està disponible per descarregar.", "NotificationOptionApplicationUpdateAvailable": "Actualització d'aplicació disponible", "NotificationOptionApplicationUpdateInstalled": "Actualització d'aplicació instal·lada", - "NotificationOptionAudioPlayback": "Audio playback started", - "NotificationOptionAudioPlaybackStopped": "Audio playback stopped", - "NotificationOptionCameraImageUploaded": "Camera image uploaded", - "NotificationOptionInstallationFailed": "Installation failure", - "NotificationOptionNewLibraryContent": "New content added", - "NotificationOptionPluginError": "Un component ha fallat", - "NotificationOptionPluginInstalled": "Complement instal·lat", - "NotificationOptionPluginUninstalled": "Complement desinstal·lat", - "NotificationOptionPluginUpdateInstalled": "Actualització de complement instal·lada", - "NotificationOptionServerRestartRequired": "Server restart required", - "NotificationOptionTaskFailed": "Scheduled task failure", - "NotificationOptionUserLockedOut": "User locked out", - "NotificationOptionVideoPlayback": "Video playback started", - "NotificationOptionVideoPlaybackStopped": "Video playback stopped", + "NotificationOptionAudioPlayback": "Reproducció d'audio iniciada", + "NotificationOptionAudioPlaybackStopped": "Reproducció d'audio aturada", + "NotificationOptionCameraImageUploaded": "Imatge de càmera pujada", + "NotificationOptionInstallationFailed": "Instalació fallida", + "NotificationOptionNewLibraryContent": "Nou contingut afegit", + "NotificationOptionPluginError": "Un connector ha fallat", + "NotificationOptionPluginInstalled": "Connector instal·lat", + "NotificationOptionPluginUninstalled": "Connector desinstal·lat", + "NotificationOptionPluginUpdateInstalled": "Actualització de connector instal·lada", + "NotificationOptionServerRestartRequired": "Reinici del servidor requerit", + "NotificationOptionTaskFailed": "Tasca programada fallida", + "NotificationOptionUserLockedOut": "Usuari tancat", + "NotificationOptionVideoPlayback": "Reproducció de video iniciada", + "NotificationOptionVideoPlaybackStopped": "Reproducció de video aturada", "Photos": "Fotos", "Playlists": "Llistes de reproducció", - "Plugin": "Plugin", + "Plugin": "Connector", "PluginInstalledWithName": "{0} ha estat instal·lat", "PluginUninstalledWithName": "{0} ha estat desinstal·lat", "PluginUpdatedWithName": "{0} ha estat actualitzat", "ProviderValue": "Proveïdor: {0}", "ScheduledTaskFailedWithName": "{0} ha fallat", "ScheduledTaskStartedWithName": "{0} iniciat", - "ServerNameNeedsToBeRestarted": "{0} needs to be restarted", - "Shows": "Espectacles", + "ServerNameNeedsToBeRestarted": "{0} necessita ser reiniciat", + "Shows": "Programes", "Songs": "Cançons", "StartupEmbyServerIsLoading": "El Servidor d'Jellyfin està carregant. Si et plau, prova de nou en breus.", "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}", - "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} for {1}", + "SubtitleDownloadFailureFromForItem": "Els subtítols no s'han pogut baixar de {0} per {1}", "SubtitlesDownloadedForItem": "Subtítols descarregats per a {0}", - "Sync": "Sync", + "Sync": "Sincronitzar", "System": "System", "TvShows": "Espectacles de TV", "User": "User", "UserCreatedWithName": "S'ha creat l'usuari {0}", "UserDeletedWithName": "L'usuari {0} ha estat eliminat", "UserDownloadingItemWithValues": "{0} està descarregant {1}", - "UserLockedOutWithName": "User {0} has been locked out", + "UserLockedOutWithName": "L'usuari {0} ha sigut tancat", "UserOfflineFromDevice": "{0} s'ha desconnectat de {1}", "UserOnlineFromDevice": "{0} està connectat des de {1}", "UserPasswordChangedWithName": "La contrasenya ha estat canviada per a l'usuari {0}", - "UserPolicyUpdatedWithName": "User policy has been updated for {0}", + "UserPolicyUpdatedWithName": "La política d'usuari s'ha actualitzat per {0}", "UserStartedPlayingItemWithValues": "{0} ha començat a reproduir {1}", "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}", - "ValueHasBeenAddedToLibrary": "{0} has been added to your media library", + "ValueHasBeenAddedToLibrary": "{0} ha sigut afegit a la teva llibreria", "ValueSpecialEpisodeName": "Especial - {0}", "VersionNumber": "Versió {0}" } -- cgit v1.2.3