alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-27 04:22:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Check if file exists instead of catching exceptions

Browse Source
This commit is contained in:
Bond_009
2019-01-27 17:00:17 +01:00
parent 1a3543e5a5
commit ffe79c8982
6 changed files with 73 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Emby.Server.Implementations/ScheduledTasks/ChapterImagesTask.cs
View File

@@ -101,17 +101,20 @@ namespace Emby.Server.Implementations.ScheduledTasks
List<string> previouslyFailedImages;
try
if (File.Exists(failHistoryPath))
{
previouslyFailedImages = _fileSystem.ReadAllText(failHistoryPath)
.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
.ToList();
try
{
previouslyFailedImages = _fileSystem.ReadAllText(failHistoryPath)
.Split(new[] { '|' }, StringSplitOptions.RemoveEmptyEntries)
.ToList();
}
catch (IOException)
{
previouslyFailedImages = new List<string>();
}
}
catch (FileNotFoundException)
{
previouslyFailedImages = new List<string>();
}
catch (IOException)
else
{
previouslyFailedImages = new List<string>();
}

47
Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
View File

@@ -129,21 +129,16 @@ namespace Emby.Server.Implementations.ScheduledTasks
{
if (_lastExecutionResult == null && !_readFromFile)
{
try
if (File.Exists(path))
{
_lastExecutionResult = JsonSerializer.DeserializeFromFile<TaskResult>(path);
}
catch (DirectoryNotFoundException)
{
// File doesn't exist. No biggie
}
catch (FileNotFoundException)
{
// File doesn't exist. No biggie
}
catch (Exception ex)
{
Logger.LogError(ex, "Error deserializing {path}", path);
try
{
_lastExecutionResult = JsonSerializer.DeserializeFromFile<TaskResult>(path);
}
catch (Exception ex)
{
Logger.LogError(ex, "Error deserializing {File}", path);
}
}
_readFromFile = true;
}
@@ -532,28 +527,16 @@ namespace Emby.Server.Implementations.ScheduledTasks
private TaskTriggerInfo[] LoadTriggerSettings()
{
try
{
var list = JsonSerializer.DeserializeFromFile<IEnumerable<TaskTriggerInfo>>(GetConfigurationFilePath());
if (list != null)
{
return list.ToArray();
}
}
catch (FileNotFoundException)
string path = GetConfigurationFilePath();
if (!File.Exists(path))
{
// File doesn't exist. No biggie. Return defaults.
GetDefaultTriggers();
}
catch (DirectoryNotFoundException)
{
// File doesn't exist. No biggie. Return defaults.
}
catch
{
}
return GetDefaultTriggers();
var list = JsonSerializer.DeserializeFromFile<TaskTriggerInfo[]>(path);
return list ?? GetDefaultTriggers();
}
private TaskTriggerInfo[] GetDefaultTriggers()