From 37ea50a572e8bd00aad39c193087228a5d3a3433 Mon Sep 17 00:00:00 2001
From: Bond_009 <Bond.009@outlook.com>
Date: Sun, 24 Feb 2019 15:47:59 +0100
Subject: Reduce the amount of exceptions thrown

---
 .../LiveTv/EmbyTV/EmbyTV.cs                        |  4 ++--
 .../LiveTv/EmbyTV/ItemDataProvider.cs              | 26 +++++++++-------------
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'Emby.Server.Implementations/LiveTv')

diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index fceb82ba1..f424bdf5c 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -105,8 +105,8 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             _mediaSourceManager = mediaSourceManager;
             _streamHelper = streamHelper;
 
-            _seriesTimerProvider = new SeriesTimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "seriestimers"));
-            _timerProvider = new TimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "timers"), _logger);
+            _seriesTimerProvider = new SeriesTimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "seriestimers.json"));
+            _timerProvider = new TimerManager(jsonSerializer, _logger, Path.Combine(DataPath, "timers.json"), _logger);
             _timerProvider.TimerFired += _timerProvider_TimerFired;
 
             _config.NamedConfigurationUpdated += _config_NamedConfigurationUpdated;
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
index a2ac60b31..9c45ee36a 100644
--- a/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Serialization;
 using Microsoft.Extensions.Logging;
 
@@ -32,32 +31,28 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
                 if (_items == null)
                 {
+                    if (!File.Exists(_dataPath))
+                    {
+                        return new List<T>();
+                    }
+
                     Logger.LogInformation("Loading live tv data from {0}", _dataPath);
                     _items = GetItemsFromFile(_dataPath);
                 }
+
                 return _items.ToList();
             }
         }
 
         private List<T> GetItemsFromFile(string path)
         {
-            var jsonFile = path + ".json";
-
-            if (!File.Exists(jsonFile))
-            {
-                return new List<T>();
-            }
-
             try
             {
-                return _jsonSerializer.DeserializeFromFile<List<T>>(jsonFile) ?? new List<T>();
-            }
-            catch (IOException)
-            {
+                return _jsonSerializer.DeserializeFromFile<List<T>>(path);
             }
             catch (Exception ex)
             {
-                Logger.LogError(ex, "Error deserializing {jsonFile}", jsonFile);
+                Logger.LogError(ex, "Error deserializing {Path}", path);
             }
 
             return new List<T>();
@@ -70,12 +65,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 throw new ArgumentNullException(nameof(newList));
             }
 
-            var file = _dataPath + ".json";
-            Directory.CreateDirectory(Path.GetDirectoryName(file));
+            Directory.CreateDirectory(Path.GetDirectoryName(_dataPath));
 
             lock (_fileDataLock)
             {
-                _jsonSerializer.SerializeToFile(newList, file);
+                _jsonSerializer.SerializeToFile(newList, _dataPath);
                 _items = newList;
             }
         }
-- 
cgit v1.2.3