Multi thread count (max) now based on system CPU cores for better res…

…ource optimisation.
jamesbrindle · May 1, 2021 · 469967a · 469967a
1 parent 567f76d
commit 469967a
Show file tree

Hide file tree

Showing 12 changed files with 174 additions and 134 deletions.
diff --git a/Installer-x64/Installer-x64.vdproj b/Installer-x64/Installer-x64.vdproj
@@ -7921,15 +7921,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:YT Music Uploader"
-        "ProductCode" = "8:{CE8CD11B-4ABE-43EA-A21F-64583BEE0110}"
-        "PackageCode" = "8:{9E2EE802-DEEC-4D9B-AB7B-165FE7F53815}"
+        "ProductCode" = "8:{5E814DA8-6561-48B7-BC13-21900322E752}"
+        "PackageCode" = "8:{302D3489-0BF1-4430-9DB7-BB1307DD412A}"
         "UpgradeCode" = "8:{AB84D0C0-CDF7-4BDF-90B0-C4808DB11DAB}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.7.3"
+        "ProductVersion" = "8:1.7.4"
         "Manufacturer" = "8:JB-Net Software Solutions"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/jamesbrindle/YTMusicUploader/issues"
@@ -8435,7 +8435,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_3AB76FEAD3A849FBB271E712B0EA59C3"
             {
-            "SourcePath" = "8:..\\YTMusicUploader\\obj\\x64\\Release\\YTMusicUploader.exe"
+            "SourcePath" = "8:"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_B3B65ED76DD54A94A22A406398263B40"

diff --git a/Installer-x86/Installer.vdproj b/Installer-x86/Installer.vdproj
@@ -424,12 +424,6 @@
         "Entry"
         {
         "MsmKey" = "8:_584A3EF8A9312B206C03FABDAB0FB8B0"
-        "OwnerKey" = "8:_B008F4C78851B6D23AD62B9A42F8467D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_584A3EF8A9312B206C03FABDAB0FB8B0"
         "OwnerKey" = "8:_1E18CF264BBC6B75FF161D37F1C48D2D"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -532,12 +526,6 @@
         "Entry"
         {
         "MsmKey" = "8:_6643C9DCBC09D15C886E9C92329398E7"
-        "OwnerKey" = "8:_D515B0D880736A5A001665640BECB5E9"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_6643C9DCBC09D15C886E9C92329398E7"
         "OwnerKey" = "8:_858C89B90B894F97A8CDE5C10D88F13E"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -549,18 +537,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_6643C9DCBC09D15C886E9C92329398E7"
-        "OwnerKey" = "8:_6943824F5C90DC61356D7DFFE333FA50"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_6643C9DCBC09D15C886E9C92329398E7"
-        "OwnerKey" = "8:_6A99698D5581B3A2F2596FFC8A1DF1AD"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_68BDAF69CA5D9D51814376D760894B5F"
         "OwnerKey" = "8:_858C89B90B894F97A8CDE5C10D88F13E"
         "MsmSig" = "8:_UNDEFINED"
@@ -580,35 +556,11 @@
         "Entry"
         {
         "MsmKey" = "8:_6943824F5C90DC61356D7DFFE333FA50"
-        "OwnerKey" = "8:_43F6B54CBBC0B338097C08062FD8B5F6"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_6943824F5C90DC61356D7DFFE333FA50"
         "OwnerKey" = "8:_858C89B90B894F97A8CDE5C10D88F13E"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_6943824F5C90DC61356D7DFFE333FA50"
-        "OwnerKey" = "8:_413DADBC84E0C9195CBAB458BFCDB04D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_6943824F5C90DC61356D7DFFE333FA50"
-        "OwnerKey" = "8:_B717C575093FA5CFDBBB443804A6B9F6"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_6943824F5C90DC61356D7DFFE333FA50"
-        "OwnerKey" = "8:_B008F4C78851B6D23AD62B9A42F8467D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_6976F36A959D3A81A83964D1FA2823E0"
         "OwnerKey" = "8:_6643C9DCBC09D15C886E9C92329398E7"
         "MsmSig" = "8:_UNDEFINED"
@@ -700,12 +652,6 @@
         "Entry"
         {
         "MsmKey" = "8:_779CCA240CED2E78EB4F29BBE1F585B2"
-        "OwnerKey" = "8:_B008F4C78851B6D23AD62B9A42F8467D"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_779CCA240CED2E78EB4F29BBE1F585B2"
         "OwnerKey" = "8:_858C89B90B894F97A8CDE5C10D88F13E"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -1078,12 +1024,6 @@
         "Entry"
         {
         "MsmKey" = "8:_D515B0D880736A5A001665640BECB5E9"
-        "OwnerKey" = "8:_D1951648C2597620674D661C0A235702"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_D515B0D880736A5A001665640BECB5E9"
         "OwnerKey" = "8:_858C89B90B894F97A8CDE5C10D88F13E"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -7921,15 +7861,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:YT Music Uploader"
-        "ProductCode" = "8:{432FA7D9-D1B1-410A-9996-1E2E37F77015}"
-        "PackageCode" = "8:{F86C6A3A-40C1-4DDF-B204-E3CEA1BB48AC}"
+        "ProductCode" = "8:{9E21003F-8C91-480F-B945-383ECAE5DAA2}"
+        "PackageCode" = "8:{9D42F861-74A0-4235-B2B1-E1C1C4BBEAF3}"
         "UpgradeCode" = "8:{1E18ED3F-C210-4589-BEB4-58E2680D3C71}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.7.3"
+        "ProductVersion" = "8:1.7.4"
         "Manufacturer" = "8:JB-Net Software Solutions"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/jamesbrindle/YTMusicUploader/issues"
@@ -8435,7 +8375,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_858C89B90B894F97A8CDE5C10D88F13E"
             {
-            "SourcePath" = "8:..\\YTMusicUploader\\obj\\x86\\Release\\YTMusicUploader.exe"
+            "SourcePath" = "8:..\\YTMusicUploader\\obj\\x86\\Debug\\YTMusicUploader.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_1059907B4555471C9BCCD73D3FBBCC93"

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Automatically upload your local personal music library to YouTube Music and bulk
 &nbsp;
 &nbsp;
 
-**[Download Version 1.7.2 Installer](https://github.com/jamesbrindle/YTMusicUploader/releases/tag/v1.7.2)**
+**[Download Version 1.7.4 Installer](https://github.com/jamesbrindle/YTMusicUploader/releases/tag/v1.7.4)**
 &nbsp;
 &nbsp;
 

diff --git a/YTMusicUploader.Updater/Properties/AssemblyInfo.cs b/YTMusicUploader.Updater/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.25")]
-[assembly: AssemblyFileVersion("1.0.0.25")]
+[assembly: AssemblyVersion("1.0.0.27")]
+[assembly: AssemblyFileVersion("1.0.0.27")]
diff --git a/YTMusicUploader/App.config b/YTMusicUploader/App.config
@@ -20,8 +20,13 @@
     <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
   </system.data>
   <appSettings>
-    <add key="MultiThreadedRequests" value="true" />
-    <add key="MaxDegreesOfParallelism" value="4" />
+
+    <!--Threading now set in application. The values will be based on your system setup (CPU, Cores, RAM).
+    To override, uncomment and set the below-->
+
+    <!--<add key="MultiThreadedRequests" value="true" />-->
+    <!--<add key="MaxDegreesOfParallelism" value="4" />-->
+
     <add key="EdgeVersion" value="84.0.522.63" />
     <add key="RecheckForUploadedSongsInDays" value="30" />
     <add key="ClearLogsAfterNoOfDays" value="30" />

diff --git a/YTMusicUploader/Business/PlaylistProcessor.cs b/YTMusicUploader/Business/PlaylistProcessor.cs
@@ -181,7 +181,7 @@ public void Process(bool forceRefreshPlaylists = false)
                                             playlistFile.PlaylistItems.Add(playlistToAdd);
                                         }
                                     }
-                                });
+                                }, Global.MaxDegreesOfParallelism);
 
                                 if (MainFormAborting() || !MainForm.Settings.UploadPlaylists)
                                     return;

diff --git a/YTMusicUploader/Dialogues/ManageYTMusic.cs b/YTMusicUploader/Dialogues/ManageYTMusic.cs
@@ -454,11 +454,11 @@ private void DeleteTracksFromYouTubeMusicUnderArtists()
                                                   $"{errorMessage}",
                                                   ColourHelper.HexStringToColor("#e20000"));
                             }
-                        });
+                        }, Global.MaxDegreesOfParallelism);
                     }
 
                     ChangeChildCount(albumNode);
-                });
+                }, Global.MaxDegreesOfParallelism);
 
                 /// Remove album node if no track nodes left
                 for (int i = artistNode.Nodes.Count - 1; i >= 0; i--)
@@ -559,7 +559,7 @@ private void DeleteTracksFromYouTubeMusicUnderPlaylists()
                                               $"{errorMessage}",
                                               ColourHelper.HexStringToColor("#0d5601"));
                         }
-                    });
+                    }, Global.MaxDegreesOfParallelism);
                 }
             }