lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update recording format

Browse Source
This commit is contained in:
Luke Pulverenti 2016-06-15 14:56:37 -04:00
parent 6118e5f966
commit 023b12a798
9 changed files with 131 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/StartupWizardService.cs
View File

@ -114,7 +114,7 @@ namespace MediaBrowser.Api
config.EnableStandaloneMusicKeys = true; config.EnableStandaloneMusicKeys = true;
config.EnableCaseSensitiveItemIds = true; config.EnableCaseSensitiveItemIds = true;
config.EnableFolderView = true; config.EnableFolderView = true;
config.SchemaVersion = 91; config.SchemaVersion = 92;
} }
public void Post(UpdateStartupConfiguration request) public void Post(UpdateStartupConfiguration request)

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

@ -1413,14 +1413,14 @@ namespace MediaBrowser.Controller.Entities
return; return;
} }
var playedQueryResult = GetItems(new InternalItemsQuery(user) var unplayedQueryResult = GetItems(new InternalItemsQuery(user)
{ {
Recursive = true, Recursive = true,
IsFolder = false, IsFolder = false,
IsVirtualItem = false, IsVirtualItem = false,
EnableTotalRecordCount = true, EnableTotalRecordCount = true,
Limit = 0, Limit = 0,
IsPlayed = true IsPlayed = false
}).Result; }).Result;
@ -1435,12 +1435,14 @@ namespace MediaBrowser.Controller.Entities
}).Result; }).Result;
double recursiveItemCount = allItemsQueryResult.TotalRecordCount; double recursiveItemCount = allItemsQueryResult.TotalRecordCount;
double playedCount = playedQueryResult.TotalRecordCount; double unplayedCount = unplayedQueryResult.TotalRecordCount;
if (recursiveItemCount > 0) if (recursiveItemCount > 0)
{ {
dto.PlayedPercentage = (playedCount / recursiveItemCount) * 100; var unplayedPercentage = (unplayedCount / recursiveItemCount) * 100;
dto.PlayedPercentage = 100 - unplayedPercentage;
dto.Played = dto.PlayedPercentage.Value >= 100; dto.Played = dto.PlayedPercentage.Value >= 100;
dto.UnplayedItemCount = unplayedQueryResult.TotalRecordCount;
} }
} }
} }

23
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@ -186,16 +186,25 @@ namespace MediaBrowser.Controller.Entities.TV
var user = query.User; var user = query.User;
if (query.Recursive)
{
query.AncestorWithPresentationUniqueKey = PresentationUniqueKey;
if (query.SortBy.Length == 0)
{
query.SortBy = new[] { ItemSortBy.SortName };
}
if (query.IncludeItemTypes.Length == 0)
{
query.IncludeItemTypes = new[] { typeof(Episode).Name, typeof(Season).Name };
}
query.IsVirtualItem = false;
return Task.FromResult(LibraryManager.GetItemsResult(query));
}
Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager); Func<BaseItem, bool> filter = i => UserViewBuilder.Filter(i, user, query, UserDataManager, LibraryManager);
IEnumerable<BaseItem> items; var items = GetSeasons(user).Where(filter);
items = query.Recursive
? GetSeasons(user).Cast<BaseItem>().Concat(GetEpisodes(user)).Where(filter)
: GetSeasons(user).Where(filter);
var result = PostFilterAndSort(items, query); var result = PostFilterAndSort(items, query);
return Task.FromResult(result); return Task.FromResult(result);
} }

41
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -469,22 +469,31 @@ namespace MediaBrowser.Server.Implementations.Dto
{ {
if (item.IsFolder) if (item.IsFolder)
{ {
var userData = _userDataRepository.GetUserData(user, item);
// Skip the user data manager because we've already looped through the recursive tree and don't want to do it twice
// TODO: Improve in future
dto.UserData = GetUserItemDataDto(userData);
var folder = (Folder)item; var folder = (Folder)item;
if (fields.Contains(ItemFields.SyncInfo))
{
var userData = _userDataRepository.GetUserData(user, item);
// Skip the user data manager because we've already looped through the recursive tree and don't want to do it twice
// TODO: Improve in future
dto.UserData = GetUserItemDataDto(userData);
if (item.SourceType == SourceType.Library && folder.SupportsUserDataFromChildren)
{
SetSpecialCounts(folder, user, dto, fields, syncProgress);
}
dto.UserData.Played = dto.UserData.PlayedPercentage.HasValue && dto.UserData.PlayedPercentage.Value >= 100;
}
else
{
dto.UserData = _userDataRepository.GetUserDataDto(item, user);
}
if (item.SourceType == SourceType.Library) if (item.SourceType == SourceType.Library)
{ {
dto.ChildCount = GetChildCount(folder, user); dto.ChildCount = GetChildCount(folder, user);
if (folder.SupportsUserDataFromChildren)
{
SetSpecialCounts(folder, user, dto, fields, syncProgress);
}
} }
if (fields.Contains(ItemFields.CumulativeRunTimeTicks)) if (fields.Contains(ItemFields.CumulativeRunTimeTicks))
@ -496,8 +505,6 @@ namespace MediaBrowser.Server.Implementations.Dto
{ {
dto.DateLastMediaAdded = folder.DateLastMediaAdded; dto.DateLastMediaAdded = folder.DateLastMediaAdded;
} }
dto.UserData.Played = dto.UserData.PlayedPercentage.HasValue && dto.UserData.PlayedPercentage.Value >= 100;
} }
else else
@ -1586,12 +1593,18 @@ namespace MediaBrowser.Server.Implementations.Dto
/// <returns>Task.</returns> /// <returns>Task.</returns>
private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress) private void SetSpecialCounts(Folder folder, User user, BaseItemDto dto, List<ItemFields> fields, Dictionary<string, SyncedItemProgress> syncProgress)
{ {
var addSyncInfo = fields.Contains(ItemFields.SyncInfo);
if (!addSyncInfo)
{
return;
}
var recursiveItemCount = 0; var recursiveItemCount = 0;
var unplayed = 0; var unplayed = 0;
double totalPercentPlayed = 0; double totalPercentPlayed = 0;
double totalSyncPercent = 0; double totalSyncPercent = 0;
var addSyncInfo = fields.Contains(ItemFields.SyncInfo);
var children = folder.GetItems(new InternalItemsQuery var children = folder.GetItems(new InternalItemsQuery
{ {

21
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -44,16 +44,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile) public string GetOutputPath(MediaSourceInfo mediaSource, string targetFile)
{ {
if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings)
{
// if the audio is aac_latm, stream copying to mp4 will fail
var streams = mediaSource.MediaStreams ?? new List<MediaStream>();
if (streams.Any(i => i.Type == MediaStreamType.Audio && (i.Codec ?? string.Empty).IndexOf("aac", StringComparison.OrdinalIgnoreCase) != -1))
{
return Path.ChangeExtension(targetFile, ".ts");
}
}
return Path.ChangeExtension(targetFile, ".mp4"); return Path.ChangeExtension(targetFile, ".mp4");
} }
@ -159,9 +149,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
private string GetAudioArgs(MediaSourceInfo mediaSource) private string GetAudioArgs(MediaSourceInfo mediaSource)
{ {
var copyAudio = new[] { "aac", "mp3" }; // do not copy aac because many players have difficulty with aac_latm
var copyAudio = new[] { "mp3" };
var mediaStreams = mediaSource.MediaStreams ?? new List<MediaStream>(); var mediaStreams = mediaSource.MediaStreams ?? new List<MediaStream>();
if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings || mediaStreams.Any(i => i.Type == MediaStreamType.Audio && copyAudio.Contains(i.Codec, StringComparer.OrdinalIgnoreCase))) var inputAudioCodec = mediaStreams.Where(i => i.Type == MediaStreamType.Audio).Select(i => i.Codec).FirstOrDefault() ?? string.Empty;
if (copyAudio.Contains(inputAudioCodec, StringComparer.OrdinalIgnoreCase))
{
return "-codec:a:0 copy";
}
if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings && !string.Equals(inputAudioCodec, "aac", StringComparison.OrdinalIgnoreCase))
{ {
return "-codec:a:0 copy"; return "-codec:a:0 copy";
} }

8
MediaBrowser.Server.Implementations/Persistence/SqliteExtensions.cs
View File

@ -26,6 +26,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
throw new ArgumentNullException("dbPath"); throw new ArgumentNullException("dbPath");
} }
SQLiteConnection.SetMemoryStatus(false);
var connectionstr = new SQLiteConnectionStringBuilder var connectionstr = new SQLiteConnectionStringBuilder
{ {
PageSize = 4096, PageSize = 4096,
@ -41,8 +43,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
var connectionString = connectionstr.ConnectionString; var connectionString = connectionstr.ConnectionString;
//logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, connectionString); if (!enablePooling)
SQLiteConnection.SetMemoryStatus(false); {
logger.Info("Sqlite {0} opening {1}", SQLiteConnection.SQLiteVersion, connectionString);
}
var connection = new SQLiteConnection(connectionString); var connection = new SQLiteConnection(connectionString);

47
MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
View File

@ -94,7 +94,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
private IDbCommand _updateInheritedRatingCommand; private IDbCommand _updateInheritedRatingCommand;
private IDbCommand _updateInheritedTagsCommand; private IDbCommand _updateInheritedTagsCommand;
public const int LatestSchemaVersion = 89; public const int LatestSchemaVersion = 92;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="SqliteItemRepository"/> class. /// Initializes a new instance of the <see cref="SqliteItemRepository"/> class.
@ -122,7 +122,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false) protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
{ {
var connection = await DbConnector.Connect(DbFilePath, false, false, 6000).ConfigureAwait(false); var connection = await DbConnector.Connect(DbFilePath, false, false, 20000).ConfigureAwait(false);
connection.RunQueries(new[] connection.RunQueries(new[]
{ {
@ -1789,7 +1789,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
var slowThreshold = 1000; var slowThreshold = 1000;
#if DEBUG #if DEBUG
slowThreshold = 100; slowThreshold = 80;
#endif #endif
if (elapsed >= slowThreshold) if (elapsed >= slowThreshold)
@ -1857,13 +1857,22 @@ namespace MediaBrowser.Server.Implementations.Persistence
} }
} }
cmd.CommandText += ";";
var isReturningZeroItems = query.Limit.HasValue && query.Limit <= 0;
if (isReturningZeroItems)
{
cmd.CommandText = "";
}
if (EnableGroupByPresentationUniqueKey(query)) if (EnableGroupByPresentationUniqueKey(query))
{ {
cmd.CommandText += "; select count (distinct PresentationUniqueKey)" + GetFromText(); cmd.CommandText += " select count (distinct PresentationUniqueKey)" + GetFromText();
} }
else else
{ {
cmd.CommandText += "; select count (guid)" + GetFromText(); cmd.CommandText += " select count (guid)" + GetFromText();
} }
cmd.CommandText += GetJoinUserDataText(query); cmd.CommandText += GetJoinUserDataText(query);
@ -1876,18 +1885,28 @@ namespace MediaBrowser.Server.Implementations.Persistence
{ {
LogQueryTime("GetItems", cmd, now); LogQueryTime("GetItems", cmd, now);
while (reader.Read()) if (isReturningZeroItems)
{ {
var item = GetItem(reader); if (reader.Read())
if (item != null)
{ {
list.Add(item); count = reader.GetInt32(0);
} }
} }
else
if (reader.NextResult() && reader.Read())
{ {
count = reader.GetInt32(0); while (reader.Read())
{
var item = GetItem(reader);
if (item != null)
{
list.Add(item);
}
}
if (reader.NextResult() && reader.Read())
{
count = reader.GetInt32(0);
}
} }
} }
@ -2388,8 +2407,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
} }
if (query.ParentIndexNumberNotEquals.HasValue) if (query.ParentIndexNumberNotEquals.HasValue)
{ {
whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumber or ParentIndexNumber is null)"); whereClauses.Add("(ParentIndexNumber<>@ParentIndexNumberNotEquals or ParentIndexNumber is null)");
cmd.Parameters.Add(cmd, "@ParentIndexNumber", DbType.Int32).Value = query.ParentIndexNumberNotEquals.Value; cmd.Parameters.Add(cmd, "@ParentIndexNumberNotEquals", DbType.Int32).Value = query.ParentIndexNumberNotEquals.Value;
} }
if (query.MinEndDate.HasValue) if (query.MinEndDate.HasValue)
{ {

13
MediaBrowser.Server.Implementations/Persistence/SqliteUserDataRepository.cs
View File

@ -39,6 +39,19 @@ namespace MediaBrowser.Server.Implementations.Persistence
} }
} }
protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
{
var connection = await DbConnector.Connect(DbFilePath, false, false, 10000).ConfigureAwait(false);
connection.RunQueries(new[]
{
"pragma temp_store = memory"
}, Logger);
return connection;
}
/// <summary> /// <summary>
/// Opens the connection to the database /// Opens the connection to the database
/// </summary> /// </summary>

20
MediaBrowser.Server.Startup.Common/Migrations/DbMigration.cs
View File

@ -18,6 +18,7 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
public void Run() public void Run()
{ {
// If a forced migration is required, do that now
if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion) if (_config.Configuration.MigrationVersion < CleanDatabaseScheduledTask.MigrationVersion)
{ {
if (!_config.Configuration.IsStartupWizardCompleted) if (!_config.Configuration.IsStartupWizardCompleted)
@ -36,6 +37,25 @@ namespace MediaBrowser.Server.Startup.Common.Migrations
_taskManager.Execute<CleanDatabaseScheduledTask>(); _taskManager.Execute<CleanDatabaseScheduledTask>();
}); });
return;
}
if (_config.Configuration.SchemaVersion < SqliteItemRepository.LatestSchemaVersion)
{
if (!_config.Configuration.IsStartupWizardCompleted)
{
_config.Configuration.SchemaVersion = SqliteItemRepository.LatestSchemaVersion;
_config.SaveConfiguration();
return;
}
Task.Run(async () =>
{
await Task.Delay(1000).ConfigureAwait(false);
_taskManager.Execute<CleanDatabaseScheduledTask>();
});
} }
} }
} }