Cache Filters.csv

Author: stnkl

EverythingToolbar/Helpers/FilterLoader.cs

@@ -124,6 +124,7 @@ public ObservableCollection<Filter> DefaultFilters
                 Search = "ext:3g2;3gp;3gp2;3gpp;amr;amv;asf;avi;bdmv;bik;d2v;divx;drc;dsa;dsm;dss;dsv;evo;f4v;flc;fli;flic;flv;hdmov;ifo;ivf;m1v;m2p;m2t;m2ts;m2v;m4b;m4p;m4v;mkv;mp2v;mp4;mp4v;mpe;mpeg;mpg;mpls;mpv2;mpv4;mov;mts;ogm;ogv;pss;pva;qt;ram;ratdvd;rm;rmm;rmvb;roq;rpm;smil;smk;swf;tp;tpr;ts;vob;vp6;webm;wm;wmp;wmv"
             }
         };
+        private ObservableCollection<Filter> userFiltersCache;
         public ObservableCollection<Filter> UserFilters
         { 
             get
@@ -136,7 +137,7 @@ public ObservableCollection<Filter> UserFilters
                 {
                     if (Properties.Settings.Default.isImportFilters)
                     {
-                        return LoadFilters();
+                        return userFiltersCache ?? LoadFilters();
                     }
                     else
                     {
@@ -177,13 +178,13 @@ private void OnPropertyChanged(object sender, System.ComponentModel.PropertyChan
                 RefreshFilters();
         }
 
-        void RefreshFilters()
+        private void RefreshFilters()
         {
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("DefaultFilters"));
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("UserFilters"));
         }
 
-        ObservableCollection<Filter> LoadFilters()
+        private ObservableCollection<Filter> LoadFilters()
         {
             var filters = new ObservableCollection<Filter>();
 
@@ -265,10 +266,11 @@ ObservableCollection<Filter> LoadFilters()
                 return DefaultUserFilters;
             }
 
+            userFiltersCache = filters;
             return filters;
         }
 
-        public void CreateFileWatcher()
+        private void CreateFileWatcher()
         {
             if (!File.Exists(Properties.Settings.Default.filtersPath))
                 return;
@@ -290,11 +292,13 @@ public void CreateFileWatcher()
 
         private void OnFileRenamed(object sender, RenamedEventArgs e)
         {
+            LoadFilters();
             RefreshFilters();
         }
 
         private void OnFileChanged(object source, FileSystemEventArgs e)
         {
+            LoadFilters();
             RefreshFilters();
         }
     }