michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1450 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-02-13 10:59:44 -05:00
commit 8581e0036d
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Api/Library/FileOrganizationService.cs
View File

@ -1,9 +1,11 @@
using MediaBrowser.Controller.FileOrganization; using System.Collections.Generic;
using MediaBrowser.Controller.FileOrganization;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Model.FileOrganization; using MediaBrowser.Model.FileOrganization;
using MediaBrowser.Model.Querying; using MediaBrowser.Model.Querying;
using ServiceStack; using ServiceStack;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Model.Dto;
namespace MediaBrowser.Api.Library namespace MediaBrowser.Api.Library
{ {
@ -92,14 +94,11 @@ namespace MediaBrowser.Api.Library
public int? Limit { get; set; } public int? Limit { get; set; }
} }
[Route("/Library/FileOrganizations/SmartMatches", "DELETE", Summary = "Deletes a smart match entry")] [Route("/Library/FileOrganizations/SmartMatches/Delete", "POST", Summary = "Deletes a smart match entry")]
public class DeleteSmartMatchEntry public class DeleteSmartMatchEntry
{ {
[ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")] [ApiMember(Name = "Entries", Description = "SmartMatch Entry", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Name { get; set; } public List<NameValuePair> Entries { get; set; }
[ApiMember(Name = "MatchString", Description = "SmartMatch String", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "DELETE")]
public string MatchString { get; set; }
} }
[Authenticated(Roles = "Admin")] [Authenticated(Roles = "Admin")]
@ -172,7 +171,10 @@ namespace MediaBrowser.Api.Library
public void Post(DeleteSmartMatchEntry request) public void Post(DeleteSmartMatchEntry request)
{ {
_iFileOrganizationService.DeleteSmartMatchEntry(request.Name, request.MatchString); request.Entries.ForEach(entry =>
{
_iFileOrganizationService.DeleteSmartMatchEntry(entry.Name, entry.Value);
});
} }
} }
} }

9
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -98,6 +98,9 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="dashboard-ui\autoorganizesmart.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\chromecasthelpers.js"> <Content Include="dashboard-ui\components\chromecasthelpers.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -140,6 +143,12 @@
<Content Include="dashboard-ui\components\directorybrowser\directorybrowser.js"> <Content Include="dashboard-ui\components\directorybrowser\directorybrowser.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\components\fileorganizer\fileorganizer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\fileorganizer\fileorganizer.template.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\humanedate.js"> <Content Include="dashboard-ui\components\humanedate.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>