From f9cf728381a5e0e6b7fa12b864133a221e282236 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Tue, 5 Apr 2016 14:14:04 +0100 Subject: [PATCH] Changed the title to a contains but the artist still must match, --- .../PlexAvailabilityCheckerTests.cs | 2 +- .../PlexAvailabilityChecker.cs | 2 +- PlexRequests.UI/Content/requests.js | 18 +++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs index 79572153c..e8a63474a 100644 --- a/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs +++ b/PlexRequests.Services.Tests/PlexAvailabilityCheckerTests.cs @@ -108,7 +108,7 @@ namespace PlexRequests.Services.Tests var requestMock = new Mock(); var plexMock = new Mock(); - var searchResult = new PlexSearch { Directory = new List { new Directory1 { Title = "title2", Year = "1992", ParentTitle = "dIzZy" } } }; + var searchResult = new PlexSearch { Directory = new List { new Directory1 { Title = "titale2", Year = "1992", ParentTitle = "dIzZy" } } }; settingsMock.Setup(x => x.GetSettings()).Returns(new PlexSettings { Ip = "abc" }); authMock.Setup(x => x.GetSettings()).Returns(new AuthenticationSettings { PlexAuthToken = "abc" }); diff --git a/PlexRequests.Services/PlexAvailabilityChecker.cs b/PlexRequests.Services/PlexAvailabilityChecker.cs index c10c19e1c..8cfa35b04 100644 --- a/PlexRequests.Services/PlexAvailabilityChecker.cs +++ b/PlexRequests.Services/PlexAvailabilityChecker.cs @@ -235,7 +235,7 @@ namespace PlexRequests.Services { foreach (var r in results.Directory) { - var titleMatch = r.Title.Equals(title, StringComparison.CurrentCultureIgnoreCase); + var titleMatch = r.Title.Contains(title); var artistMatch = r.ParentTitle.Equals(artist, StringComparison.CurrentCultureIgnoreCase); if (titleMatch && artistMatch) { diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index a25d23363..769d56a13 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -46,6 +46,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { activeState = $ml.mixItUp('getState'); $ml.mixItUp('destroy'); } + if ($musicL.mixItUp('isLoaded')) { + activeState = $musicL.mixItUp('getState'); + $musicL.mixItUp('destroy'); + } if ($tvl.mixItUp('isLoaded')) $tvl.mixItUp('destroy'); $tvl.mixItUp(mixItUpConfig(activeState)); // init or reinit } @@ -55,15 +59,23 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { activeState = $tvl.mixItUp('getState'); $tvl.mixItUp('destroy'); } + if ($musicL.mixItUp('isLoaded')) { + activeState = $musicL.mixItUp('getState'); + $musicL.mixItUp('destroy'); + } if ($ml.mixItUp('isLoaded')) $ml.mixItUp('destroy'); $ml.mixItUp(mixItUpConfig(activeState)); // init or reinit } if (target === "#MusicTab") { $('#approveMusic').show(); - if ($musicL.mixItUp('isLoaded')) { - activeState = $musicL.mixItUp('getState'); - $musicL.mixItUp('destroy'); + if ($tvl.mixItUp('isLoaded')) { + activeState = $tvl.mixItUp('getState'); + $tvl.mixItUp('destroy'); + } + if ($ml.mixItUp('isLoaded')) { + activeState = $ml.mixItUp('getState'); + $ml.mixItUp('destroy'); } if ($musicL.mixItUp('isLoaded')) $ml.mixItUp('destroy'); $musicL.mixItUp(mixItUpConfig(activeState)); // init or reinit