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

match segment with playlist name

Browse Source
This commit is contained in:
Luke Pulverenti 2014-11-24 07:17:48 -05:00
parent 7e4e9d6644
commit df4b2c47d6
1 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -193,32 +193,37 @@ namespace MediaBrowser.Api.Playback.Hls
return int.Parse(indexString, NumberStyles.Integer, UsCulture); return int.Parse(indexString, NumberStyles.Integer, UsCulture);
} }
private void DeleteLastFile(string path, string segmentExtension, int retryCount) private void DeleteLastFile(string playlistPath, string segmentExtension, int retryCount)
{
var file = GetLastTranscodingFile(playlistPath, segmentExtension, FileSystem);
if (file != null)
{
DeleteFile(file, retryCount);
}
}
private void DeleteFile(FileInfo file, int retryCount)
{ {
if (retryCount >= 5) if (retryCount >= 5)
{ {
return; return;
} }
var file = GetLastTranscodingFile(path, segmentExtension, FileSystem); try
if (file != null)
{ {
try File.Delete(file.FullName);
{ }
File.Delete(file.FullName); catch (IOException ex)
} {
catch (IOException ex) Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, file.FullName);
{
Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, file.FullName);
Thread.Sleep(100); Thread.Sleep(100);
DeleteLastFile(path, segmentExtension, retryCount + 1); DeleteFile(file, retryCount + 1);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, file.FullName); Logger.ErrorException("Error deleting partial stream file(s) {0}", ex, file.FullName);
}
} }
} }
@ -226,11 +231,13 @@ namespace MediaBrowser.Api.Playback.Hls
{ {
var folder = Path.GetDirectoryName(playlist); var folder = Path.GetDirectoryName(playlist);
var filePrefix = Path.GetFileNameWithoutExtension(playlist) ?? string.Empty;
try try
{ {
return new DirectoryInfo(folder) return new DirectoryInfo(folder)
.EnumerateFiles("*", SearchOption.TopDirectoryOnly) .EnumerateFiles("*", SearchOption.TopDirectoryOnly)
.Where(i => string.Equals(i.Extension, segmentExtension, StringComparison.OrdinalIgnoreCase)) .Where(i => string.Equals(i.Extension, segmentExtension, StringComparison.OrdinalIgnoreCase) && Path.GetFileNameWithoutExtension(i.Name).StartsWith(filePrefix, StringComparison.OrdinalIgnoreCase))
.OrderByDescending(fileSystem.GetLastWriteTimeUtc) .OrderByDescending(fileSystem.GetLastWriteTimeUtc)
.FirstOrDefault(); .FirstOrDefault();
} }