fix cache threads not being calculated correctly;

rename cacheview;

Author: Carl Chang

ContextMenuWindow.xaml.cs

@@ -97,10 +97,10 @@ private void Menu_PreviewMouseDown(object sender, MouseButtonEventArgs e) {
                         }
                         break;
                     case nameof(B_CacheFirst):
-                        CacheHelper.CacheView(ObjectInfo.FileSystemPath, true);
+                        CacheHelper.CachePath(ObjectInfo.FileSystemPath, true);
                         break;
                     case nameof(B_CacheAll):
-                        CacheHelper.CacheView(ObjectInfo.FileSystemPath, false);
+                        CacheHelper.CachePath(ObjectInfo.FileSystemPath, false);
                         break;
                     case nameof(B_Slideshow):
                         var sldWin = new SlideshowWindow(ObjectInfo.ContainerPath);

Helpers/CacheHelper.cs

@@ -16,7 +16,7 @@ namespace ZipImageViewer
     public static class CacheHelper
     {
         /// <param name="mainWin">If not null, MainWindow will be halted before caching is finished.</param>
-        public static void CacheView(string cachePath, bool firstOnly, Window owner = null, MainWindow mainWin = null) {
+        public static void CachePath(string cachePath, bool firstOnly, Window owner = null, MainWindow mainWin = null) {
             var bw = new BlockWindow(owner) {
                 MessageTitle = GetRes("msg_Processing")
             };
@@ -112,9 +112,9 @@ void cacheObjInfo(ObjectInfo objInfo) {
             }
 
             //calculate max thread count
-            var threadCount = maxThreads > 0 ? MaxLoadThreads / 2 : maxThreads;
+            var threadCount = maxThreads > 0 ? maxThreads : MaxLoadThreads / 2;
             if (threadCount < 1) threadCount = 1;
-            //else if (threadCount > 6) threadCount = 6;
+            else if (threadCount > MaxLoadThreads) threadCount = MaxLoadThreads;
 
             //loop
             try {

MainWindow.xaml.cs

@@ -320,10 +320,10 @@ private void Sidebar_Click(object sender, MouseButtonEventArgs e) {
                     openFolderPrompt();
                     break;
                 case nameof(HY_CacheFirst):
-                    CacheHelper.CacheView(CurrentPath, true, this, this);
+                    CacheHelper.CachePath(CurrentPath, true, this, this);
                     break;
                 case nameof(HY_CacheAll):
-                    CacheHelper.CacheView(CurrentPath, false, this, this);
+                    CacheHelper.CachePath(CurrentPath, false, this, this);
                     break;
                 case nameof(HY_Options):
                     var win = new SettingsWindow(this);