Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

update auto-organize

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-22 00:15:00 -05:00
parent cfce61efbc
commit 6c27159406
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -1155,14 +1155,21 @@ namespace MediaBrowser.Controller.Entities
DateTime? datePlayed, DateTime? datePlayed,
bool resetPosition) bool resetPosition)
{ {
var itemsResult = await GetItems(new InternalItemsQuery var query = new InternalItemsQuery
{ {
User = user, User = user,
Recursive = true, Recursive = true,
IsFolder = false, IsFolder = false,
IsMissing = false IsUnaired = false
}).ConfigureAwait(false); };
if (!user.Configuration.DisplayMissingEpisodes)
{
query.IsMissing = false;
}
var itemsResult = await GetItems(query).ConfigureAwait(false);
// Sweep through recursively and update status // Sweep through recursively and update status
var tasks = itemsResult.Items.Select(c => c.MarkPlayed(user, datePlayed, resetPosition)); var tasks = itemsResult.Items.Select(c => c.MarkPlayed(user, datePlayed, resetPosition));

2
MediaBrowser.Providers/TV/TvdbSeriesProvider.cs
View File

@ -258,7 +258,7 @@ namespace MediaBrowser.Providers.TV
if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out id)) if (seriesProviderIds.TryGetValue(MetadataProviders.Tvdb.ToString(), out id))
{ {
// This check should ideally never be necessary but we're seeing some cases of this and haven't tracked them down yet. // This check should ideally never be necessary but we're seeing some cases of this and haven't tracked them down yet.
if (string.IsNullOrWhiteSpace(id)) if (!string.IsNullOrWhiteSpace(id))
{ {
return true; return true;
} }

1
MediaBrowser.WebDashboard/Api/DashboardService.cs
View File

@ -335,6 +335,7 @@ namespace MediaBrowser.WebDashboard.Api
CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "hammerjs", "hammer.min.js"), Path.Combine(path, "bower_components", "hammerjs", "hammer.min.js")); CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "hammerjs", "hammer.min.js"), Path.Combine(path, "bower_components", "hammerjs", "hammer.min.js"));
CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "Sortable", "Sortable.min.js"), Path.Combine(path, "bower_components", "Sortable", "Sortable.min.js")); CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "Sortable", "Sortable.min.js"), Path.Combine(path, "bower_components", "Sortable", "Sortable.min.js"));
CopyFile(Path.Combine(creator.DashboardUIPath, "bower_components", "native-promise-only", "lib", "npo.src.js"), Path.Combine(path, "bower_components", "native-promise-only", "lib", "npo.src.js"));
} }
MinifyCssDirectory(Path.Combine(path, "css")); MinifyCssDirectory(Path.Combine(path, "css"));

1
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -379,6 +379,7 @@ namespace MediaBrowser.WebDashboard.Api
//sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'\">"); //sb.Append("<meta http-equiv=\"Content-Security-Policy\" content=\"default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'\">");
} }
sb.Append("<link rel=\"manifest\" href=\"manifest.json\">");
sb.Append("<meta http-equiv=\"X-UA-Compatibility\" content=\"IE=Edge\">"); sb.Append("<meta http-equiv=\"X-UA-Compatibility\" content=\"IE=Edge\">");
sb.Append("<meta name=\"format-detection\" content=\"telephone=no\">"); sb.Append("<meta name=\"format-detection\" content=\"telephone=no\">");
sb.Append("<meta name=\"msapplication-tap-highlight\" content=\"no\">"); sb.Append("<meta name=\"msapplication-tap-highlight\" content=\"no\">");

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

@ -128,6 +128,9 @@
<Content Include="dashboard-ui\bower_components\jstree\dist\jstree.min.js"> <Content Include="dashboard-ui\bower_components\jstree\dist\jstree.min.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="dashboard-ui\bower_components\native-promise-only\lib\npo.src.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\bower_components\requirejs\require.js"> <Content Include="dashboard-ui\bower_components\requirejs\require.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -179,6 +182,9 @@
<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\imagestore.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\components\itemidentifier\itemidentifier.js"> <Content Include="dashboard-ui\components\itemidentifier\itemidentifier.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
@ -2709,6 +2715,9 @@
<Content Include="dashboard-ui\strings\javascript\zh-TW.json"> <Content Include="dashboard-ui\strings\javascript\zh-TW.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<None Include="dashboard-ui\manifest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="dashboard-ui\strings\html\zh-HK.json"> <None Include="dashboard-ui\strings\html\zh-HK.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>