Explorar el Código

Merge pull request #955 from ploughpuff/avoid

Avoid exceptions due to folder and file not found
Vasily hace 6 años
padre
commit
785fa76ac6

+ 6 - 3
Emby.Server.Implementations/LiveTv/EmbyTV/ItemDataProvider.cs

@@ -43,12 +43,14 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
         {
         {
             var jsonFile = path + ".json";
             var jsonFile = path + ".json";
 
 
-            try
+            if (!File.Exists(jsonFile))
             {
             {
-                return _jsonSerializer.DeserializeFromFile<List<T>>(jsonFile) ?? new List<T>();
+                return new List<T>();
             }
             }
-            catch (FileNotFoundException)
+
+            try
             {
             {
+                return _jsonSerializer.DeserializeFromFile<List<T>>(jsonFile) ?? new List<T>();
             }
             }
             catch (IOException)
             catch (IOException)
             {
             {
@@ -57,6 +59,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
             {
             {
                 Logger.LogError(ex, "Error deserializing {jsonFile}", jsonFile);
                 Logger.LogError(ex, "Error deserializing {jsonFile}", jsonFile);
             }
             }
+
             return new List<T>();
             return new List<T>();
         }
         }
 
 

+ 1 - 1
MediaBrowser.Api/ApiEntryPoint.cs

@@ -170,7 +170,7 @@ namespace MediaBrowser.Api
         /// </summary>
         /// </summary>
         private void DeleteEncodedMediaCache()
         private void DeleteEncodedMediaCache()
         {
         {
-            var path = _config.ApplicationPaths.TranscodingTempPath;
+            var path = _config.ApplicationPaths.GetTranscodingTempPath();
 
 
             foreach (var file in _fileSystem.GetFilePaths(path, true))
             foreach (var file in _fileSystem.GetFilePaths(path, true))
             {
             {