diff --git a/Logo/1024.png b/Logo/1024.png index 6923c2554..0e3753b4a 100644 Binary files a/Logo/1024.png and b/Logo/1024.png differ diff --git a/Logo/128.png b/Logo/128.png index 5e143b52e..02f00f08f 100644 Binary files a/Logo/128.png and b/Logo/128.png differ diff --git a/Logo/16.png b/Logo/16.png index 0a042f4bb..61841ab86 100644 Binary files a/Logo/16.png and b/Logo/16.png differ diff --git a/Logo/256.png b/Logo/256.png index c958e1bbf..c053975a4 100644 Binary files a/Logo/256.png and b/Logo/256.png differ diff --git a/Logo/32.png b/Logo/32.png index f1fe93db5..41a6dd279 100644 Binary files a/Logo/32.png and b/Logo/32.png differ diff --git a/Logo/400.png b/Logo/400.png index dac41bfd8..f413f967e 100644 Binary files a/Logo/400.png and b/Logo/400.png differ diff --git a/Logo/48.png b/Logo/48.png index 8b9d0fc88..45cf3047c 100644 Binary files a/Logo/48.png and b/Logo/48.png differ diff --git a/Logo/512.png b/Logo/512.png index d2f56252f..16f7068a0 100644 Binary files a/Logo/512.png and b/Logo/512.png differ diff --git a/Logo/64.png b/Logo/64.png index 80edc7894..483e3d809 100644 Binary files a/Logo/64.png and b/Logo/64.png differ diff --git a/Logo/800.png b/Logo/800.png index 4a1d25228..516222468 100644 Binary files a/Logo/800.png and b/Logo/800.png differ diff --git a/Logo/Radarr.svg b/Logo/Radarr.svg index a9ce35970..575ae24da 100644 --- a/Logo/Radarr.svg +++ b/Logo/Radarr.svg @@ -1,572 +1,25 @@ - - - - SVG - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + diff --git a/README.md b/README.md index b2eeb345d..8b25677f7 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,9 @@ | AppVeyor | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr/master.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr) | [![AppVeyor](https://img.shields.io/appveyor/ci/galli-leo/Radarr-usby1/develop.svg?maxAge=60&style=flat-square)](https://ci.appveyor.com/project/galli-leo/Radarr-usby1) | | Travis | [![Travis](https://img.shields.io/travis/Radarr/Radarr/master.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | [![Travis](https://img.shields.io/travis/Radarr/Radarr/develop.svg?maxAge=60&style=flat-square)](https://travis-ci.org/Radarr/Radarr) | -This fork of Sonarr aims to turn it into something like CouchPotato. +A fork of [Sonarr](https://github.com/Sonarr/Sonarr) to work with movies à la Couchpotato. + +**This fork works independently of Sonarr and will not interfere with it.** ## Downloads @@ -34,33 +36,33 @@ To connect to the UI, fire up your browser and open or < ## Features -### Currently Working +### Current Features -* Adding new movies -* Manually searching for releases of movies -* Automatically searching for releases +* Adding new movies with lots of information, such as trailers, ratings, etc. +* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc. +* Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray* +* Automatic failed download handling will try another release if one fails +* Manual search so you can pick any release or to see why a release was not downloaded automatically +* Full integration with SABnzbd and NZBGet +* Automatically searching for releases as well as RSS Sync * Automatically importing downloaded movies * Recognizing Special Editions, Director's Cut, etc. * Identifying releases with hardcoded subs -* Rarbg.to, Torznab and Newznab Indexer -* QBittorrent and Deluge download client (Other clients are coming) +* All indexers supported by Sonarr also supported +* New PassThePopcorn Indexer +* QBittorrent, Deluge, rTorrent, Transmission and uTorrent download client (Other clients are coming) * New TorrentPotato Indexer (Works well with [Jackett](https://github.com/Jackett/Jackett)) +* And a beautiful UI ### Planned Features * Scanning PreDB to know when a new release is available * Fixing the other Indexers and download clients -* Importing of Sonarr config - -### Major Features - -* Support for major platforms: Windows, Linux, macOS, Raspberry Pi, etc. -* Can watch for better quality of the movies you have and do an automatic upgrade. *eg. from DVD to Blu-Ray* -* Automatic failed download handling will try another release if one fails -* Manual search so you can pick any release or to see why a release was not downloaded automatically -* Full integration with SABnzbd and NZBGet +* Importing movies from various online sources, such as IMDb Watchlists (A complete list can be found [here](https://github.com/Radarr/Radarr/issues/114)) * Full integration with Kodi, Plex (notification, library update, metadata) -* And a beautiful UI + +##Feature Requests +[![Feature Requests](http://feathub.com/Radarr/Radarr?format=svg)](http://feathub.com/Radarr/Radarr) ## Configuring Development Environment diff --git a/src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs b/src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs index f6efc16ce..7aa1bce2a 100644 --- a/src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs +++ b/src/NzbDrone.Api/Authentication/EnableAuthInNancy.cs @@ -64,6 +64,8 @@ namespace NzbDrone.Api.Authentication new DefaultHmacProvider(new PassphraseKeyGenerator(_configService.HmacPassphrase, Encoding.ASCII.GetBytes(_configService.HmacSalt))) ); + FormsAuthentication.FormsAuthenticationCookieName = "_ncfaradarr"; //For those people that both have sonarr and radarr. + FormsAuthentication.Enable(pipelines, new FormsAuthenticationConfiguration { RedirectUrl = _configFileProvider.UrlBase + "/login", diff --git a/src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs b/src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs index 8a3f2d54c..fce86cd86 100644 --- a/src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs +++ b/src/NzbDrone.Api/Validation/RssSyncIntervalValidator.cs @@ -5,7 +5,7 @@ namespace NzbDrone.Api.Validation public class RssSyncIntervalValidator : PropertyValidator { public RssSyncIntervalValidator() - : base("Must be between 10 and 120 or 0 to disable") + : base("Must be between 10 and 720 or 0 to disable") { } @@ -23,7 +23,7 @@ namespace NzbDrone.Api.Validation return true; } - if (value >= 10 && value <= 120) + if (value >= 10 && value <= 720) { return true; } diff --git a/src/NzbDrone.Console/Radarr.ico b/src/NzbDrone.Console/Radarr.ico index 6f0a8b50e..7d20c6f5a 100644 Binary files a/src/NzbDrone.Console/Radarr.ico and b/src/NzbDrone.Console/Radarr.ico differ diff --git a/src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs b/src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs index 8ad51f1e7..ee834d507 100644 --- a/src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Configuration/ConfigServiceFixture.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.Configuration [Test] public void Get_value_should_return_default_when_no_value() { - Subject.RssSyncInterval.Should().Be(15); + Subject.RssSyncInterval.Should().Be(60); } [Test] @@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.Configuration public void get_value_with_out_persist_should_not_store_default_value() { var interval = Subject.RssSyncInterval; - interval.Should().Be(15); + interval.Should().Be(60); Mocker.GetMock().Verify(c => c.Insert(It.IsAny()), Times.Never()); } diff --git a/src/NzbDrone.Core/Configuration/ConfigService.cs b/src/NzbDrone.Core/Configuration/ConfigService.cs index 4eae607ae..d19cddd67 100644 --- a/src/NzbDrone.Core/Configuration/ConfigService.cs +++ b/src/NzbDrone.Core/Configuration/ConfigService.cs @@ -100,7 +100,7 @@ namespace NzbDrone.Core.Configuration public int RssSyncInterval { - get { return GetValueInt("RssSyncInterval", 15); } + get { return GetValueInt("RssSyncInterval", 60); } set { SetValue("RssSyncInterval", value); } } diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs index ccb87c414..fe03e89a0 100644 --- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs +++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/MonitoredEpisodeSpecification.cs @@ -19,7 +19,21 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync public Decision IsSatisfiedBy(RemoteMovie subject, SearchCriteriaBase searchCriteria) { - throw new NotImplementedException(); + if (searchCriteria != null) + { + if (searchCriteria.UserInvokedSearch) + { + _logger.Debug("Skipping monitored check during search"); + return Decision.Accept(); + } + } + + if (!subject.Movie.Monitored) + { + return Decision.Reject("Movie is not monitored"); + } + + return Decision.Accept(); } public virtual Decision IsSatisfiedBy(RemoteEpisode subject, SearchCriteriaBase searchCriteria) diff --git a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs index 0e5b3a13a..f49f3772e 100644 --- a/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs +++ b/src/NzbDrone.Core/Download/RedownloadFailedDownloadService.cs @@ -5,6 +5,7 @@ using NzbDrone.Core.IndexerSearch; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Tv; +using System.Collections.Generic; namespace NzbDrone.Core.Download { @@ -38,7 +39,7 @@ namespace NzbDrone.Core.Download { _logger.Debug("Failed download contains a movie, searching again."); - _commandQueueManager.Push(new MoviesSearchCommand { MovieId = message.MovieId }); + _commandQueueManager.Push(new MoviesSearchCommand { MovieIds = new List { message.MovieId } }); return; } diff --git a/src/NzbDrone.Core/Extras/ExtraService.cs b/src/NzbDrone.Core/Extras/ExtraService.cs index 85889ce44..8ba14e3d8 100644 --- a/src/NzbDrone.Core/Extras/ExtraService.cs +++ b/src/NzbDrone.Core/Extras/ExtraService.cs @@ -102,13 +102,13 @@ namespace NzbDrone.Core.Extras public void Handle(MediaCoversUpdatedEvent message) { - var series = message.Series; - var episodeFiles = GetEpisodeFiles(series.Id); + //var series = message.Series; + //var episodeFiles = GetEpisodeFiles(series.Id); - foreach (var extraFileManager in _extraFileManagers) - { - extraFileManager.CreateAfterSeriesScan(series, episodeFiles); - } + //foreach (var extraFileManager in _extraFileManagers) + //{ + // extraFileManager.CreateAfterSeriesScan(series, episodeFiles); + //} } //TODO: Implementing this will fix a lot of our warning exceptions diff --git a/src/NzbDrone.Core/IndexerSearch/MissingMoviesSearchCommand.cs b/src/NzbDrone.Core/IndexerSearch/MissingMoviesSearchCommand.cs new file mode 100644 index 000000000..7c53532c3 --- /dev/null +++ b/src/NzbDrone.Core/IndexerSearch/MissingMoviesSearchCommand.cs @@ -0,0 +1,13 @@ +using NzbDrone.Core.Messaging.Commands; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace NzbDrone.Core.IndexerSearch +{ + public class MissingMoviesSearchCommand : Command + { + public override bool SendUpdatesToClient => true; + } +} diff --git a/src/NzbDrone.Core/IndexerSearch/MoviesSearchCommand.cs b/src/NzbDrone.Core/IndexerSearch/MoviesSearchCommand.cs index da0b9a8c1..214c59d6b 100644 --- a/src/NzbDrone.Core/IndexerSearch/MoviesSearchCommand.cs +++ b/src/NzbDrone.Core/IndexerSearch/MoviesSearchCommand.cs @@ -1,10 +1,11 @@ using NzbDrone.Core.Messaging.Commands; +using System.Collections.Generic; namespace NzbDrone.Core.IndexerSearch { public class MoviesSearchCommand : Command { - public int MovieId { get; set; } + public List MovieIds { get; set; } public override bool SendUpdatesToClient => true; } diff --git a/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs b/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs index 656423178..5b8e4dd37 100644 --- a/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/MoviesSearchService.cs @@ -4,22 +4,23 @@ using NzbDrone.Common.Instrumentation.Extensions; using NzbDrone.Core.Download; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Tv; +using NzbDrone.Core.Datastore; namespace NzbDrone.Core.IndexerSearch { - public class MovieSearchService : IExecute + public class MovieSearchService : IExecute, IExecute { - private readonly IMovieService _seriesService; + private readonly IMovieService _movieService; private readonly ISearchForNzb _nzbSearchService; private readonly IProcessDownloadDecisions _processDownloadDecisions; private readonly Logger _logger; - public MovieSearchService(IMovieService seriesService, + public MovieSearchService(IMovieService movieService, ISearchForNzb nzbSearchService, IProcessDownloadDecisions processDownloadDecisions, Logger logger) { - _seriesService = seriesService; + _movieService = movieService; _nzbSearchService = nzbSearchService; _processDownloadDecisions = processDownloadDecisions; _logger = logger; @@ -27,20 +28,35 @@ namespace NzbDrone.Core.IndexerSearch public void Execute(MoviesSearchCommand message) { - var series = _seriesService.GetMovie(message.MovieId); - var downloadedCount = 0; - + foreach (var movieId in message.MovieIds) + { + var series = _movieService.GetMovie(movieId); + if (!series.Monitored) { _logger.Debug("Movie {0} is not monitored, skipping search", series.Title); } - var decisions = _nzbSearchService.MovieSearch(message.MovieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual); + var decisions = _nzbSearchService.MovieSearch(movieId, false);//_nzbSearchService.SeasonSearch(message.MovieId, season.SeasonNumber, false, message.Trigger == CommandTrigger.Manual); downloadedCount += _processDownloadDecisions.ProcessDecisions(decisions).Grabbed.Count; - + } _logger.ProgressInfo("Movie search completed. {0} reports downloaded.", downloadedCount); } + + public void Execute(MissingMoviesSearchCommand message) + { + var movies = _movieService.MoviesWithoutFiles(new PagingSpec + { + Page = 1, + PageSize = 100000, + SortDirection = SortDirection.Ascending, + SortKey = "Id", + FilterExpression = + v => + v.Monitored == true + }).Records.ToList(); + } } } diff --git a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs index 00289d7e4..73b36335b 100644 --- a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDRequestGenerator.cs @@ -54,13 +54,19 @@ namespace NzbDrone.Core.Indexers.AwesomeHD private IEnumerable GetRequest(string searchParameters) { + var onlyInternal = ""; + if (Settings.Internal) + { + onlyInternal = "&internal=true"; + } + if (searchParameters != null) { - yield return new IndexerRequest(string.Format("{0}/searchapi.php?action=imdbsearch&passkey={1}&imdb={2}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.Passkey.Trim(), searchParameters), HttpAccept.Rss); + yield return new IndexerRequest($"{Settings.BaseUrl.Trim().TrimEnd('/')}/searchapi.php?action=imdbsearch&passkey={Settings.Passkey.Trim()}&imdb={searchParameters}", HttpAccept.Rss); } else { - yield return new IndexerRequest(string.Format("{0}/searchapi.php?action=latestmovies&passkey={1}", Settings.BaseUrl.Trim().TrimEnd('/'), Settings.Passkey.Trim()), HttpAccept.Rss); + yield return new IndexerRequest($"{Settings.BaseUrl.Trim().TrimEnd('/')}/searchapi.php?action=latestmovies&passkey={Settings.Passkey.Trim()}{onlyInternal}", HttpAccept.Rss); } } diff --git a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs index 3c6f525c4..1d1b259f1 100644 --- a/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs +++ b/src/NzbDrone.Core/Indexers/AwesomeHD/AwesomeHDSettings.cs @@ -29,6 +29,9 @@ namespace NzbDrone.Core.Indexers.AwesomeHD [FieldDefinition(1, Label = "Passkey")] public string Passkey { get; set; } + [FieldDefinition(2, Type = FieldType.Checkbox, Label = "Require Internal", HelpText = "Will only include internal releases for RSS Sync.")] + public bool Internal { get; set; } + public NzbDroneValidationResult Validate() { return new NzbDroneValidationResult(Validator.Validate(this)); diff --git a/src/NzbDrone.Core/Jobs/TaskManager.cs b/src/NzbDrone.Core/Jobs/TaskManager.cs index 43af20db5..d5303a97c 100644 --- a/src/NzbDrone.Core/Jobs/TaskManager.cs +++ b/src/NzbDrone.Core/Jobs/TaskManager.cs @@ -30,12 +30,14 @@ namespace NzbDrone.Core.Jobs { private readonly IScheduledTaskRepository _scheduledTaskRepository; private readonly IConfigService _configService; + private readonly IConfigFileProvider _configFileProvider; private readonly Logger _logger; - public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, Logger logger) + public TaskManager(IScheduledTaskRepository scheduledTaskRepository, IConfigService configService, IConfigFileProvider configFileProvider, Logger logger) { _scheduledTaskRepository = scheduledTaskRepository; _configService = configService; + _configFileProvider = configFileProvider; _logger = logger; } @@ -59,11 +61,18 @@ namespace NzbDrone.Core.Jobs public void Handle(ApplicationStartedEvent message) { + float updateInterval = 6 * 60; + + if (_configFileProvider.Branch == "nightly") + { + updateInterval = 30; + } + var defaultTasks = new[] { new ScheduledTask{ Interval = 0.25f, TypeName = typeof(CheckForFinishedDownloadCommand).FullName}, new ScheduledTask{ Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName}, - new ScheduledTask{ Interval = 6*60, TypeName = typeof(ApplicationUpdateCommand).FullName}, + new ScheduledTask{ Interval = updateInterval, TypeName = typeof(ApplicationUpdateCommand).FullName}, // new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName}, new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName}, new ScheduledTask{ Interval = 24*60, TypeName = typeof(RefreshMovieCommand).FullName}, diff --git a/src/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs b/src/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs index 83f1e13de..54fc79a0a 100644 --- a/src/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs +++ b/src/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs @@ -1,5 +1,8 @@ -using NzbDrone.Common.Disk; +using System; +using NzbDrone.Common.Disk; using NzbDrone.Common.Http; +using System.Drawing; +using NLog; namespace NzbDrone.Core.MediaCover { @@ -12,11 +15,13 @@ namespace NzbDrone.Core.MediaCover { private readonly IDiskProvider _diskProvider; private readonly IHttpClient _httpClient; + private readonly Logger _logger; - public CoverAlreadyExistsSpecification(IDiskProvider diskProvider, IHttpClient httpClient) + public CoverAlreadyExistsSpecification(IDiskProvider diskProvider, IHttpClient httpClient, Logger logger) { _diskProvider = diskProvider; _httpClient = httpClient; + _logger = logger; } public bool AlreadyExists(string url, string path) @@ -26,9 +31,38 @@ namespace NzbDrone.Core.MediaCover return false; } + if (!IsValidGDIPlusImage(path)) + { + _diskProvider.DeleteFile(path); + return false; + } + var headers = _httpClient.Head(new HttpRequest(url)).Headers; var fileSize = _diskProvider.GetFileSize(path); return fileSize == headers.ContentLength; } + + private bool IsValidGDIPlusImage(string filename) + { + try + { + GdiPlusInterop.CheckGdiPlus(); + + using (var bmp = new Bitmap(filename)) + { + } + return true; + } + catch (DllNotFoundException ex) + { + _logger.Error(ex, "Could not find libgdiplus. Cannot test if image is corrupt."); + return true; + } + catch (Exception ex) + { + _logger.Debug(ex, "Corrupted image found at: {0}. Redownloading...", filename); + return false; + } + } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs index dd5b02ec8..65d0706e2 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoModel.cs @@ -48,11 +48,12 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo return AudioChannelPositionsText.ContainsIgnoreCase("LFE") ? AudioChannels - 1 + 0.1m : AudioChannels; } - decimal channels = 0; - - decimal.TryParse(AudioChannelPositions.Split('/').First(), out channels); - - return channels; + return + AudioChannelPositions.Replace("Object Based /", "").Replace(" / ", "$") + .Split('$') + .First() + .Split('/') + .Sum(s => decimal.Parse(s, CultureInfo.InvariantCulture)); } } } diff --git a/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs b/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs index e5256a6dc..20a2738a5 100644 --- a/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs +++ b/src/NzbDrone.Core/MetadataSource/IProvideMovieInfo.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using NzbDrone.Core.Profiles; using NzbDrone.Core.Tv; namespace NzbDrone.Core.MetadataSource @@ -7,6 +8,6 @@ namespace NzbDrone.Core.MetadataSource public interface IProvideMovieInfo { Movie GetMovieInfo(string ImdbId); - Movie GetMovieInfo(int TmdbId); + Movie GetMovieInfo(int TmdbId, Profile profile); } } \ No newline at end of file diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index f158b44fe..a6ad60957 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -14,6 +14,8 @@ using NzbDrone.Core.Tv; using Newtonsoft.Json; using System.Text.RegularExpressions; using System.Text; +using NzbDrone.Core.Parser; +using NzbDrone.Core.Profiles; namespace NzbDrone.Core.MetadataSource.SkyHook { @@ -67,25 +69,39 @@ namespace NzbDrone.Core.MetadataSource.SkyHook return new Tuple>(series, episodes.ToList()); } - public Movie GetMovieInfo(int TmdbId) + public Movie GetMovieInfo(int TmdbId, Profile profile = null) { + var langCode = profile != null ? IsoLanguages.Get(profile.Language).TwoLetterCode : "us"; + var request = _movieBuilder.Create() .SetSegment("route", "movie") .SetSegment("id", TmdbId.ToString()) .SetSegment("secondaryRoute", "") .AddQueryParam("append_to_response", "alternative_titles,release_dates,videos") - .AddQueryParam("country", "US") + .AddQueryParam("language", langCode.ToUpper()) + // .AddQueryParam("country", "US") .Build(); request.AllowAutoRedirect = true; request.SuppressHttpError = true; var response = _httpClient.Get(request); - var resource = response.Resource; var movie = new Movie(); + foreach (var alternativeTitle in resource.alternative_titles.titles) + { + if (alternativeTitle.iso_3166_1.ToLower() == langCode) + { + movie.AlternativeTitles.Add(alternativeTitle.title); + } + else if (alternativeTitle.iso_3166_1.ToLower() == "us") + { + movie.AlternativeTitles.Add(alternativeTitle.title); + } + } + movie.TmdbId = TmdbId; movie.ImdbId = resource.imdb_id; movie.Title = resource.title; @@ -106,10 +122,10 @@ namespace NzbDrone.Core.MetadataSource.SkyHook movie.Images.Add(_configService.GetCoverForURL(resource.backdrop_path, MediaCoverTypes.Banner)); movie.Runtime = resource.runtime; - foreach(Title title in resource.alternative_titles.titles) - { - movie.AlternativeTitles.Add(title.title); - } + //foreach(Title title in resource.alternative_titles.titles) + //{ + // movie.AlternativeTitles.Add(title.title); + //} foreach(ReleaseDates releaseDates in resource.release_dates.results) { @@ -149,7 +165,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook { movie.Status = MovieStatusType.Announced; } - + if (resource.videos != null) { foreach (Video video in resource.videos.results) diff --git a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs index c3443c33b..aa83d5c90 100644 --- a/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs +++ b/src/NzbDrone.Core/Notifications/Boxcar/Boxcar.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.Boxcar public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index a160963c7..d89f3aa42 100644 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Collections.Specialized; using System.IO; using System.Linq; @@ -24,77 +25,67 @@ namespace NzbDrone.Core.Notifications.CustomScript _logger = logger; } - public override string Link => "https://github.com/Sonarr/Sonarr/wiki/Custom-Post-Processing-Scripts"; + public override string Link => "https://github.com/Radarr/Radarr/wiki/Custom-Post-Processing-Scripts"; public override void OnGrab(GrabMessage message) { - var series = message.Series; - var remoteEpisode = message.Episode; - var releaseGroup = remoteEpisode.ParsedEpisodeInfo.ReleaseGroup; + var movie = message.Movie; + var remoteMovie = message.RemoteMovie; + var releaseGroup = remoteMovie.ParsedMovieInfo.ReleaseGroup; var environmentVariables = new StringDictionary(); - environmentVariables.Add("Sonarr_EventType", "Grab"); - environmentVariables.Add("Sonarr_Series_Id", series.Id.ToString()); - environmentVariables.Add("Sonarr_Series_Title", series.Title); - environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString()); - environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString()); - environmentVariables.Add("Sonarr_Release_EpisodeCount", remoteEpisode.Episodes.Count.ToString()); - environmentVariables.Add("Sonarr_Release_SeasonNumber", remoteEpisode.ParsedEpisodeInfo.SeasonNumber.ToString()); - environmentVariables.Add("Sonarr_Release_EpisodeNumbers", string.Join(",", remoteEpisode.Episodes.Select(e => e.EpisodeNumber))); - environmentVariables.Add("Sonarr_Release_Title", remoteEpisode.Release.Title); - environmentVariables.Add("Sonarr_Release_Indexer", remoteEpisode.Release.Indexer); - environmentVariables.Add("Sonarr_Release_Size", remoteEpisode.Release.Size.ToString()); - environmentVariables.Add("Sonarr_Release_ReleaseGroup", releaseGroup); + environmentVariables.Add("Radarr_EventType", "Grab"); + environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString()); + environmentVariables.Add("Radarr_Movie_Title", movie.Title); + environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId.ToString()); + environmentVariables.Add("Radarr_Release_Title", remoteMovie.Release.Title); + environmentVariables.Add("Radarr_Release_Indexer", remoteMovie.Release.Indexer); + environmentVariables.Add("Radarr_Release_Size", remoteMovie.Release.Size.ToString()); + environmentVariables.Add("Radarr_Release_ReleaseGroup", releaseGroup); ExecuteScript(environmentVariables); } public override void OnDownload(DownloadMessage message) { - var series = message.Series; - var episodeFile = message.EpisodeFile; + var movie = message.Movie; + var movieFile = message.MovieFile; var sourcePath = message.SourcePath; var environmentVariables = new StringDictionary(); - environmentVariables.Add("Sonarr_EventType", "Download"); - environmentVariables.Add("Sonarr_Series_Id", series.Id.ToString()); - environmentVariables.Add("Sonarr_Series_Title", series.Title); - environmentVariables.Add("Sonarr_Series_Path", series.Path); - environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString()); - environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString()); - environmentVariables.Add("Sonarr_EpisodeFile_Id", episodeFile.Id.ToString()); - environmentVariables.Add("Sonarr_EpisodeFile_EpisodeCount", episodeFile.Episodes.Value.Count.ToString()); - environmentVariables.Add("Sonarr_EpisodeFile_RelativePath", episodeFile.RelativePath); - environmentVariables.Add("Sonarr_EpisodeFile_Path", Path.Combine(series.Path, episodeFile.RelativePath)); - environmentVariables.Add("Sonarr_EpisodeFile_SeasonNumber", episodeFile.SeasonNumber.ToString()); - environmentVariables.Add("Sonarr_EpisodeFile_EpisodeNumbers", string.Join(",", episodeFile.Episodes.Value.Select(e => e.EpisodeNumber))); - environmentVariables.Add("Sonarr_EpisodeFile_EpisodeAirDates", string.Join(",", episodeFile.Episodes.Value.Select(e => e.AirDate))); - environmentVariables.Add("Sonarr_EpisodeFile_EpisodeAirDatesUtc", string.Join(",", episodeFile.Episodes.Value.Select(e => e.AirDateUtc))); - environmentVariables.Add("Sonarr_EpisodeFile_EpisodeTitles", string.Join("|", episodeFile.Episodes.Value.Select(e => e.Title))); - environmentVariables.Add("Sonarr_EpisodeFile_Quality", episodeFile.Quality.Quality.Name); - environmentVariables.Add("Sonarr_EpisodeFile_QualityVersion", episodeFile.Quality.Revision.Version.ToString()); - environmentVariables.Add("Sonarr_EpisodeFile_ReleaseGroup", episodeFile.ReleaseGroup ?? string.Empty); - environmentVariables.Add("Sonarr_EpisodeFile_SceneName", episodeFile.SceneName ?? string.Empty); - environmentVariables.Add("Sonarr_EpisodeFile_SourcePath", sourcePath); - environmentVariables.Add("Sonarr_EpisodeFile_SourceFolder", Path.GetDirectoryName(sourcePath)); + environmentVariables.Add("Radarr_EventType", "Download"); + environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString()); + environmentVariables.Add("Radarr_Movie_Title", movie.Title); + environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId.ToString()); + environmentVariables.Add("Radarr_MovieFile_Id", movieFile.Id.ToString()); + environmentVariables.Add("Radarr_MovieFile_RelativePath", movieFile.RelativePath); + environmentVariables.Add("Radarr_MovieFile_Path", Path.Combine(movie.Path, movieFile.RelativePath)); + environmentVariables.Add("Radarr_MovieFile_Quality", movieFile.Quality.Quality.Name); + environmentVariables.Add("Radarr_MovieFile_QualityVersion", movieFile.Quality.Revision.Version.ToString()); + environmentVariables.Add("Radarr_MovieFile_ReleaseGroup", movieFile.ReleaseGroup ?? string.Empty); + environmentVariables.Add("Radarr_MovieFile_SceneName", movieFile.SceneName ?? string.Empty); + environmentVariables.Add("Radarr_MovieFile_SourcePath", sourcePath); + environmentVariables.Add("Radarr_MovieFile_SourceFolder", Path.GetDirectoryName(sourcePath)); ExecuteScript(environmentVariables); } - public override void OnRename(Series series) + public override void OnMovieRename(Movie movie) { var environmentVariables = new StringDictionary(); - environmentVariables.Add("Sonarr_EventType", "Rename"); - environmentVariables.Add("Sonarr_Series_Id", series.Id.ToString()); - environmentVariables.Add("Sonarr_Series_Title", series.Title); - environmentVariables.Add("Sonarr_Series_Path", series.Path); - environmentVariables.Add("Sonarr_Series_TvdbId", series.TvdbId.ToString()); - environmentVariables.Add("Sonarr_Series_Type", series.SeriesType.ToString()); - + environmentVariables.Add("Radarr_EventType", "Rename"); + environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString()); + environmentVariables.Add("Radarr_Movie_Title", movie.Title); + environmentVariables.Add("Radarr_Movie_Path", movie.Path); + environmentVariables.Add("Radarr_Movie_TvdbId", movie.ImdbId.ToString()); ExecuteScript(environmentVariables); } + public override void OnRename(Series series) + { + } + public override string Name => "Custom Script"; public override ValidationResult Test() diff --git a/src/NzbDrone.Core/Notifications/DownloadMessage.cs b/src/NzbDrone.Core/Notifications/DownloadMessage.cs index a16ecea80..dd9343eeb 100644 --- a/src/NzbDrone.Core/Notifications/DownloadMessage.cs +++ b/src/NzbDrone.Core/Notifications/DownloadMessage.cs @@ -8,8 +8,11 @@ namespace NzbDrone.Core.Notifications { public string Message { get; set; } public Series Series { get; set; } + public Movie Movie { get; set; } public EpisodeFile EpisodeFile { get; set; } public List OldFiles { get; set; } + public MovieFile MovieFile { get; set; } + public List OldMovieFiles { get; set; } public string SourcePath { get; set; } public override string ToString() diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs index 27e991332..06cb6b250 100644 --- a/src/NzbDrone.Core/Notifications/Email/Email.cs +++ b/src/NzbDrone.Core/Notifications/Email/Email.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Core.Notifications.Email public override void OnGrab(GrabMessage grabMessage) { - const string subject = "Radarr [TV] - Grabbed"; + const string subject = "Radarr [Movie] - Grabbed"; var body = string.Format("{0} sent to queue.", grabMessage.Message); _emailService.SendEmail(Settings, subject, body); @@ -26,12 +26,16 @@ namespace NzbDrone.Core.Notifications.Email public override void OnDownload(DownloadMessage message) { - const string subject = "Radarr [TV] - Downloaded"; + const string subject = "Radarr [Movie] - Downloaded"; var body = string.Format("{0} Downloaded and sorted.", message.Message); _emailService.SendEmail(Settings, subject, body); } - + + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/GrabMessage.cs b/src/NzbDrone.Core/Notifications/GrabMessage.cs index e62dbe701..d2a2ac25d 100644 --- a/src/NzbDrone.Core/Notifications/GrabMessage.cs +++ b/src/NzbDrone.Core/Notifications/GrabMessage.cs @@ -8,6 +8,8 @@ namespace NzbDrone.Core.Notifications { public string Message { get; set; } public Series Series { get; set; } + public Movie Movie { get; set; } + public RemoteMovie RemoteMovie { get; set; } public RemoteEpisode Episode { get; set; } public QualityModel Quality { get; set; } diff --git a/src/NzbDrone.Core/Notifications/Growl/Growl.cs b/src/NzbDrone.Core/Notifications/Growl/Growl.cs index 99b43f625..85d1cb012 100644 --- a/src/NzbDrone.Core/Notifications/Growl/Growl.cs +++ b/src/NzbDrone.Core/Notifications/Growl/Growl.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.Growl public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _growlService.SendNotification(title, grabMessage.Message, "GRAB", Settings.Host, Settings.Port, Settings.Password); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _growlService.SendNotification(title, message.Message, "DOWNLOAD", Settings.Host, Settings.Port, Settings.Password); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/INotification.cs b/src/NzbDrone.Core/Notifications/INotification.cs index 7c4e105b9..ec3ef1464 100644 --- a/src/NzbDrone.Core/Notifications/INotification.cs +++ b/src/NzbDrone.Core/Notifications/INotification.cs @@ -10,6 +10,7 @@ namespace NzbDrone.Core.Notifications void OnGrab(GrabMessage grabMessage); void OnDownload(DownloadMessage message); void OnRename(Series series); + void OnMovieRename(Movie movie); bool SupportsOnGrab { get; } bool SupportsOnDownload { get; } bool SupportsOnUpgrade { get; } diff --git a/src/NzbDrone.Core/Notifications/Join/Join.cs b/src/NzbDrone.Core/Notifications/Join/Join.cs index 4e1f81105..ae392e5df 100644 --- a/src/NzbDrone.Core/Notifications/Join/Join.cs +++ b/src/NzbDrone.Core/Notifications/Join/Join.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.Join public override void OnGrab(GrabMessage grabMessage) { - const string title = "Radarr - Episode Grabbed"; + const string title = "Radarr - Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings); } public override void OnDownload(DownloadMessage message) { - const string title = "Radarr - Episode Downloaded"; + const string title = "Radarr - Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs b/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs index 437d10625..e50feb89a 100644 --- a/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs +++ b/src/NzbDrone.Core/Notifications/Join/JoinProxy.cs @@ -87,7 +87,7 @@ namespace NzbDrone.Core.Notifications.Join request.AddParameter("apikey", settings.ApiKey); request.AddParameter("title", title); request.AddParameter("text", message); - request.AddParameter("icon", "https://cdn.rawgit.com/Sonarr/Sonarr/develop/Logo/256.png"); // Use the Sonarr logo. + request.AddParameter("icon", "https://cdn.rawgit.com/Radarr/Radarr/develop/Logo/256.png"); // Use the Radarr logo. var response = client.ExecuteAndValidate(request); var res = Json.Deserialize(response.Content); diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs index 7c68fc306..b47385736 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowser.cs @@ -18,7 +18,7 @@ namespace NzbDrone.Core.Notifications.MediaBrowser public override void OnGrab(GrabMessage grabMessage) { - const string title = "Radarr - Grabbed"; + const string title = "Radarr - Movie Grabbed"; if (Settings.Notify) { @@ -28,7 +28,7 @@ namespace NzbDrone.Core.Notifications.MediaBrowser public override void OnDownload(DownloadMessage message) { - const string title = "Radarr - Downloaded"; + const string title = "Radarr - Movie Downloaded"; if (Settings.Notify) { @@ -41,6 +41,10 @@ namespace NzbDrone.Core.Notifications.MediaBrowser } } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { if (Settings.UpdateLibrary) diff --git a/src/NzbDrone.Core/Notifications/NotificationBase.cs b/src/NzbDrone.Core/Notifications/NotificationBase.cs index 197fadae0..c6a415cda 100644 --- a/src/NzbDrone.Core/Notifications/NotificationBase.cs +++ b/src/NzbDrone.Core/Notifications/NotificationBase.cs @@ -24,6 +24,7 @@ namespace NzbDrone.Core.Notifications public abstract void OnGrab(GrabMessage grabMessage); public abstract void OnDownload(DownloadMessage message); public abstract void OnRename(Series series); + public abstract void OnMovieRename(Movie movie); public virtual bool SupportsOnGrab => true; public virtual bool SupportsOnDownload => true; diff --git a/src/NzbDrone.Core/Notifications/NotificationService.cs b/src/NzbDrone.Core/Notifications/NotificationService.cs index 6ae201fb2..0ee596330 100644 --- a/src/NzbDrone.Core/Notifications/NotificationService.cs +++ b/src/NzbDrone.Core/Notifications/NotificationService.cs @@ -15,7 +15,11 @@ namespace NzbDrone.Core.Notifications public class NotificationService : IHandle, IHandle, - IHandle + IHandle, + IHandle, + IHandle, + IHandle + { private readonly INotificationFactory _notificationFactory; private readonly Logger _logger; @@ -67,6 +71,41 @@ namespace NzbDrone.Core.Notifications qualityString); } + private string GetMessage(Movie movie, QualityModel quality) + { + var qualityString = quality.Quality.ToString(); + + if (quality.Revision.Version > 1) + { + qualityString += " Proper"; + } + + return string.Format("{0} [{1}]", + movie.Title, + qualityString); + } + + private bool ShouldHandleMovie(ProviderDefinition definition, Movie movie) + { + var notificationDefinition = (NotificationDefinition)definition; + + if (notificationDefinition.Tags.Empty()) + { + _logger.Debug("No tags set for this notification."); + return true; + } + + if (notificationDefinition.Tags.Intersect(movie.Tags).Any()) + { + _logger.Debug("Notification and series have one or more matching tags."); + return true; + } + + //TODO: this message could be more clear + _logger.Debug("{0} does not have any tags that match {1}'s tags", notificationDefinition.Name, movie.Title); + return false; + } + private bool ShouldHandleSeries(ProviderDefinition definition, Series series) { var notificationDefinition = (NotificationDefinition) definition; @@ -112,6 +151,33 @@ namespace NzbDrone.Core.Notifications } } + public void Handle(MovieGrabbedEvent message) + { + var grabMessage = new GrabMessage + { + Message = GetMessage(message.Movie.Movie, message.Movie.ParsedMovieInfo.Quality), + Series = null, + Quality = message.Movie.ParsedMovieInfo.Quality, + Episode = null, + Movie = message.Movie.Movie, + RemoteMovie = message.Movie + }; + + foreach (var notification in _notificationFactory.OnGrabEnabled()) + { + try + { + if (!ShouldHandleMovie(notification.Definition, message.Movie.Movie)) continue; + notification.OnGrab(grabMessage); + } + + catch (Exception ex) + { + _logger.Error(ex, "Unable to send OnGrab notification to: " + notification.Definition.Name); + } + } + } + public void Handle(EpisodeDownloadedEvent message) { var downloadMessage = new DownloadMessage(); @@ -141,6 +207,38 @@ namespace NzbDrone.Core.Notifications } } + public void Handle(MovieDownloadedEvent message) + { + var downloadMessage = new DownloadMessage(); + downloadMessage.Message = GetMessage(message.Movie.Movie, message.Movie.Quality); + downloadMessage.Series = null; + downloadMessage.EpisodeFile = null; + downloadMessage.MovieFile = message.MovieFile; + downloadMessage.Movie = message.Movie.Movie; + downloadMessage.OldFiles = null; + downloadMessage.OldMovieFiles = message.OldFiles; + downloadMessage.SourcePath = message.Movie.Path; + + foreach (var notification in _notificationFactory.OnDownloadEnabled()) + { + try + { + if (ShouldHandleMovie(notification.Definition, message.Movie.Movie)) + { + if (downloadMessage.OldMovieFiles.Empty() || ((NotificationDefinition)notification.Definition).OnUpgrade) + { + notification.OnDownload(downloadMessage); + } + } + } + + catch (Exception ex) + { + _logger.Warn(ex, "Unable to send OnDownload notification to: " + notification.Definition.Name); + } + } + } + public void Handle(SeriesRenamedEvent message) { foreach (var notification in _notificationFactory.OnRenameEnabled()) @@ -159,5 +257,24 @@ namespace NzbDrone.Core.Notifications } } } + + public void Handle(MovieRenamedEvent message) + { + foreach (var notification in _notificationFactory.OnRenameEnabled()) + { + try + { + if (ShouldHandleMovie(notification.Definition, message.Movie)) + { + notification.OnMovieRename(message.Movie); + } + } + + catch (Exception ex) + { + _logger.Warn(ex, "Unable to send OnRename notification to: " + notification.Definition.Name); + } + } + } } } diff --git a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs index 176612065..502fa8f5f 100644 --- a/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs +++ b/src/NzbDrone.Core/Notifications/NotifyMyAndroid/NotifyMyAndroid.cs @@ -19,18 +19,22 @@ namespace NzbDrone.Core.Notifications.NotifyMyAndroid public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs index e38e87f96..a330468a4 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs @@ -28,6 +28,10 @@ namespace NzbDrone.Core.Notifications.Plex _plexClientService.Notify(Settings, header, message.Message); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs index e96c2c4f2..817d4f50c 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs @@ -35,6 +35,10 @@ namespace NzbDrone.Core.Notifications.Plex Notify(Settings, header, message.Message); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs b/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs index 2f3da8822..cf52620d7 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexServer.cs @@ -22,19 +22,24 @@ namespace NzbDrone.Core.Notifications.Plex public override void OnDownload(DownloadMessage message) { - UpdateIfEnabled(message.Series); + UpdateIfEnabled(message.Movie); } + public override void OnMovieRename(Movie movie) + { + UpdateIfEnabled(movie); + } + public override void OnRename(Series series) { - UpdateIfEnabled(series); + //UpdateIfEnabled(movie); } - private void UpdateIfEnabled(Series series) + private void UpdateIfEnabled(Movie movie) { if (Settings.UpdateLibrary) { - _plexServerService.UpdateLibrary(series, Settings); + _plexServerService.UpdateMovieSections(movie, Settings); } } diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs b/src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs index 0742ca049..aa9e660fd 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexServerProxy.cs @@ -17,6 +17,7 @@ namespace NzbDrone.Core.Notifications.Plex public interface IPlexServerProxy { List GetTvSections(PlexServerSettings settings); + List GetMovieSections(PlexServerSettings settings); void Update(int sectionId, PlexServerSettings settings); void UpdateSeries(int metadataId, PlexServerSettings settings); string Version(PlexServerSettings settings); @@ -66,6 +67,37 @@ namespace NzbDrone.Core.Notifications.Plex .ToList(); } + public List GetMovieSections(PlexServerSettings settings) + { + var request = GetPlexServerRequest("library/sections", Method.GET, settings); + var client = GetPlexServerClient(settings); + var response = client.Execute(request); + + _logger.Trace("Sections response: {0}", response.Content); + CheckForError(response, settings); + + if (response.Content.Contains("_children")) + { + return Json.Deserialize(response.Content) + .Sections + .Where(d => d.Type == "movie") + .Select(s => new PlexSection + { + Id = s.Id, + Language = s.Language, + Locations = s.Locations, + Type = s.Type + }) + .ToList(); + } + + return Json.Deserialize>(response.Content) + .MediaContainer + .Sections + .Where(d => d.Type == "movie") + .ToList(); + } + public void Update(int sectionId, PlexServerSettings settings) { var resource = string.Format("library/sections/{0}/refresh", sectionId); diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs b/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs index 67b8efe23..cb58e9040 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexServerService.cs @@ -14,6 +14,7 @@ namespace NzbDrone.Core.Notifications.Plex public interface IPlexServerService { void UpdateLibrary(Series series, PlexServerSettings settings); + void UpdateMovieSections(Movie movie, PlexServerSettings settings); ValidationFailure Test(PlexServerSettings settings); } @@ -62,11 +63,43 @@ namespace NzbDrone.Core.Notifications.Plex } } + public void UpdateMovieSections(Movie movie, PlexServerSettings settings) + { + try + { + _logger.Debug("Sending Update Request to Plex Server"); + + var version = _versionCache.Get(settings.Host, () => GetVersion(settings), TimeSpan.FromHours(2)); + ValidateVersion(version); + + var sections = GetSections(settings); + var partialUpdates = _partialUpdateCache.Get(settings.Host, () => PartialUpdatesAllowed(settings, version), TimeSpan.FromHours(2)); + + // TODO: Investiate partial updates later, for now just update all movie sections... + + //if (partialUpdates) + //{ + // UpdatePartialSection(series, sections, settings); + //} + + //else + //{ + sections.ForEach(s => UpdateSection(s.Id, settings)); + //} + } + + catch (Exception ex) + { + _logger.Warn(ex, "Failed to Update Plex host: " + settings.Host); + throw; + } + } + private List GetSections(PlexServerSettings settings) { _logger.Debug("Getting sections from Plex host: {0}", settings.Host); - return _plexServerProxy.GetTvSections(settings).ToList(); + return _plexServerProxy.GetMovieSections(settings).ToList(); } private bool PartialUpdatesAllowed(PlexServerSettings settings, Version version) diff --git a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs index 59bba6f43..17357df0d 100644 --- a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs +++ b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs @@ -19,18 +19,22 @@ namespace NzbDrone.Core.Notifications.Prowl public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _prowlService.SendNotification(title, grabMessage.Message, Settings.ApiKey, (NotificationPriority)Settings.Priority); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _prowlService.SendNotification(title, message.Message, Settings.ApiKey, (NotificationPriority)Settings.Priority); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs index be2afe912..b8a2e9736 100644 --- a/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs +++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBullet.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.PushBullet public override void OnGrab(GrabMessage grabMessage) { - const string title = "Radarr - Episode Grabbed"; + const string title = "Radarr - Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings); } public override void OnDownload(DownloadMessage message) { - const string title = "Radarr - Episode Downloaded"; + const string title = "Radarr - Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs index f2969952a..953c08a8c 100644 --- a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs +++ b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.Pushalot public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs index ee8f61053..d590099f5 100644 --- a/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs +++ b/src/NzbDrone.Core/Notifications/Pushover/Pushover.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.Pushover public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Slack/Slack.cs b/src/NzbDrone.Core/Notifications/Slack/Slack.cs index 5e581a25f..13e69f5a0 100644 --- a/src/NzbDrone.Core/Notifications/Slack/Slack.cs +++ b/src/NzbDrone.Core/Notifications/Slack/Slack.cs @@ -37,7 +37,7 @@ namespace NzbDrone.Core.Notifications.Slack new Attachment { Fallback = message.Message, - Title = message.Series.Title, + Title = message.Movie.Title, Text = message.Message, Color = "warning" } @@ -59,7 +59,7 @@ namespace NzbDrone.Core.Notifications.Slack new Attachment { Fallback = message.Message, - Title = message.Series.Title, + Title = message.Movie.Title, Text = message.Message, Color = "good" } @@ -69,6 +69,25 @@ namespace NzbDrone.Core.Notifications.Slack NotifySlack(payload); } + public override void OnMovieRename(Movie movie) + { + var payload = new SlackPayload + { + IconEmoji = Settings.Icon, + Username = Settings.Username, + Text = "Renamed", + Attachments = new List + { + new Attachment + { + Title = movie.Title, + } + } + }; + + NotifySlack(payload); + } + public override void OnRename(Series series) { var payload = new SlackPayload diff --git a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs index 4994ce00a..c406252fc 100644 --- a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs +++ b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexer.cs @@ -42,6 +42,10 @@ namespace NzbDrone.Core.Notifications.Synology } } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { if (Settings.UpdateLibrary) diff --git a/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs b/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs index 240008c5e..477872409 100644 --- a/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs +++ b/src/NzbDrone.Core/Notifications/Telegram/Telegram.cs @@ -18,18 +18,22 @@ namespace NzbDrone.Core.Notifications.Telegram public override void OnGrab(GrabMessage grabMessage) { - const string title = "Episode Grabbed"; + const string title = "Movie Grabbed"; _proxy.SendNotification(title, grabMessage.Message, Settings); } public override void OnDownload(DownloadMessage message) { - const string title = "Episode Downloaded"; + const string title = "Movie Downloaded"; _proxy.SendNotification(title, message.Message, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs b/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs index b19c7725f..e789654dc 100644 --- a/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs +++ b/src/NzbDrone.Core/Notifications/Twitter/Twitter.cs @@ -29,6 +29,10 @@ namespace NzbDrone.Core.Notifications.Twitter _twitterService.SendNotification($"Imported: {message.Message}", Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { } diff --git a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs index 4bfcb867c..74ae13f89 100644 --- a/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/Webhook.cs @@ -27,6 +27,10 @@ namespace NzbDrone.Core.Notifications.Webhook _service.OnDownload(message.Series, message.EpisodeFile, Settings); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { _service.OnRename(series, Settings); diff --git a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs index 08fdbfaa4..4939fbe3d 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/Xbmc.cs @@ -36,6 +36,10 @@ namespace NzbDrone.Core.Notifications.Xbmc UpdateAndClean(message.Series, message.OldFiles.Any()); } + public override void OnMovieRename(Movie movie) + { + } + public override void OnRename(Series series) { UpdateAndClean(series); diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 1db0a9581..6f7eee5c0 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -583,6 +583,7 @@ + diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs index 83360063c..b06c4964f 100644 --- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs +++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs @@ -125,7 +125,8 @@ namespace NzbDrone.Core.Organizer RelativePath = "Movie.Title.2010.1080p.BluRay.DTS.x264-EVOLVE.mkv", SceneName = "Movie.Title.2010.1080p.BluRay.DTS.x264-EVOLVE", ReleaseGroup = "RlsGrp", - MediaInfo = mediaInfo + MediaInfo = mediaInfo, + Edition = "Ultimate extended edition", }; _singleEpisodeFile = new EpisodeFile diff --git a/src/NzbDrone.Core/Parser/IsoLanguage.cs b/src/NzbDrone.Core/Parser/IsoLanguage.cs index 1bd198e50..7a8e3251c 100644 --- a/src/NzbDrone.Core/Parser/IsoLanguage.cs +++ b/src/NzbDrone.Core/Parser/IsoLanguage.cs @@ -12,5 +12,6 @@ ThreeLetterCode = threeLetterCode; Language = language; } + } } diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs index d133f4e86..0d525ebe6 100644 --- a/src/NzbDrone.Core/Parser/Parser.cs +++ b/src/NzbDrone.Core/Parser/Parser.cs @@ -18,20 +18,20 @@ namespace NzbDrone.Core.Parser private static readonly Regex[] ReportMovieTitleRegex = new[] { //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.Special.Edition.2011 - new Regex(@"^(?.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<edition>(\.?((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX)))\.(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", + new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<edition>(\.?((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX)))\.(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled), //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.2011.Special.Edition //TODO: Seems to slow down parsing heavily! - new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX))", + new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX))", RegexOptions.IgnoreCase | RegexOptions.Compiled), //Normal movie format, e.g: Mission.Impossible.3.2011 - new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", + new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled), //PassThePopcorn Torrent names: Star.Wars[PassThePopcorn] new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(\[\w *\])))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled), //That did not work? Maybe some tool uses [] for years. Who would do that? - new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?!\\)", + new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled), }; @@ -268,7 +268,7 @@ namespace NzbDrone.Core.Parser private static readonly Regex ReportImdbId = new Regex(@"(?<imdbid>tt\d{9})", RegexOptions.IgnoreCase | RegexOptions.Compiled); - private static readonly Regex SimpleTitleRegex = new Regex(@"(?:480[ip]|576[ip]|720[ip]|1080[ip]|[xh][\W_]?26[45]|DD\W?5\W1|[<>?*:|]|848x480|1280x720|1920x1080|(8|10)b(it)?)\s*", + private static readonly Regex SimpleTitleRegex = new Regex(@"(?:480[ip]|576[ip]|720[ip]|1080[ip]|2160[ip]|[xh][\W_]?26[45]|DD\W?5\W1|[<>?*:|]|848x480|1280x720|1920x1080|(8|10)b(it)?)\s*", RegexOptions.IgnoreCase | RegexOptions.Compiled); private static readonly Regex WebsitePrefixRegex = new Regex(@"^\[\s*[a-z]+(\.[a-z]+)+\s*\][- ]*", @@ -696,6 +696,12 @@ namespace NzbDrone.Core.Parser private static ParsedMovieInfo ParseMovieMatchCollection(MatchCollection matchCollection) { + if (!matchCollection[0].Groups["title"].Success) + { + return null; + } + + var seriesName = matchCollection[0].Groups["title"].Value.Replace('.', ' ').Replace('_', ' '); seriesName = RequestInfoRegex.Replace(seriesName, "").Trim(' '); diff --git a/src/NzbDrone.Core/Parser/ParsingService.cs b/src/NzbDrone.Core/Parser/ParsingService.cs index 9df110a88..2de0d0648 100644 --- a/src/NzbDrone.Core/Parser/ParsingService.cs +++ b/src/NzbDrone.Core/Parser/ParsingService.cs @@ -396,9 +396,15 @@ namespace NzbDrone.Core.Parser if (searchCriteria == null) { - - movie = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle); //Todo: same as above! - + if (parsedEpisodeInfo.Year > 1900) + { + movie = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle, parsedEpisodeInfo.Year); + //Todo: same as above! + } + else + { + movie = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle); //Todo: same as above! + } return movie; } diff --git a/src/NzbDrone.Core/Tv/MovieScannedHandler.cs b/src/NzbDrone.Core/Tv/MovieScannedHandler.cs index 151ef0559..2eba01239 100644 --- a/src/NzbDrone.Core/Tv/MovieScannedHandler.cs +++ b/src/NzbDrone.Core/Tv/MovieScannedHandler.cs @@ -3,6 +3,7 @@ using NzbDrone.Core.IndexerSearch; using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Events; +using System.Collections.Generic; namespace NzbDrone.Core.Tv { @@ -37,7 +38,7 @@ namespace NzbDrone.Core.Tv if (movie.AddOptions.SearchForMovie) { - _commandQueueManager.Push(new MoviesSearchCommand { MovieId = movie.Id}); + _commandQueueManager.Push(new MoviesSearchCommand { MovieIds = new List<int> { movie.Id } }); } movie.AddOptions = null; diff --git a/src/NzbDrone.Core/Tv/RefreshMovieService.cs b/src/NzbDrone.Core/Tv/RefreshMovieService.cs index a086cf3ec..495f00e05 100644 --- a/src/NzbDrone.Core/Tv/RefreshMovieService.cs +++ b/src/NzbDrone.Core/Tv/RefreshMovieService.cs @@ -51,7 +51,7 @@ namespace NzbDrone.Core.Tv try { - movieInfo = _movieInfo.GetMovieInfo(movie.TmdbId); + movieInfo = _movieInfo.GetMovieInfo(movie.TmdbId, movie.Profile); } catch (MovieNotFoundException) { diff --git a/src/NzbDrone.Host/Radarr.ico b/src/NzbDrone.Host/Radarr.ico index 6f0a8b50e..7d20c6f5a 100644 Binary files a/src/NzbDrone.Host/Radarr.ico and b/src/NzbDrone.Host/Radarr.ico differ diff --git a/src/NzbDrone/Radarr.ico b/src/NzbDrone/Radarr.ico index 6f0a8b50e..7d20c6f5a 100644 Binary files a/src/NzbDrone/Radarr.ico and b/src/NzbDrone/Radarr.ico differ diff --git a/src/NzbDrone/Resources/Radarr.ico b/src/NzbDrone/Resources/Radarr.ico index 4903af4b1..7d20c6f5a 100644 Binary files a/src/NzbDrone/Resources/Radarr.ico and b/src/NzbDrone/Resources/Radarr.ico differ diff --git a/src/Radarr.ico b/src/Radarr.ico index 4903af4b1..7d20c6f5a 100644 Binary files a/src/Radarr.ico and b/src/Radarr.ico differ diff --git a/src/UI/Activity/Queue/QueueLayout.js b/src/UI/Activity/Queue/QueueLayout.js index 4416cb07b..0fc561165 100644 --- a/src/UI/Activity/Queue/QueueLayout.js +++ b/src/UI/Activity/Queue/QueueLayout.js @@ -1,7 +1,7 @@ var Marionette = require('marionette'); var Backgrid = require('backgrid'); var QueueCollection = require('./QueueCollection'); -var SeriesTitleCell = require('../../Cells/MovieTitleCell'); +var MovieTitleCell = require('../../Cells/MovieTitleCell'); var EpisodeNumberCell = require('../../Cells/EpisodeNumberCell'); var EpisodeTitleCell = require('../../Cells/EpisodeTitleCell'); var QualityCell = require('../../Cells/QualityCell'); @@ -30,7 +30,7 @@ module.exports = Marionette.Layout.extend({ { name : 'movie', label : 'Movie', - cell : SeriesTitleCell + cell : MovieTitleCell }, /*{ name : 'episode', diff --git a/src/UI/Cells/MovieTitleHistoryCell.js b/src/UI/Cells/MovieTitleHistoryCell.js index 174d5d361..3a3d6d927 100644 --- a/src/UI/Cells/MovieTitleHistoryCell.js +++ b/src/UI/Cells/MovieTitleHistoryCell.js @@ -6,9 +6,7 @@ module.exports = TemplatedCell.extend({ render : function() { - this.$el.html(this.model.get("movie").get("title")); //Hack, but somehow handlebar helper does not work. - debugger; + this.$el.html('<a href="movies/' + this.model.get("movie").get("titleSlug") +'">' + this.model.get("movie").get("title") + '</a>'); //Hack, but somehow handlebar helper does not work. return this; - } }); diff --git a/src/UI/Config.js b/src/UI/Config.js index 2115d076a..9ea57003b 100644 --- a/src/UI/Config.js +++ b/src/UI/Config.js @@ -2,23 +2,26 @@ var $ = require('jquery'); var vent = require('./vent'); module.exports = { + ConfigNamespace : 'Radarr.', + Events : { ConfigUpdatedEvent : 'ConfigUpdatedEvent' }, Keys : { - DefaultProfileId : 'DefaultProfileId', - DefaultRootFolderId : 'DefaultRootFolderId', - UseSeasonFolder : 'UseSeasonFolder', - DefaultSeriesType : 'DefaultSeriesType', - MonitorEpisodes : 'MonitorEpisodes', - AdvancedSettings : 'advancedSettings' + DefaultProfileId : 'RadarrDefaultProfileId', + DefaultRootFolderId : 'RadarrDefaultRootFolderId', + UseSeasonFolder : 'RadarrUseSeasonFolder', + DefaultSeriesType : 'RadarrDefaultSeriesType', + MonitorEpisodes : 'RadarrMonitorEpisodes', + AdvancedSettings : 'RadarradvancedSettings' }, getValueJson : function (key, defaultValue) { + var storeKey = this.ConfigNamespace + key; defaultValue = defaultValue || {}; - var storeValue = window.localStorage.getItem(key); + var storeValue = window.localStorage.getItem(storeKey); if (!storeValue) { return defaultValue; @@ -34,7 +37,8 @@ module.exports = { }, getValue : function(key, defaultValue) { - var storeValue = window.localStorage.getItem(key); + var storeKey = this.ConfigNamespace + key; + var storeValue = window.localStorage.getItem(storeKey); if (!storeValue) { return defaultValue; @@ -48,22 +52,22 @@ module.exports = { }, setValue : function(key, value) { - - console.log('Config: [{0}] => [{1}]'.format(key, value)); + var storeKey = this.ConfigNamespace + key; + console.log('Config: [{0}] => [{1}]'.format(storeKey, value)); if (this.getValue(key) === value.toString()) { return; } try { - window.localStorage.setItem(key, value); + window.localStorage.setItem(storeKey, value); vent.trigger(this.Events.ConfigUpdatedEvent, { key : key, value : value }); } catch (error) { - console.error('Unable to save config: [{0}] => [{1}]'.format(key, value)); + console.error('Unable to save config: [{0}] => [{1}]'.format(storeKey, value)); } } }; diff --git a/src/UI/Content/Images/favicon-debug.ico b/src/UI/Content/Images/favicon-debug.ico index 90bf72090..80e6bd51b 100644 Binary files a/src/UI/Content/Images/favicon-debug.ico and b/src/UI/Content/Images/favicon-debug.ico differ diff --git a/src/UI/Content/Images/favicon.ico b/src/UI/Content/Images/favicon.ico index 90bf72090..80e6bd51b 100644 Binary files a/src/UI/Content/Images/favicon.ico and b/src/UI/Content/Images/favicon.ico differ diff --git a/src/UI/Content/Images/favicon/android-chrome-144x144.png b/src/UI/Content/Images/favicon/android-chrome-144x144.png new file mode 100644 index 000000000..a30ab0209 Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-144x144.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-192x192.png b/src/UI/Content/Images/favicon/android-chrome-192x192.png new file mode 100644 index 000000000..8f7d9f655 Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-192x192.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-256x256.png b/src/UI/Content/Images/favicon/android-chrome-256x256.png new file mode 100644 index 000000000..52977292b Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-256x256.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-36x36.png b/src/UI/Content/Images/favicon/android-chrome-36x36.png new file mode 100644 index 000000000..d8da18abf Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-36x36.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-384x384.png b/src/UI/Content/Images/favicon/android-chrome-384x384.png new file mode 100644 index 000000000..358b6d510 Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-384x384.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-48x48.png b/src/UI/Content/Images/favicon/android-chrome-48x48.png new file mode 100644 index 000000000..e556972c9 Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-48x48.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-512x512.png b/src/UI/Content/Images/favicon/android-chrome-512x512.png new file mode 100644 index 000000000..16658df45 Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-512x512.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-72x72.png b/src/UI/Content/Images/favicon/android-chrome-72x72.png new file mode 100644 index 000000000..35534d1bb Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-72x72.png differ diff --git a/src/UI/Content/Images/favicon/android-chrome-96x96.png b/src/UI/Content/Images/favicon/android-chrome-96x96.png new file mode 100644 index 000000000..ae3d77034 Binary files /dev/null and b/src/UI/Content/Images/favicon/android-chrome-96x96.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-114x114-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-114x114-precomposed.png new file mode 100644 index 000000000..8861297ed Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-114x114-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-114x114.png b/src/UI/Content/Images/favicon/apple-touch-icon-114x114.png new file mode 100644 index 000000000..cb5e2a3fd Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-114x114.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-120x120-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-120x120-precomposed.png new file mode 100644 index 000000000..a870359d2 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-120x120-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-120x120.png b/src/UI/Content/Images/favicon/apple-touch-icon-120x120.png new file mode 100644 index 000000000..3d365dc5e Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-120x120.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-144x144-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-144x144-precomposed.png new file mode 100644 index 000000000..cf4be66e8 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-144x144-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-144x144.png b/src/UI/Content/Images/favicon/apple-touch-icon-144x144.png new file mode 100644 index 000000000..505314e93 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-144x144.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-152x152-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-152x152-precomposed.png new file mode 100644 index 000000000..e17f317c4 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-152x152-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-152x152.png b/src/UI/Content/Images/favicon/apple-touch-icon-152x152.png new file mode 100644 index 000000000..6fdc50ce5 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-152x152.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-180x180-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-180x180-precomposed.png new file mode 100644 index 000000000..12879bd44 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-180x180-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-180x180.png b/src/UI/Content/Images/favicon/apple-touch-icon-180x180.png new file mode 100644 index 000000000..c169b7c1e Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-180x180.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-57x57-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-57x57-precomposed.png new file mode 100644 index 000000000..3b3e2b88d Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-57x57-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png b/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png new file mode 100644 index 000000000..aecc105f9 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-57x57.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-60x60-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-60x60-precomposed.png new file mode 100644 index 000000000..18ff320c7 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-60x60-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png b/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png new file mode 100644 index 000000000..87feabcc4 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-60x60.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-72x72-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-72x72-precomposed.png new file mode 100644 index 000000000..9de51dbab Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-72x72-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-72x72.png b/src/UI/Content/Images/favicon/apple-touch-icon-72x72.png new file mode 100644 index 000000000..d19050b11 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-72x72.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-76x76-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-76x76-precomposed.png new file mode 100644 index 000000000..859123883 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-76x76-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-76x76.png b/src/UI/Content/Images/favicon/apple-touch-icon-76x76.png new file mode 100644 index 000000000..29c962e23 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-76x76.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon-precomposed.png b/src/UI/Content/Images/favicon/apple-touch-icon-precomposed.png new file mode 100644 index 000000000..12879bd44 Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon-precomposed.png differ diff --git a/src/UI/Content/Images/favicon/apple-touch-icon.png b/src/UI/Content/Images/favicon/apple-touch-icon.png new file mode 100644 index 000000000..c169b7c1e Binary files /dev/null and b/src/UI/Content/Images/favicon/apple-touch-icon.png differ diff --git a/src/UI/Content/Images/favicon/browserconfig.xml b/src/UI/Content/Images/favicon/browserconfig.xml new file mode 100644 index 000000000..ff37cd996 --- /dev/null +++ b/src/UI/Content/Images/favicon/browserconfig.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<browserconfig> + <msapplication> + <tile> + <square70x70logo src="/Content/Images/favicon/mstile-70x70.png"/> + <square150x150logo src="/Content/Images/favicon/mstile-150x150.png"/> + <square310x310logo src="/Content/Images/favicon/mstile-310x310.png"/> + <wide310x150logo src="/Content/Images/favicon/mstile-310x150.png"/> + <TileColor>#272727</TileColor> + </tile> + </msapplication> +</browserconfig> diff --git a/src/UI/Content/Images/favicon/favicon-16x16.png b/src/UI/Content/Images/favicon/favicon-16x16.png new file mode 100644 index 000000000..cba60fb4c Binary files /dev/null and b/src/UI/Content/Images/favicon/favicon-16x16.png differ diff --git a/src/UI/Content/Images/favicon/favicon-194x194.png b/src/UI/Content/Images/favicon/favicon-194x194.png new file mode 100644 index 000000000..ebed98d02 Binary files /dev/null and b/src/UI/Content/Images/favicon/favicon-194x194.png differ diff --git a/src/UI/Content/Images/favicon/favicon-32x32.png b/src/UI/Content/Images/favicon/favicon-32x32.png new file mode 100644 index 000000000..a9e24d6c4 Binary files /dev/null and b/src/UI/Content/Images/favicon/favicon-32x32.png differ diff --git a/src/UI/Content/Images/favicon/favicon.ico b/src/UI/Content/Images/favicon/favicon.ico new file mode 100644 index 000000000..a0269b014 Binary files /dev/null and b/src/UI/Content/Images/favicon/favicon.ico differ diff --git a/src/UI/Content/Images/favicon/manifest.json b/src/UI/Content/Images/favicon/manifest.json new file mode 100644 index 000000000..24c1f5dfc --- /dev/null +++ b/src/UI/Content/Images/favicon/manifest.json @@ -0,0 +1,53 @@ +{ + "name": "Radarr", + "icons": [ + { + "src": "/Content/Images/favicon/android-chrome-36x36.png", + "sizes": "36x36", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-48x48.png", + "sizes": "48x48", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-72x72.png", + "sizes": "72x72", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-96x96.png", + "sizes": "96x96", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-144x144.png", + "sizes": "144x144", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-256x256.png", + "sizes": "256x256", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-384x384.png", + "sizes": "384x384", + "type": "image/png" + }, + { + "src": "/Content/Images/favicon/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image/png" + } + ], + "theme_color": "#272727", + "background_color": "#272727", + "display": "standalone" +} \ No newline at end of file diff --git a/src/UI/Content/Images/favicon/mstile-144x144.png b/src/UI/Content/Images/favicon/mstile-144x144.png new file mode 100644 index 000000000..bb8ff6ffc Binary files /dev/null and b/src/UI/Content/Images/favicon/mstile-144x144.png differ diff --git a/src/UI/Content/Images/favicon/mstile-150x150.png b/src/UI/Content/Images/favicon/mstile-150x150.png new file mode 100644 index 000000000..5daff8258 Binary files /dev/null and b/src/UI/Content/Images/favicon/mstile-150x150.png differ diff --git a/src/UI/Content/Images/favicon/mstile-310x150.png b/src/UI/Content/Images/favicon/mstile-310x150.png new file mode 100644 index 000000000..1d534151a Binary files /dev/null and b/src/UI/Content/Images/favicon/mstile-310x150.png differ diff --git a/src/UI/Content/Images/favicon/mstile-310x310.png b/src/UI/Content/Images/favicon/mstile-310x310.png new file mode 100644 index 000000000..1995d8691 Binary files /dev/null and b/src/UI/Content/Images/favicon/mstile-310x310.png differ diff --git a/src/UI/Content/Images/favicon/mstile-70x70.png b/src/UI/Content/Images/favicon/mstile-70x70.png new file mode 100644 index 000000000..87293e25f Binary files /dev/null and b/src/UI/Content/Images/favicon/mstile-70x70.png differ diff --git a/src/UI/Content/Images/favicon/safari-pinned-tab.svg b/src/UI/Content/Images/favicon/safari-pinned-tab.svg new file mode 100644 index 000000000..1d4f4e92e --- /dev/null +++ b/src/UI/Content/Images/favicon/safari-pinned-tab.svg @@ -0,0 +1,59 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" + "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"> +<svg version="1.0" xmlns="http://www.w3.org/2000/svg" + width="16.000000pt" height="16.000000pt" viewBox="0 0 16.000000 16.000000" + preserveAspectRatio="xMidYMid meet"> +<metadata> +Created by potrace 1.11, written by Peter Selinger 2001-2013 +</metadata> +<g transform="translate(0.000000,16.000000) scale(0.002286,-0.002286)" +fill="#000000" stroke="none"> +<path d="M3298 6995 c-1 -1 -45 -5 -97 -9 -51 -3 -96 -8 -100 -10 -3 -2 -40 +-7 -80 -10 -41 -4 -78 -9 -81 -11 -3 -2 -24 -6 -46 -9 -51 -8 -81 -14 -102 +-20 -9 -3 -33 -8 -52 -11 -96 -16 -424 -116 -527 -161 -18 -8 -48 -21 -67 -29 +-19 -8 -37 -15 -40 -15 -9 0 -274 -132 -332 -166 -127 -73 -278 -174 -388 +-257 -67 -50 -123 -94 -126 -98 -3 -4 -25 -23 -50 -44 -71 -58 -236 -221 -326 +-323 -316 -355 -553 -766 -705 -1223 -26 -81 -51 -158 -53 -170 -3 -13 -12 +-51 -21 -84 -8 -33 -18 -76 -21 -95 -3 -19 -7 -37 -9 -40 -5 -7 -34 -174 -41 +-232 -3 -24 -7 -59 -10 -78 -12 -85 -18 -209 -18 -395 -1 -318 12 -441 89 +-815 2 -8 9 -35 16 -60 7 -25 13 -51 15 -58 9 -48 85 -270 131 -382 189 -466 +458 -863 823 -1215 66 -63 101 -95 210 -189 33 -28 204 -154 255 -188 140 -91 +198 -126 312 -186 115 -60 166 -85 298 -142 40 -18 102 -41 206 -78 185 -67 +485 -138 664 -157 28 -3 56 -8 64 -11 74 -25 640 -25 821 1 14 2 48 6 75 10 +43 6 184 31 280 50 62 12 224 58 338 96 791 262 1462 798 1894 1515 61 99 157 +284 208 399 98 220 209 585 239 791 4 22 9 51 11 64 3 14 13 84 22 155 24 188 +23 692 -2 810 -2 11 -7 39 -9 63 -41 338 -165 738 -335 1082 -456 919 -1301 +1595 -2301 1839 -121 29 -308 63 -420 76 -30 4 -68 8 -85 11 -35 5 -522 14 +-527 9z m-1674 -897 c59 -62 246 -254 415 -427 168 -173 343 -353 389 -400 +141 -145 335 -341 338 -341 2 0 29 12 61 26 61 28 283 105 283 99 0 -2 14 0 +32 5 30 9 52 13 168 30 72 11 320 10 390 -1 30 -5 69 -11 85 -13 106 -17 243 +-62 426 -138 28 -12 31 -8 464 437 59 61 236 243 394 405 159 162 318 326 354 +364 l66 69 43 -34 c204 -157 437 -383 581 -564 291 -364 508 -782 624 -1205 +37 -134 72 -300 88 -415 3 -22 8 -51 10 -65 3 -14 7 -56 10 -95 3 -38 8 -90 +11 -115 7 -65 7 -363 -1 -445 -18 -202 -24 -248 -51 -390 -13 -71 -36 -173 +-50 -225 -13 -52 -27 -104 -29 -115 -22 -98 -137 -384 -225 -560 -167 -330 +-349 -582 -615 -850 -141 -142 -199 -194 -328 -294 l-70 -55 -170 175 c-93 96 +-306 314 -472 484 -166 171 -372 381 -456 468 l-154 158 -75 -34 c-113 -52 +-204 -81 -350 -112 -184 -39 -449 -39 -625 0 -144 31 -288 79 -381 125 l-39 +19 -140 -144 c-249 -255 -735 -753 -924 -947 -101 -103 -187 -188 -191 -188 +-3 0 -15 8 -26 18 -10 9 -42 34 -69 55 -256 196 -597 573 -750 829 -5 9 -34 +56 -63 105 -129 214 -277 560 -338 790 -9 32 -17 65 -20 73 -16 56 -72 347 +-78 400 -3 36 -8 81 -11 100 -15 125 -22 460 -11 560 2 19 7 73 11 120 4 46 8 +87 10 90 1 3 6 32 10 65 3 32 8 62 11 66 2 3 6 31 10 60 3 30 8 57 11 62 2 4 +7 20 9 35 26 150 117 429 206 632 128 294 310 584 523 836 114 134 339 350 +479 459 21 17 48 38 60 47 12 10 23 17 26 18 3 0 54 -51 114 -112z"/> +<path d="M1403 5507 c-251 -260 -468 -600 -603 -942 -59 -148 -133 -395 -146 +-485 -2 -14 -6 -36 -9 -50 -27 -128 -48 -349 -48 -515 -1 -94 12 -334 17 -344 +2 -3 7 -35 10 -70 21 -197 115 -543 203 -741 45 -101 120 -251 150 -298 18 +-29 33 -55 33 -58 0 -7 160 -247 169 -254 3 -3 31 -36 62 -75 89 -110 195 +-225 208 -225 3 0 311 306 684 679 373 374 687 687 697 696 19 17 21 16 58 +-17 227 -205 561 -282 862 -198 132 37 274 116 367 203 32 30 33 30 52 13 11 +-10 321 -319 688 -687 367 -369 676 -674 685 -679 17 -10 30 1 146 129 93 102 +255 329 329 461 180 319 293 637 347 970 23 147 25 160 32 271 17 253 7 429 +-41 744 -10 64 -64 272 -96 370 -134 403 -362 786 -654 1093 l-50 53 -701 +-701 -701 -700 -27 25 c-174 161 -398 246 -636 240 -149 -4 -180 -9 -284 -44 +-122 -42 -244 -113 -336 -198 l-24 -22 -698 697 c-384 383 -700 698 -701 699 +-2 1 -21 -17 -44 -40z"/> +</g> +</svg> diff --git a/src/UI/Content/Images/logos/128.png b/src/UI/Content/Images/logos/128.png index 5e143b52e..02f00f08f 100644 Binary files a/src/UI/Content/Images/logos/128.png and b/src/UI/Content/Images/logos/128.png differ diff --git a/src/UI/Content/Images/logos/32.png b/src/UI/Content/Images/logos/32.png index f1fe93db5..41a6dd279 100644 Binary files a/src/UI/Content/Images/logos/32.png and b/src/UI/Content/Images/logos/32.png differ diff --git a/src/UI/Content/Images/logos/48.png b/src/UI/Content/Images/logos/48.png index 8b9d0fc88..45cf3047c 100644 Binary files a/src/UI/Content/Images/logos/48.png and b/src/UI/Content/Images/logos/48.png differ diff --git a/src/UI/Content/Images/logos/64.png b/src/UI/Content/Images/logos/64.png index 80edc7894..483e3d809 100644 Binary files a/src/UI/Content/Images/logos/64.png and b/src/UI/Content/Images/logos/64.png differ diff --git a/src/UI/Content/Images/safari/logo.svg b/src/UI/Content/Images/safari/logo.svg deleted file mode 100644 index d3eece392..000000000 --- a/src/UI/Content/Images/safari/logo.svg +++ /dev/null @@ -1 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="218px" height="218px" viewBox="0 0 218 218" enable-background="new 0 0 218 218" xml:space="preserve"><g display="none"/><g display="none"><path display="inline" fill-rule="evenodd" clip-rule="evenodd" fill="#EFEEEE" d="M217.5 108.95c0 29.833-10.533 55.399-31.6 76.7 -0.7 0.833-1.484 1.6-2.351 2.3 -3.466 3.399-7.134 6.483-11 9.25 -18.267 13.467-39.366 20.2-63.3 20.2 -23.967 0-45.033-6.733-63.2-20.2 -4.8-3.4-9.3-7.25-13.5-11.55 -16.367-16.267-26.417-35.167-30.15-56.7 -0.733-4.2-1.217-8.467-1.45-12.8 -0.1-2.4-0.15-4.801-0.15-7.2 0-2.534 0.05-4.95 0.15-7.25 0-0.233 0.066-0.467 0.2-0.7 1.567-26.6 12.033-49.583 31.4-68.95C53.85 11.017 79.417 0.5 109.25 0.5c29.934 0 55.483 10.517 76.65 31.55C206.967 53.483 217.5 79.117 217.5 108.95z"/></g><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="134.724 60.365 129.7 63.282 129.7 69.117 134.724 72.034 139.802 69.116 139.802 63.282 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="139.157 74.994 142.869 71.227 140.087 69.611 135.008 72.529 135.008 78.362 140.087 81.28 143.517 79.289 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="145.396 60.366 140.373 63.282 140.373 69.117 143.283 70.807 150.418 63.566 150.418 63.282 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="129.415 69.611 124.392 72.528 124.392 78.363 129.415 81.28 134.438 78.363 134.438 72.528 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="124.106 60.366 119.084 63.282 119.084 69.117 124.106 72.034 129.129 69.117 129.129 63.282 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="113.49 60.366 108.468 63.282 108.468 69.117 113.49 72.034 118.513 69.117 118.513 63.282 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M113.49 78.857l-0.479 0.278c0.423 0.05 0.843 0.109 1.259 0.176L113.49 78.857z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M123.821 72.528l-5.022-2.917 -5.023 2.917v5.835l2.188 1.27c-0.001 0-0.003 0-0.004 0 1.372 0.303 2.705 0.701 3.998 1.195 -0.076-0.029-0.152-0.059-0.229-0.087l4.093-2.377V72.528z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="150.703 51.175 145.681 54.037 145.681 59.871 150.703 62.787 151.831 62.132 155.726 58.18 155.726 54.037 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="182.551 32.684 177.528 35.6 177.528 40.433 184.392 33.753 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="163.429 163.159 166.342 166.172 166.342 164.819 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="182.551 51.175 177.528 54.037 177.528 59.871 178.193 60.257 185.561 52.89 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M175 157.7c-5.063-6.93-8.862-14.367-11.396-22.313 0.053 0.166 0.105 0.33 0.159 0.495l-2.159 1.254v5.836l5.022 2.916 0.941-0.546c0.083 0.172 0.166 0.343 0.25 0.515l-0.906 0.525v5.836l5.023 2.916 0.91-0.528c0.105 0.159 0.211 0.316 0.317 0.476l-0.942 0.547v5.834l5.022 2.862 2.8-1.596L175 157.7z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="145.681 151.549 145.681 152.219 147.293 153.155 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="157.737 153.715 159.54 155.54 157.05 158 157.769 157.305 161.034 160.683 161.034 155.629 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="164.581 53.033 161.319 51.175 156.297 54.037 156.297 57.981 157.888 59.548 157.901 59.535 158.597 60.247 157.902 59.533 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="158.808 42.894 161.319 44.352 166.342 41.436 166.342 35.6 166.202 35.519 166.62 35.102 166.627 35.106 171.65 32.19 171.65 30.085 172.173 29.564 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="186.188 34.796 178.68 42.104 182.551 44.352 187.573 41.436 187.573 35.6 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="171.936 32.684 166.912 35.6 166.912 41.436 171.936 44.352 175.817 42.098 176.958 40.988 176.958 35.6 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M113.205 72.528l-5.022-2.917 -5.022 2.917v5.835l1.447 0.84c-0.001 0-0.002 0-0.002 0 1.457-0.202 2.955-0.304 4.495-0.304 1.005 0 1.991 0.045 2.961 0.13 -0.002 0-0.003 0-0.004 0l1.148-0.667V72.528z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="71.026 97.292 66.004 100.209 66.004 106.044 71.026 108.961 76.049 106.044 76.049 100.209 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="65.718 106.539 60.639 109.457 60.639 115.29 65.718 118.208 70.741 115.291 70.741 109.456 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="71.026 115.785 66.004 118.702 66.004 124.535 71.026 127.397 76.049 124.535 76.049 118.702 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M79.5 114.5c-0.2-1.166-0.333-2.35-0.4-3.55 -0.033-0.667-0.05-1.333-0.05-2 0-0.456 0.019-0.875 0.033-1.302 -0.004 0.159-0.009 0.318-0.012 0.479l-2.735-1.588 -5.023 2.917v5.835l5.023 2.916 3.52-2.043c0.001 0.006 0.002 0.011 0.004 0.017C79.728 115.625 79.599 115.069 79.5 114.5z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="65.718 125.029 60.639 127.893 60.639 133.725 65.718 136.643 70.741 133.726 70.741 127.892 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M81.174 97.564l-4.554 2.645v5.835l2.467 1.433c0.006-0.171 0.004-0.36 0.013-0.527 0-0.067 0.017-0.134 0.05-0.2 0.192-3.263 0.87-6.329 2.03-9.199C81.178 97.556 81.176 97.56 81.174 97.564z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="71.026 134.221 66.004 137.137 66.004 142.973 69.161 144.806 74.729 139.022 76.049 140.294 76.049 137.137 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="65.718 88.102 60.639 90.965 60.639 96.797 65.718 99.715 70.741 96.798 70.741 90.964 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M60.354 78.857l-5.023 2.917v3.562c-0.007-0.021-0.014-0.043-0.021-0.064 0.298 0.951 0.577 1.909 0.838 2.874 -0.008-0.028-0.015-0.056-0.022-0.084l4.229 2.41 5.079-2.864v-5.832L60.354 78.857z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="139.802 137.138 134.724 134.22 129.7 137.137 129.7 142.973 134.724 145.89 138.07 143.967 136.979 142.88 139.802 140.048 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="76.335 125.03 71.312 127.892 71.312 133.726 76.335 136.643 81.357 133.726 81.357 127.892 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="102.875 60.366 97.852 63.282 97.852 69.117 102.875 72.034 107.897 69.117 107.897 63.282 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M60.068 78.363v-5.835l-5.023-2.917 -5.022 2.917v0.058c-0.099-0.188-0.199-0.374-0.299-0.561l0.014 0.008 5.022-2.917v-5.835l-5.022-2.916 -5.022 2.916v0.68c-0.121-0.171-0.243-0.342-0.365-0.512 4.843 6.734 8.48 13.96 10.913 21.677 -0.163-0.517-0.329-1.032-0.503-1.545v-1.809l-0.815-0.473c-0.106-0.284-0.214-0.566-0.324-0.849l1.425 0.828L60.068 78.363z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="61.124 153.154 60.354 152.712 55.331 155.629 55.331 161.463 56.063 161.88 59.78 158.156 57.979 156.422 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M99.735 80.313c0.003-0.001 0.007-0.002 0.011-0.004C99.743 80.311 99.739 80.312 99.735 80.313z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M103.72 79.348l-0.845-0.491 -1.861 1.081c0.906-0.244 1.83-0.444 2.771-0.601C103.763 79.341 103.742 79.345 103.72 79.348z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M97.566 69.611l-5.022 2.917v5.835l4.844 2.813c-0.076 0.032-0.15 0.067-0.226 0.1 0.439-0.189 0.884-0.368 1.332-0.534l4.095-2.378v-5.835L97.566 69.611z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="74.331 80.776 74.129 80.979 73.361 80.213 71.026 78.857 66.004 81.774 66.004 87.608 71.026 90.47 76.049 87.608 76.049 81.774 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.43 161.957 39.407 164.819 39.407 170.653 44.407 173.558 49.452 168.503 49.452 164.819 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.715 47.496 44.715 50.68 49.738 53.542 50.399 53.166 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="39.155 41.949 39.122 41.93 34.1 44.846 34.1 50.68 39.122 53.542 44.145 50.68 44.145 46.926 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="187.859 41.929 182.837 44.846 182.837 50.68 185.979 52.471 185.742 52.708 192.939 45.511 192.939 44.847 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="161.319 143.467 156.297 146.383 156.297 152.219 161.319 155.135 166.342 152.219 166.342 146.383 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="166.627 152.713 161.604 155.629 161.604 161.272 162.015 161.697 166.627 164.325 171.65 161.463 171.65 155.629 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="145.396 78.857 144.886 79.153 144.144 79.907 143.938 79.704 140.373 81.774 140.373 87.608 145.396 90.47 150.418 87.608 150.418 81.774 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="150.703 143.467 148.671 144.646 155.521 151.471 153.756 153.241 153.762 153.247 155.54 151.49 155.726 151.678 155.726 146.383 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="171.936 161.957 166.912 164.819 166.912 166.762 172.934 172.99 176.958 170.653 176.958 164.819 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="159.313 60.952 160.967 62.583 161.319 62.787 166.342 59.871 166.342 54.111 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="156.012 78.857 150.989 81.774 150.989 87.608 156.012 90.47 161.034 87.608 161.034 81.774 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M132.188 89.683c-0.002-0.003-0.005-0.005-0.007-0.008 0.826 0.988 1.577 2.005 2.256 3.052v-1.762L132.188 89.683z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="150.703 88.102 145.681 90.964 145.681 96.798 150.703 99.715 155.726 96.798 155.726 90.964 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="139.004 106.502 139.005 106.513 139.004 106.502 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M139.802 100.21l-2.347-1.349c-0.001-0.003-0.002-0.006-0.004-0.01 0.844 2.42 1.357 4.972 1.553 7.651l0.798-0.458V100.21zM140.087 106.539l-1.04 0.598c-0.012-0.209-0.027-0.416-0.042-0.623 0.058 0.802 0.095 1.612 0.095 2.437 0 3.003-0.39 5.849-1.16 8.539 0.041-0.148 0.08-0.297 0.12-0.446l2.027 1.165 5.023-2.917v-5.835L140.087 106.539z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.43 180.395 39.407 183.311 39.407 189.146 44.43 192.063 48.943 189.441 47.571 190.817 49.452 188.932 49.452 183.311 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M187.999 183.478c0.021-0.022 0.042-0.044 0.063-0.066C188.041 183.434 188.021 183.455 187.999 183.478z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="150.703 125.03 145.681 127.893 145.681 133.726 150.703 136.643 155.726 133.726 155.726 127.893 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="166.912 169.64 166.912 170.653 169.146 171.95 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M180.216 162.902l0.246 0.246 -2.934 1.671v5.834l5.022 2.917 5.022-2.917v-0.412l1.755 1.75 -1.469-0.844 -5.022 2.917v5.835l5.023 2.917 1.595-0.916c1.2-1.314 2.361-2.642 3.484-3.981v-2.326L180.216 162.902z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M188.145 183.311v0.011c0.008-0.008 0.015-0.016 0.021-0.023L188.145 183.311z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="63.821 70.701 60.639 72.529 60.639 78.362 65.718 81.28 70.741 78.363 70.741 77.601 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="65.718 51.174 60.639 54.038 60.639 59.871 60.789 59.957 61.871 58.872 65.769 62.758 70.741 59.871 70.741 54.037 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M31.319 34.132l-1.746 1.014c-0.264 0.283-0.522 0.569-0.782 0.854v5.436l5.023 2.917 4.898-2.845L31.319 34.132z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.715 192.557 44.715 193.681 47.379 191.01 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="156.012 134.221 150.989 137.137 150.989 142.973 156.012 145.889 161.034 142.973 161.034 137.137 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="167.349 53.131 171.65 50.68 171.65 48.944 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="172.221 44.846 172.221 45.599 174.137 43.733 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="160.711 63.094 153.397 70.516 156.012 72.034 161.034 69.117 161.034 63.282 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="178.255 42.517 172.221 48.39 172.221 50.68 177.243 53.542 182.266 50.68 182.266 44.846 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="171.936 51.175 166.912 54.037 166.912 59.871 171.936 62.787 176.958 59.871 176.958 54.037 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="166.627 41.93 161.604 44.847 161.604 50.68 165.007 52.619 171.65 46.153 171.65 44.846 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M134.724 78.857l-5.023 2.917v5.258c-0.003-0.003-0.006-0.005-0.009-0.008 0.22 0.207 0.441 0.41 0.658 0.625 0.23 0.235 0.449 0.474 0.671 0.713 -0.002-0.002-0.003-0.003-0.005-0.005l3.708 2.113 5.078-2.864v-5.832L134.724 78.857z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M124.106 78.857l-3.693 2.145c3.143 1.263 6.049 3.093 8.716 5.496v-4.724L124.106 78.857z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M133.052 127.103c0.055-0.071 0.109-0.143 0.164-0.214 -0.847 1.12-1.78 2.206-2.811 3.252l0.002 0.002 -0.058 0.058c-0.199 0.233-0.416 0.45-0.649 0.649l-0.707 0.707 -0.037-0.037c-0.744 0.669-1.506 1.306-2.306 1.881 -0.504 0.371-1.021 0.71-1.54 1.044 0.079-0.056 0.159-0.109 0.239-0.162l4.065 2.36 5.022-2.917v-5.833L133.052 127.103z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="152.983 70.936 145.681 78.347 145.681 78.363 150.703 81.28 155.726 78.363 155.726 72.528 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="135.008 93.631 135.008 93.631 135.007 93.629 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M140.087 88.102l-5.079 2.864v2.666c0.859 1.437 1.576 2.931 2.164 4.477 -0.011-0.028-0.021-0.057-0.031-0.085l2.945 1.693 5.024-2.917v-5.834L140.087 88.102z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="145.396 97.292 140.373 100.209 140.373 106.044 145.396 108.961 150.418 106.044 150.418 100.209 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M137.906 117.613c-0.944 3.243-2.448 6.259-4.515 9.046 0.004-0.005 0.007-0.009 0.011-0.014l1.321 0.753 5.078-2.863v-5.833L137.906 117.613z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="150.703 106.539 145.681 109.456 145.681 115.291 150.703 118.207 155.726 115.291 155.726 109.456 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="145.396 115.785 140.373 118.702 140.373 124.535 145.396 127.397 150.418 124.535 150.418 118.702 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="140.087 125.029 135.008 127.893 135.008 133.725 140.087 136.643 145.11 133.726 145.11 127.892 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M159.8 110c0-1.027 0.018-2.046 0.051-3.06 -0.005 0.153-0.011 0.306-0.015 0.46l-3.539 2.055v5.835l3.809 2.211c0.019 0.232 0.039 0.464 0.06 0.695l-4.153-2.412 -5.022 2.917v5.833l5.022 2.862 4.976-2.836c0.034 0.199 0.068 0.4 0.104 0.599l-4.794 2.731v5.834l5.022 2.917 2.266-1.315c0.004 0.013 0.008 0.025 0.012 0.038C161.065 127.418 159.8 118.963 159.8 110z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M169.602 70.966l-2.689 1.562v3.698c-0.068 0.148-0.133 0.297-0.2 0.445 0.96-2.113 2.02-4.185 3.18-6.213C169.795 70.628 169.697 70.796 169.602 70.966zM166.658 76.79c0.018-0.04 0.035-0.08 0.054-0.119C166.693 76.71 166.676 76.75 166.658 76.79zM166.658 76.79c-0.105 0.233-0.213 0.467-0.316 0.702v-4.964l-5.022-2.917 -5.022 2.917v5.835l5.022 2.917 4.523-2.627c-0.121 0.288-0.24 0.579-0.358 0.868l-3.88 2.253v5.834l0.979 0.558c-0.051 0.19-0.102 0.38-0.151 0.571l-1.113-0.635 -5.022 2.862v5.834l4.146 2.408c-0.024 0.206-0.049 0.411-0.073 0.617l-4.358-2.531 -5.022 2.917v5.835l5.022 2.917 3.846-2.233c-0.002 0.037-0.002 0.073-0.004 0.11C160.222 96.019 162.491 86.003 166.658 76.79z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M172.221 63.282v3.363c-0.192 0.296-0.383 0.591-0.57 0.889v-4.252l-5.023-2.916 -5.022 2.916v5.835l5.022 2.917 3.539-2.055c-0.059 0.102-0.116 0.205-0.175 0.307 0.953-1.657 1.972-3.285 3.059-4.885l4.726-4.726 -0.532-0.309L172.221 63.282z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="145.396 134.221 140.373 137.137 140.373 139.475 141.921 137.921 148.253 144.229 150.418 142.973 150.418 137.137 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="86.951 69.611 81.928 72.528 81.928 78.363 86.951 81.28 91.973 78.363 91.973 72.528 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="172.221 175.131 172.221 179.899 177.243 182.815 178.785 181.92 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="177.243 171.147 173.342 173.413 180.566 180.886 182.266 179.899 182.266 174.064 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="170.6 173.455 166.627 171.147 161.604 174.064 161.604 179.899 166.627 182.815 171.65 179.899 171.65 174.541 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="160.136 162.632 156.297 164.819 156.297 170.653 161.319 173.57 166.342 170.653 166.342 169.05 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="156.338 158.703 154.56 160.46 150.989 156.844 150.989 161.463 156.012 164.325 159.727 162.208 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M195.45 43c-2.051-2.664-4.251-5.266-6.585-7.813l-0.721 0.414v5.833l5.079 2.918 2.084-1.21 -0.755 0.755L195.45 43z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M158.39 43.311l0.146-0.146L158.1 43.6c-13.934 10.733-30.133 16.1-48.6 16.1 -2.231 0-4.431-0.08-6.598-0.238 0.086 0.006 0.172 0.013 0.258 0.019v0.39l5.022 2.916 5.022-2.916v-0.244c0.19-0.008 0.381-0.016 0.57-0.024v0.269l5.023 2.916 5.022-2.916V58.55c0.19-0.032 0.38-0.064 0.57-0.097v1.418l5.023 2.916 5.022-2.916v-3.853c0.189-0.06 0.381-0.121 0.57-0.182v4.034l5.079 2.917 5.023-2.917v-5.834l-2.209-1.258c0.213-0.097 0.426-0.195 0.638-0.293l1.856 1.058 5.022-2.862v-1.843c0.19-0.114 0.381-0.229 0.571-0.345v2.188l5.022 2.862 5.022-2.862v-5.834L158.39 43.311z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M177.4 24.35l-5.18 5.166v2.674l5.022 2.916 5.022-2.916v-3.614C180.664 27.105 179.044 25.692 177.4 24.35z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M61.9 44.35l-2.099-2.099 -4.47 2.595v5.834l5.023 2.863 5.079-2.864v-3.851c0.19 0.125 0.38 0.25 0.571 0.375v3.477l5.022 2.862 3.063-1.745c0.207 0.102 0.415 0.202 0.623 0.302l-3.4 1.938v5.834l5.023 2.916 5.022-2.916v-4.97c0.189 0.069 0.38 0.139 0.571 0.207v4.763l5.022 2.916 5.022-2.916v-1.935c0.191 0.04 0.379 0.079 0.571 0.117v1.818l5.022 2.916 5.023-2.916v-0.432c0.084 0.006 0.168 0.012 0.252 0.019C87.614 58.334 73.967 53.298 61.9 44.35z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="193.51 44.846 193.51 44.94 193.733 44.717 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M185.9 32.05c-1.012-1.011-2.034-1.986-3.063-2.943v3.083l1.979 1.15 1.086-1.057 1.395 1.434 -0.684 0.666 1.246 0.724 0.615-0.354C187.635 33.844 186.777 32.943 185.9 32.05z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="108.183 143.467 103.16 146.383 103.16 152.219 108.183 155.135 113.205 152.219 113.205 146.383 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M109.1 139c-0.341 0-0.671-0.026-1.008-0.036 0.125 0.005 0.25 0.011 0.376 0.014v3.995l5.022 2.916 5.022-2.916v-5.391c0.016-0.005 0.03-0.012 0.046-0.017C115.605 138.52 112.453 139 109.1 139z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="118.799 143.467 113.775 146.383 113.775 152.219 118.799 155.135 123.821 152.219 123.821 146.383 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M98.096 136.994l-0.244 0.143v5.836l5.023 2.916 5.022-2.916v-4.016C104.402 138.835 101.133 138.185 98.096 136.994z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="134.724 152.712 129.7 155.629 129.7 161.463 134.724 164.326 139.802 161.462 139.802 155.63 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="138.489 144.384 135.008 146.384 135.008 152.218 140.087 155.135 145.11 152.219 145.11 150.98 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M124.824 134.638c-1.817 1.14-3.734 2.043-5.74 2.735v5.6l5.022 2.916 5.022-2.916v-5.836L124.824 134.638z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="148.88 154.736 145.396 152.713 140.373 155.629 140.373 161.463 145.396 164.325 150.418 161.463 150.418 156.269 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="129.415 143.467 124.392 146.383 124.392 152.219 129.415 155.135 134.438 152.219 134.438 146.383 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="52.001 34.452 50.023 35.6 50.023 41.436 55.045 44.352 59.383 41.833 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="161.319 180.395 161.208 180.458 166.342 185.592 166.342 183.311 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M156.012 171.147l-3.688 2.143c-0.181-0.115-0.363-0.23-0.545-0.345l3.947-2.292v-5.834l-5.022-2.862 -5.022 2.862v4.685c-0.189-0.096-0.38-0.191-0.57-0.285v-4.399l-5.023-2.862 -5.079 2.863v0.293c-0.189-0.061-0.381-0.122-0.57-0.182v-0.112l-5.022-2.862 -1.981 1.129c-0.28-0.06-0.563-0.118-0.844-0.176l2.539-1.447v-5.834l-5.022-2.916 -5.022 2.916v5.834l0.633 0.361c-0.011-0.001-0.022-0.002-0.033-0.004 14.299 1.64 27.104 6.815 38.416 15.529l2.691 2.691 0.243-0.142v-5.835L156.012 171.147z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M118.168 161.66l0.345-0.197v-5.834l-5.022-2.916 -5.022 2.916v5.627c-0.19 0.002-0.38 0.005-0.57 0.008v-5.635l-5.022-2.916 -5.023 2.916v5.834l0.776 0.442c-0.314 0.039-0.627 0.079-0.939 0.121l-0.122-0.069 -0.198 0.113c-0.245 0.034-0.488 0.073-0.732 0.109 4.166-0.617 8.453-0.93 12.864-0.93 3.433 0 6.786 0.187 10.062 0.558C119.099 161.755 118.634 161.705 118.168 161.66z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M67.759 172.57c0.415-0.252 0.832-0.499 1.25-0.742C68.591 172.071 68.174 172.318 67.759 172.57z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M65.4 174.046l-5.045-2.898 -5.023 2.917v5.835l1.981 1.15 -0.417 0.418 -1.85-1.073 -5.022 2.916v5.048l-0.326 0.327L61.8 176.55c1.433-1.054 2.893-2.04 4.369-2.984C65.914 173.729 65.654 173.879 65.4 174.046z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M182.551 180.395l-1.575 0.914 4.443 4.596 -1.438 1.391 -4.787-4.951 -1.666 0.967v5.836l2.934 1.703c1.044-0.94 2.076-1.901 3.088-2.899 0.866-0.7 1.65-1.467 2.351-2.3 0.567-0.574 1.121-1.152 1.673-1.731v-0.608L182.551 180.395z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M193.51 176.161v1.075c0.162-0.195 0.33-0.39 0.49-0.586L193.51 176.161z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M39.122 189.641l-1.48 0.859c1.818 1.626 3.683 3.185 5.608 4.65l0.895-0.896v-1.697L39.122 189.641z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M177.243 189.641l-4.336 2.517 2.743 2.743c1.486-1.16 2.94-2.38 4.368-3.649L177.243 189.641z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="97.566 143.467 92.544 146.383 92.544 152.219 97.566 155.135 102.589 152.219 102.589 146.383 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="171.936 180.395 166.912 183.311 166.912 186.162 172.49 191.74 176.958 189.146 176.958 183.311 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M41.55 24c-0.044 0.036-0.088 0.074-0.132 0.11l0.58 0.337L41.55 24z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M43.57 26.021L40.951 24.5c-2.322 1.917-4.606 3.939-6.852 6.068v1.622l5.022 2.916 5.022-2.916v-5.595L43.57 26.021z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.715 27.166 44.715 32.19 49.738 35.106 51.584 34.034 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M32.55 32.05c-0.536 0.536-1.055 1.081-1.578 1.624l0.37-0.215 1.064-1.067 0.285 0.284 0.838-0.486v-1.076C33.203 31.426 32.875 31.733 32.55 32.05z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M29.823 171.913L24.7 177.05c1.479 1.784 3.036 3.54 4.652 5.274l4.176-2.425v-5.835L29.823 171.913z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M37.988 182.818l-4.126 4.134c1.09 1.081 2.206 2.123 3.335 3.146l1.64-0.951v-5.836L37.988 182.818z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M33.814 180.395l-4.062 2.357c0.88 0.937 1.772 1.868 2.692 2.79l3.755-3.763L33.814 180.395z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M30.321 34.344c-0.134 0.141-0.268 0.282-0.4 0.423C30.054 34.625 30.188 34.485 30.321 34.344z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M28.22 36.623c-1.713 1.903-3.359 3.843-4.92 5.827l1.282 1.279 -0.115-0.115 3.753-2.179V36.623z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="71.026 60.366 66.188 63.175 73.583 70.549 76.049 69.117 76.049 63.282 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="55.045 161.957 50.023 164.819 50.023 167.931 55.645 162.299 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M46.365 154.153c-0.026 0.041-0.052 0.081-0.078 0.121C46.313 154.234 46.339 154.194 46.365 154.153zM55.045 136.643l5.023-2.917v-5.834l-2.624-1.495c0.009-0.049 0.018-0.098 0.027-0.146 -1.89 10.016-5.593 19.316-11.107 27.903 0.049-0.076 0.1-0.152 0.148-0.229l2.939-1.706v-3.293c0.193-0.357 0.384-0.717 0.571-1.077v4.37l5.022 2.916 5.023-2.916v-5.836l-5.023-2.916 -3.985 2.314c0.146-0.303 0.291-0.607 0.433-0.912l3.268-1.896v-5.836l-0.126-0.073c0.063-0.185 0.124-0.367 0.186-0.552L55.045 136.643zM38.019 163.696l1.104 0.629 5.022-2.862v-4.024c0.192-0.27 0.382-0.54 0.571-0.812v4.836l5.022 2.862 5.022-2.862v-5.834l-5.022-2.916 -3.911 2.271c0.155-0.236 0.307-0.473 0.459-0.709 -0.777 1.206-1.588 2.397-2.437 3.575L38.019 163.696z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="39.407 58.519 39.407 58.519 38.896 58.008 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.43 51.175 39.407 54.037 39.407 58.519 42.65 61.754 44.43 62.787 49.452 59.871 49.452 54.037 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="50.818 53.583 50.023 54.037 50.023 59.871 55.045 62.787 58.206 60.953 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="56.929 63.829 59.003 61.748 58.624 61.37 55.331 63.282 55.331 69.117 60.354 72.034 63.402 70.283 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="71.312 78.17 71.312 78.363 71.776 78.633 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="92.258 134.221 87.236 137.137 87.236 142.973 92.258 145.889 97.281 142.973 97.281 137.137 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="81.643 152.713 76.62 155.629 76.62 161.463 81.643 164.325 86.665 161.463 86.665 155.629 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="86.951 143.467 81.928 146.383 81.928 152.219 86.951 155.135 91.973 152.219 91.973 146.383 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="78.793 144.895 71.588 152.379 76.335 155.135 81.357 152.219 81.357 146.383 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="71.18 152.803 66.004 158.18 66.004 161.463 71.026 164.325 76.049 161.463 76.049 155.629 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="65.718 143.466 60.639 146.384 60.639 152.218 61.532 152.73 68.754 145.229 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="60.354 134.22 55.331 137.137 55.331 142.973 60.354 145.89 65.433 142.972 65.433 137.138 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M60.354 115.784l-1.648 0.958c0.002-0.028 0.004-0.057 0.006-0.085 -0.236 3.253-0.646 6.437-1.232 9.552 0.025-0.135 0.051-0.271 0.076-0.406l2.799 1.596 5.079-2.863v-5.833L60.354 115.784z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="81.643 134.221 76.62 137.137 76.62 140.844 79.771 143.878 79.201 144.471 81.643 145.889 86.665 142.973 86.665 137.137 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M92.258 78.857l-5.022 2.917v5.834l0.423 0.241c0.064-0.066 0.125-0.134 0.191-0.199 2.713-2.682 5.679-4.74 8.892-6.188L92.258 78.857z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M79.983 116.749l-3.363 1.953v5.833l5.022 2.862 2.593-1.478c-1.984-2.82-3.409-5.875-4.253-9.173C79.982 116.747 79.983 116.748 79.983 116.749zM84.235 125.92c0.068 0.099 0.142 0.194 0.212 0.292 -0.068-0.099-0.136-0.198-0.205-0.296L84.235 125.92zM91.6 133.4c-1.333-0.934-2.583-2-3.75-3.2 -1.278-1.269-2.402-2.603-3.402-3.988 0.041 0.059 0.08 0.117 0.122 0.175l-2.641 1.505v5.834l5.022 2.917 5.022-2.917v-0.071C91.85 133.566 91.722 133.491 91.6 133.4z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="81.643 78.857 76.62 81.774 76.62 87.608 81.643 90.47 86.665 87.608 86.665 81.774 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M97.281 155.629l-5.022-2.916 -5.022 2.916v5.834l3.271 1.864c-0.085 0.02-0.17 0.04-0.255 0.06 1.974-0.458 3.978-0.841 6.011-1.151 -0.151 0.022-0.303 0.044-0.454 0.067l1.473-0.84V155.629z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="76.335 88.102 71.312 90.964 71.312 96.798 76.335 99.715 81.357 96.798 81.357 90.964 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M86.951 88.102l-5.022 2.862v4.912c1.315-2.72 3.09-5.254 5.323-7.603L86.951 88.102z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="49.738 171.147 49.498 171.287 44.715 176.078 44.715 179.899 49.738 182.815 54.76 179.899 54.76 174.064 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="39.122 171.147 34.1 174.064 34.1 179.899 36.617 181.361 43.99 173.975 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="38.406 182.399 39.122 182.815 44.145 179.899 44.145 176.65 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="32.688 51.816 32.688 51.816 32.383 51.512 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="33.529 50.68 33.529 44.846 28.506 41.93 24.886 44.032 32.383 51.512 32.269 51.398 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="38.836 54.037 33.814 51.175 32.688 51.816 38.836 57.95 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="37.601 164.115 30.24 171.495 33.814 173.57 38.836 170.653 38.836 164.819 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="57.445 163.324 50.091 170.692 55.045 173.57 60.068 170.653 60.068 164.819 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="65.718 161.957 60.639 164.82 60.639 170.652 65.718 173.57 70.741 170.653 70.741 164.819 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M89.689 163.519l-2.739-1.562 -5.022 2.862v0.997c-0.191 0.067-0.38 0.136-0.571 0.205v-1.202l-5.022-2.862 -5.023 2.862v5.704c-0.228 0.123-0.451 0.259-0.678 0.384 6.138-3.381 12.626-5.884 19.474-7.486C89.968 163.453 89.829 163.485 89.689 163.519z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="63.021 161.277 60.5 158.85 61.208 159.556 57.863 162.906 60.354 164.326 65.433 161.462 65.433 158.772 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="81.643 60.366 76.62 63.282 76.62 69.117 81.643 72.034 86.665 69.117 86.665 63.282 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="76.335 69.611 74.001 70.966 79.071 76.021 74.748 80.358 76.335 81.28 81.357 78.363 81.357 72.528 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="92.258 60.366 87.236 63.282 87.236 69.117 92.258 72.034 97.281 69.117 97.281 63.282 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M96.715 136.402c-0.133-0.061-0.266-0.122-0.398-0.185C96.449 136.28 96.582 136.342 96.715 136.402z"/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M95.012 135.559c-0.099-0.054-0.195-0.111-0.292-0.166C94.817 135.447 94.914 135.505 95.012 135.559z"/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="44.43 32.684 39.407 35.6 39.407 39.376 44.348 44.305 44.43 44.352 49.452 41.436 49.452 35.6 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="33.814 32.684 33.109 33.093 38.836 38.807 38.836 35.6 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="49.738 41.93 44.826 44.782 52.201 52.139 54.76 50.68 54.76 44.846 "/><polygon fill-rule="evenodd" clip-rule="evenodd" fill="#010101" points="55.045 51.175 52.621 52.557 59.996 59.914 60.068 59.871 60.068 54.037 "/><path fill-rule="evenodd" clip-rule="evenodd" fill="#010101" d="M60.354 97.292l-2.138 1.241c-0.027-0.204-0.054-0.409-0.083-0.612l1.934-1.123v-5.834l-3.736-2.129c-0.055-0.21-0.111-0.419-0.167-0.629 1.856 6.886 2.786 14.15 2.786 21.793 0 2.23-0.079 4.43-0.234 6.599 0.013-0.182 0.026-0.363 0.038-0.545l1.314-0.763v-5.835l-1.126-0.654c-0.003-0.222-0.006-0.445-0.011-0.667l1.423 0.826 5.079-2.917v-5.834L60.354 97.292z"/></svg> \ No newline at end of file diff --git a/src/UI/Content/Images/touch/114.png b/src/UI/Content/Images/touch/114.png deleted file mode 100644 index 6f23cd0f6..000000000 Binary files a/src/UI/Content/Images/touch/114.png and /dev/null differ diff --git a/src/UI/Content/Images/touch/144.png b/src/UI/Content/Images/touch/144.png deleted file mode 100644 index a524e0cec..000000000 Binary files a/src/UI/Content/Images/touch/144.png and /dev/null differ diff --git a/src/UI/Content/Images/touch/57.png b/src/UI/Content/Images/touch/57.png deleted file mode 100644 index 0a715a3f6..000000000 Binary files a/src/UI/Content/Images/touch/57.png and /dev/null differ diff --git a/src/UI/Content/Images/touch/72.png b/src/UI/Content/Images/touch/72.png deleted file mode 100644 index 2971f6b1e..000000000 Binary files a/src/UI/Content/Images/touch/72.png and /dev/null differ diff --git a/src/UI/Movies/Details/MoviesDetailsLayout.js b/src/UI/Movies/Details/MoviesDetailsLayout.js index 119c6bd71..77f710890 100644 --- a/src/UI/Movies/Details/MoviesDetailsLayout.js +++ b/src/UI/Movies/Details/MoviesDetailsLayout.js @@ -209,7 +209,7 @@ module.exports = Marionette.Layout.extend({ _moviesSearch : function() { CommandController.Execute('moviesSearch', { name : 'moviesSearch', - movieId : this.model.id + movieIds : [this.model.id] }); }, diff --git a/src/UI/Movies/Index/MoviesIndexLayout.js b/src/UI/Movies/Index/MoviesIndexLayout.js index 87a2de772..479c6df12 100644 --- a/src/UI/Movies/Index/MoviesIndexLayout.js +++ b/src/UI/Movies/Index/MoviesIndexLayout.js @@ -182,6 +182,27 @@ module.exports = Marionette.Layout.extend({ tooltip : 'Missing Only', icon : 'icon-sonarr-missing', callback : this._setFilter + }, + { + key : 'released', + title : '', + tooltip : 'Released', + icon : 'icon-sonarr-movie-released', + callback : this._setFilter + }, + { + key : 'announced', + title : '', + tooltip : 'Announced', + icon : 'icon-sonarr-movie-announced', + callback : this._setFilter + }, + { + key : 'cinemas', + title : '', + tooltip : 'In Cinemas', + icon : 'icon-sonarr-movie-cinemas', + callback : this._setFilter } ] }; diff --git a/src/UI/Movies/MoviesCollection.js b/src/UI/Movies/MoviesCollection.js index 193f47ef6..763ec21cd 100644 --- a/src/UI/Movies/MoviesCollection.js +++ b/src/UI/Movies/MoviesCollection.js @@ -16,7 +16,7 @@ var Collection = PageableCollection.extend({ state : { sortKey : 'sortTitle', - order : 1, + order : -1, pageSize : 100000, secondarySortKey : 'sortTitle', secondarySortOrder : -1 @@ -67,6 +67,21 @@ var Collection = PageableCollection.extend({ 'missing' : [ 'downloaded', false + ], + 'released' : [ + null, + null, + function(model) { return model.getStatus() == "released"; } + ], + 'announced' : [ + null, + null, + function(model) { return model.getStatus() == "announced"; } + ], + 'cinemas' : [ + null, + null, + function(model) { return model.getStatus() == "inCinemas"; } ] }, diff --git a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs index a10f5d234..9043ad2f5 100644 --- a/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs +++ b/src/UI/Settings/DownloadClient/DroneFactory/DroneFactoryViewTemplate.hbs @@ -23,7 +23,7 @@ </div> <div class="col-sm-2 col-sm-pull-1"> - <input type="number" name="downloadedMovieScanInterval" class="form-control" /> + <input type="number" name="downloadedEpisodesScanInterval" class="form-control" /> </div> </div> </fieldset> \ No newline at end of file diff --git a/src/UI/Settings/General/GeneralViewTemplate.hbs b/src/UI/Settings/General/GeneralViewTemplate.hbs index e4b3e6b59..cd7c25f8b 100644 --- a/src/UI/Settings/General/GeneralViewTemplate.hbs +++ b/src/UI/Settings/General/GeneralViewTemplate.hbs @@ -328,7 +328,7 @@ </div> {{#if_mono}} - <div class="alert alert-warning">Please see: <a href="https://github.com/NzbDrone/NzbDrone/wiki/Updating">the wiki</a> for more information</div> + <div class="alert alert-warning">Please see: <a href="https://github.com/Radarr/Radarr/wiki">the wiki</a> for more information</div> <div class="form-group"> <label class="col-sm-3 control-label">Automatic</label> diff --git a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs index 056d12648..7770ba4ee 100644 --- a/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs +++ b/src/UI/Settings/Indexers/Options/IndexerOptionsViewTemplate.hbs @@ -34,7 +34,7 @@ </div> <div class="col-sm-2 col-sm-pull-1"> - <input type="number" name="rssSyncInterval" class="form-control" min="0" max="120"/> + <input type="number" name="rssSyncInterval" class="form-control" min="0" max="720"/> </div> </div> </fieldset> diff --git a/src/UI/Wanted/Missing/MissingLayout.js b/src/UI/Wanted/Missing/MissingLayout.js index b3aa9e378..1a7e6711f 100644 --- a/src/UI/Wanted/Missing/MissingLayout.js +++ b/src/UI/Wanted/Missing/MissingLayout.js @@ -165,11 +165,11 @@ module.exports = Marionette.Layout.extend({ })); CommandController.bindToCommand({ element : this.$('.x-search-selected'), - command : { name : 'episodeSearch' } + command : { name : 'moviesSearch' } }); CommandController.bindToCommand({ element : this.$('.x-search-missing'), - command : { name : 'missingEpisodeSearch' } + command : { name : 'missingMoviesSearch' } }); }, @@ -187,20 +187,20 @@ module.exports = Marionette.Layout.extend({ if (selected.length === 0) { Messenger.show({ type : 'error', - message : 'No episodes selected' + message : 'No movies selected' }); return; } var ids = _.pluck(selected, 'id'); - CommandController.Execute('episodeSearch', { - name : 'episodeSearch', - episodeIds : ids + CommandController.Execute('moviesSearch', { + name : 'moviesSearch', + movieIds : ids }); }, _searchMissing : function() { if (window.confirm('Are you sure you want to search for {0} missing movies? '.format(this.collection.state.totalRecords) + 'One API request to each indexer will be used for each movie. ' + 'This cannot be stopped once started.')) { - CommandController.Execute('missingEpisodeSearch', { name : 'missingEpisodeSearch' }); + CommandController.Execute('missingMoviesSearch', { name : 'missingMoviesSearch' }); } }, _toggleMonitoredOfSelected : function() { @@ -209,7 +209,7 @@ module.exports = Marionette.Layout.extend({ if (selected.length === 0) { Messenger.show({ type : 'error', - message : 'No episodes selected' + message : 'No movies selected' }); return; } diff --git a/src/UI/index.html b/src/UI/index.html index 10e77adef..aa96ef4c9 100644 --- a/src/UI/index.html +++ b/src/UI/index.html @@ -7,11 +7,6 @@ <meta name="mobile-web-app-capable" content="yes"/> <meta name="apple-mobile-web-app-capable" content="yes"/> - <!-- Chrome, Opera, and Firefox OS --> - <meta name="theme-color" content="#272727"/> - <!-- Windows Phone --> - <meta name="msapplication-navbutton-color" content="#272727"/> - <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/> <link href="/Content/bootstrap.css" rel='stylesheet' type='text/css'/> @@ -33,12 +28,24 @@ <link href="/Content/overrides.css" rel='stylesheet' type='text/css'/> <link href="/Content/info.css" rel='stylesheet' type='text/css'/> - <link rel="apple-touch-icon" href="/Content/Images/touch/57.png"/> - <link rel="apple-touch-icon" sizes="72x72" href="/Content/Images/touch/72.png"/> - <link rel="apple-touch-icon" sizes="114x114" href="/Content/Images/touch/114.png"/> - <link rel="apple-touch-icon" sizes="144x144" href="/Content/Images/touch/144.png"/> - <link rel="mask-icon" href="/Content/Images/safari/logo.svg" color="#35c5f4"> - <link rel="icon" type="image/ico" href="/Content/Images/favicon.ico"/> + <!-- Windows Phone --> + <meta name="msapplication-navbutton-color" content="#272727"/> + + <!-- Generated by http://realfavicongenerator.net/ --> + <link rel="apple-touch-icon" sizes="180x180" href="/Content/Images/favicon/apple-touch-icon.png"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/favicon-32x32.png" sizes="32x32"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/favicon-194x194.png" sizes="194x194"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/android-chrome-192x192.png" sizes="192x192"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/favicon-16x16.png" sizes="16x16"> + <link rel="manifest" href="/Content/Images/favicon/manifest.json"> + <link rel="mask-icon" href="/Content/Images/favicon/safari-pinned-tab.svg" color="#ffc230"> + <link rel="shortcut icon" href="/Content/Images/favicon/favicon.ico"> + <meta name="apple-mobile-web-app-title" content="Radarr"> + <meta name="application-name" content="Radarr"> + <meta name="msapplication-TileColor" content="#272727"> + <meta name="msapplication-TileImage" content="/Content/Images/favicon/mstile-144x144.png"> + <meta name="msapplication-config" content="/Content/Images/favicon/browserconfig.xml"> + <meta name="theme-color" content="#272727"> <link rel="alternate" type="text/calendar" title="iCalendar feed for Radarr" href="/feed/calendar/NzbDrone.ics"/> </head> diff --git a/src/UI/login.html b/src/UI/login.html index e956bbd4c..a73b84b38 100644 --- a/src/UI/login.html +++ b/src/UI/login.html @@ -11,11 +11,24 @@ <link href="/Content/bootstrap.css" rel='stylesheet' type='text/css'/> <link href="/Content/theme.css" rel='stylesheet' type='text/css'/> - <link rel="apple-touch-icon" href="/Content/Images/touch/57.png"/> - <link rel="apple-touch-icon" sizes="72x72" href="/Content/Images/touch/72.png"/> - <link rel="apple-touch-icon" sizes="114x114" href="/Content/Images/touch/114.png"/> - <link rel="apple-touch-icon" sizes="144x144" href="/Content/Images/touch/144.png"/> - <link rel="icon" type="image/ico" href="/Content/Images/favicon.ico"/> + <!-- Windows Phone --> + <meta name="msapplication-navbutton-color" content="#272727"/> + + <!-- Generated by http://realfavicongenerator.net/ --> + <link rel="apple-touch-icon" sizes="180x180" href="/Content/Images/favicon/apple-touch-icon.png"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/favicon-32x32.png" sizes="32x32"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/favicon-194x194.png" sizes="194x194"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/android-chrome-192x192.png" sizes="192x192"> + <link rel="icon" type="image/png" href="/Content/Images/favicon/favicon-16x16.png" sizes="16x16"> + <link rel="manifest" href="/Content/Images/favicon/manifest.json"> + <link rel="mask-icon" href="/Content/Images/favicon/safari-pinned-tab.svg" color="#ffc230"> + <link rel="shortcut icon" href="/Content/Images/favicon/favicon.ico"> + <meta name="apple-mobile-web-app-title" content="Radarr"> + <meta name="application-name" content="Radarr"> + <meta name="msapplication-TileColor" content="#272727"> + <meta name="msapplication-TileImage" content="/Content/Images/favicon/mstile-144x144.png"> + <meta name="msapplication-config" content="/Content/Images/favicon/browserconfig.xml"> + <meta name="theme-color" content="#272727"> </head> <body> <div class="container">