Merge pull request #53 from thomaslevesque/fix-missing-query-from-wor…

…kspace Fix missing query from workspace
thomaslevesque · Aug 7, 2021 · 569091a · 569091a
2 parents 359c515 + ba7f038
commit 569091a
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/pkg/CosmosDBStudio.Packaging/Package.appxmanifest b/pkg/CosmosDBStudio.Packaging/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="20269ThomasLevesque.CosmosDBStudio"
     Publisher="CN=BD404AD9-7DBE-4AD8-AD10-DF2AC49893CF"
-    Version="1.1.0.0" />
+    Version="1.1.1.0" />
 
   <Properties>
     <DisplayName>Cosmos DB Studio</DisplayName>

diff --git a/src/CosmosDBStudio/Services/IQueryPersistenceService.cs b/src/CosmosDBStudio/Services/IQueryPersistenceService.cs
@@ -5,7 +5,7 @@ namespace CosmosDBStudio.Services
 {
     public interface IQueryPersistenceService
     {
-        QuerySheet Load(string path);
+        QuerySheet? Load(string path);
         void Save(QuerySheet querySheet, string path);
         IList<string> LoadMruList();
         void SaveMruList(IList<string> mruList);

diff --git a/src/CosmosDBStudio/Services/Implementation/QueryPersistenceService.cs b/src/CosmosDBStudio/Services/Implementation/QueryPersistenceService.cs
@@ -10,10 +10,20 @@ namespace CosmosDBStudio.Services.Implementation
 {
     public class QueryPersistenceService : IQueryPersistenceService
     {
-        public QuerySheet Load(string path)
+        public QuerySheet? Load(string path)
         {
-            string json = File.ReadAllText(path);
-            return JsonConvert.DeserializeObject<QuerySheet>(json);
+            if (File.Exists(path))
+            {
+                try
+                {
+                    string json = File.ReadAllText(path);
+                    return JsonConvert.DeserializeObject<QuerySheet>(json);
+                }
+                catch (FileNotFoundException) { }
+                catch (DirectoryNotFoundException) { }
+            }
+
+            return null;
         }
 
         public IList<string> LoadMruList()
@@ -85,8 +95,13 @@ public Workspace LoadWorkspace()
             var path = Path.Combine(GetWorkspacePath(false), "workspace.json");
             if (File.Exists(path))
             {
-                string json = File.ReadAllText(path);
-                return JsonConvert.DeserializeObject<Workspace>(json);
+                try
+                {
+                    string json = File.ReadAllText(path);
+                    return JsonConvert.DeserializeObject<Workspace>(json);
+                }
+                catch (FileNotFoundException) { }
+                catch (DirectoryNotFoundException) { }
             }
 
             return new Workspace();

diff --git a/src/CosmosDBStudio/ViewModel/MainWindowViewModel.cs b/src/CosmosDBStudio/ViewModel/MainWindowViewModel.cs
@@ -206,6 +206,9 @@ private void OpenQuerySheet(string path)
             }
 
             var querySheet = _queryPersistenceService.Load(path);
+            if (querySheet is null)
+                return;
+
             var vm = _viewModelFactory.CreateQuerySheet(
                 querySheet,
                 path,
@@ -270,6 +273,8 @@ private void LoadWorkspace()
                 }
 
                 var querySheet = _queryPersistenceService.Load(path);
+                if (querySheet is null)
+                    continue;
                 var vm = _viewModelFactory.CreateQuerySheet(
                     querySheet,
                     sheet.SavedPath,