Avoid unnecessary calls to Storage APIs (#16)

microsoft · Apr 16, 2023 · d93dd81 · d93dd81
1 parent 2f050b3
commit d93dd81
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/GithubPlugin/DataManager/GitHubDataManager.cs b/src/GithubPlugin/DataManager/GitHubDataManager.cs
@@ -25,7 +25,7 @@ public partial class GitHubDataManager : IGitHubDataManager, IDisposable
 
     public static IGitHubDataManager? CreateInstance(DataStoreOptions? options = null)
     {
-        options ??= DefaultOptions();
+        options ??= DefaultOptions;
 
         try
         {
@@ -640,7 +640,13 @@ private void ValidateDataStore()
         }
     }
 
-    private static DataStoreOptions DefaultOptions()
+    // Making the default options a singleton to avoid repeatedly calling the storage APIs and
+    // creating a new GitHubDataStoreSchema when not necessary.
+    private static readonly Lazy<DataStoreOptions> LazyDataStoreOptions = new (DefaultOptionsInit);
+
+    private static DataStoreOptions DefaultOptions => LazyDataStoreOptions.Value;
+
+    private static DataStoreOptions DefaultOptionsInit()
     {
         return new DataStoreOptions
         {

diff --git a/src/GithubPlugin/Widgets/GithubWidget.cs b/src/GithubPlugin/Widgets/GithubWidget.cs
@@ -316,7 +316,7 @@ protected string GetTemplateForPage(WidgetPageState page)
 
         try
         {
-            var path = Path.Combine(Windows.ApplicationModel.Package.Current.InstalledLocation.Path, GetTemplatePath(page));
+            var path = Path.Combine(AppContext.BaseDirectory, GetTemplatePath(page));
             var template = File.ReadAllText(path, Encoding.Default) ?? throw new FileNotFoundException(path);
             template = Resources.ReplaceIdentifers(template, Resources.GetWidgetResourceIdentifiers(), Log.Logger());
             Log.Logger()?.ReportDebug(Name, ShortId, $"Caching template for {page}");