re-factored some file system access

1 files changed, 15 insertions, 13 deletions

diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
index a0acd523e..bead1360b 100644
--- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs
@@ -471,20 +471,18 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         /// <summary>
         /// Gets the critic reviews path.
         /// </summary>
-        /// <value>The critic reviews path.</value>
-        private string CriticReviewsPath
+        /// <param name="create">if set to <c>true</c> [create].</param>
+        /// <returns>System.String.</returns>
+        private string GetCriticReviewsPath(bool create)
         {
-            get
-            {
-                var path = Path.Combine(_appPaths.DataPath, "critic-reviews");
-
-                if (!Directory.Exists(path))
-                {
-                    Directory.CreateDirectory(path);
-                }
+            var path = Path.Combine(_appPaths.DataPath, "critic-reviews");
 
-                return path;
+            if (create && !Directory.Exists(path))
+            {
+                Directory.CreateDirectory(path);
             }
+
+            return path;
         }
 
         /// <summary>
@@ -499,10 +497,14 @@ namespace MediaBrowser.Server.Implementations.Sqlite
 
                 try
                 {
-                    var path = Path.Combine(CriticReviewsPath, itemId + ".json");
+                    var path = Path.Combine(GetCriticReviewsPath(false), itemId + ".json");
 
                     return _jsonSerializer.DeserializeFromFile<List<ItemReview>>(path);
                 }
+                catch (DirectoryNotFoundException)
+                {
+                    return new List<ItemReview>();
+                }
                 catch (FileNotFoundException)
                 {
                     return new List<ItemReview>();
@@ -521,7 +523,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         {
             return Task.Run(() =>
             {
-                var path = Path.Combine(CriticReviewsPath, itemId + ".json");
+                var path = Path.Combine(GetCriticReviewsPath(true), itemId + ".json");
 
                 _jsonSerializer.SerializeToFile(criticReviews.ToList(), path);
             });