From d97847967555c27ced84b6e391278e1d1f7a54bf Mon Sep 17 00:00:00 2001
From: MaKrotos <Darklider33@mail.ru>
Date: Fri, 27 Sep 2024 08:37:22 +0300
Subject: [PATCH] Fix Setup to .NET8 Fix genPlaylist

---
 Setup/Setup.Designer.cs                         | 13 +++++++------
 Setup/Setup.cs                                  | 11 +++++++----
 Setup/Setup.csproj                              |  2 +-
 Setup/Setup.resx                                |  6 +++---
 VK UI3 (Package)/Package.appxmanifest           |  2 +-
 VK UI3/Views/ModalsPages/CreatePlayList.xaml.cs |  5 +++--
 VK UI3/Views/Tasks/Task.cs                      | 16 +++++++++-------
 7 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Setup/Setup.Designer.cs b/Setup/Setup.Designer.cs
index 67c9998..9e3b784 100644
--- a/Setup/Setup.Designer.cs
+++ b/Setup/Setup.Designer.cs
@@ -71,7 +71,7 @@ private void InitializeComponent()
             label2.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             label2.AutoSize = true;
             label2.FlatStyle = FlatStyle.Flat;
-            label2.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+            label2.Font = new Font("Segoe UI", 9F, FontStyle.Bold);
             label2.Location = new Point(18, 83);
             label2.Name = "label2";
             label2.Size = new Size(121, 15);
@@ -83,8 +83,8 @@ private void InitializeComponent()
             label3.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             label3.AutoSize = true;
             label3.FlatStyle = FlatStyle.System;
-            label3.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
-            label3.Location = new Point(18, 98);
+            label3.Font = new Font("Segoe UI", 9F, FontStyle.Bold);
+            label3.Location = new Point(20, 98);
             label3.Name = "label3";
             label3.Size = new Size(118, 15);
             label3.TabIndex = 7;
@@ -95,8 +95,8 @@ private void InitializeComponent()
             label4.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             label4.AutoSize = true;
             label4.FlatStyle = FlatStyle.System;
-            label4.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
-            label4.Location = new Point(18, 149);
+            label4.Font = new Font("Segoe UI", 9F, FontStyle.Bold);
+            label4.Location = new Point(20, 149);
             label4.Name = "label4";
             label4.Size = new Size(74, 15);
             label4.TabIndex = 8;
@@ -107,7 +107,7 @@ private void InitializeComponent()
             label5.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             label5.AutoSize = true;
             label5.FlatStyle = FlatStyle.System;
-            label5.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point);
+            label5.Font = new Font("Segoe UI", 9F, FontStyle.Bold);
             label5.Location = new Point(18, 354);
             label5.Name = "label5";
             label5.Size = new Size(91, 15);
@@ -122,6 +122,7 @@ private void InitializeComponent()
             label1.Size = new Size(374, 67);
             label1.TabIndex = 5;
             label1.Text = resources.GetString("label1.Text");
+            label1.Click += label1_Click;
             // 
             // label6
             // 
diff --git a/Setup/Setup.cs b/Setup/Setup.cs
index 19a5bbc..ef050c8 100644
--- a/Setup/Setup.cs
+++ b/Setup/Setup.cs
@@ -43,7 +43,7 @@ private async void button1_Click(object sender, EventArgs e)
 
             button1.Enabled = false;
 
-            bool a= appUpdater.IsVersionInstalled(RuntimeInformation.FrameworkDescription);
+            bool a = appUpdater.IsVersionInstalled(RuntimeInformation.FrameworkDescription);
 
             if (!a)
             {
@@ -76,16 +76,19 @@ private async void button1_Click(object sender, EventArgs e)
             }
 
             appUpdater.DownloadProgressChanged += AppUpdater_DownloadProgressChanged;
-         
+
 
 
             await appUpdater.DownloadAndOpenFile();
 
-            
+
 
             //Close();
         }
 
-       
+        private void label1_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/Setup/Setup.csproj b/Setup/Setup.csproj
index e248c5a..57f2a98 100644
--- a/Setup/Setup.csproj
+++ b/Setup/Setup.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
+    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWindowsForms>true</UseWindowsForms>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/Setup/Setup.resx b/Setup/Setup.resx
index b7000fe..036df28 100644
--- a/Setup/Setup.resx
+++ b/Setup/Setup.resx
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
   <!--
-    Microsoft ResX Schema 
+    Microsoft ResX Schema
 
     Version 2.0
 
@@ -48,7 +48,7 @@
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
     value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -120,7 +120,7 @@
   <data name="label1.Text" xml:space="preserve">
     <value>Этот установщик предназначен для установки приложения VK M. 
 После его использования, приложение можно будет обновлять или переустанавливать вручную. 
-Кроме того, VK M поддерживает автоматическое обновление</value>
+Кроме того, VK M поддерживает автоматическое обновление.</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/VK UI3 (Package)/Package.appxmanifest b/VK UI3 (Package)/Package.appxmanifest
index db3e6fb..d3ee370 100644
--- a/VK UI3 (Package)/Package.appxmanifest	
+++ b/VK UI3 (Package)/Package.appxmanifest	
@@ -13,7 +13,7 @@
   <Identity
     Name="FDW.VKM"
     Publisher="CN=FDW"
-    Version="0.2.0.4" />
+    Version="0.2.0.5" />
 
   <mp:PhoneIdentity PhoneProductId="b7c1f34e-9025-4935-9d7a-7d0a632a368d" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
diff --git a/VK UI3/Views/ModalsPages/CreatePlayList.xaml.cs b/VK UI3/Views/ModalsPages/CreatePlayList.xaml.cs
index 87c93c0..cc6afdb 100644
--- a/VK UI3/Views/ModalsPages/CreatePlayList.xaml.cs	
+++ b/VK UI3/Views/ModalsPages/CreatePlayList.xaml.cs	
@@ -35,6 +35,7 @@ public CreatePlayList(AudioPlaylist audioPlaylist, bool genByPlayList = false, s
             this.Loaded += CreatePlayList_Loaded;
             this.audioPlaylist = audioPlaylist;
             this.genByPlayList = genByPlayList;
+            this.genBy = genBy;
             this.unicid = unicID;
         }
         public CreatePlayList(AudioPlaylist audioPlaylist, VkNet.Model.Attachments.Audio audio)
@@ -170,7 +171,7 @@ private async Task createGenerateAsync()
         {
             if (iVKGetAudio != null)
             {
-                new GeneratorAlbumVK(iVKGetAudio, name: Title.Text, deepGen: (int)GenValue.Value, description: Description.Text, noDiscover: HideFromSearch.IsOn, CoverPath: CoverPath).GenerateAsync();
+                new GeneratorAlbumVK(iVKGetAudio, name: Title.Text, deepGen: (int)GenValue.Value, description: Description.Text, noDiscover: HideFromSearch.IsOn, CoverPath: CoverPath, unicId: unicid).GenerateAsync();
                 
             }
             else
@@ -186,7 +187,7 @@ private async Task createGenerateAsync()
                    
 
                     if (pla != null) {
-                        new GeneratorAlbumVK(track_playlist, name: Title.Text, deepGen: 100, description: Description.Text, noDiscover: HideFromSearch.IsOn, CoverPath: CoverPath).GenerateAsync();
+                        new GeneratorAlbumVK(track_playlist, name: Title.Text, deepGen: 100, description: Description.Text, noDiscover: HideFromSearch.IsOn, CoverPath: CoverPath, unicId: unicid).GenerateAsync();
                     }
                 }
             }
diff --git a/VK UI3/Views/Tasks/Task.cs b/VK UI3/Views/Tasks/Task.cs
index 04b7305..6b8a080 100644
--- a/VK UI3/Views/Tasks/Task.cs	
+++ b/VK UI3/Views/Tasks/Task.cs	
@@ -103,15 +103,17 @@ protected TaskAction(int total, string nameTask, string taskID, string subTextTa
             this.total = total;
             this.nameTask = nameTask;
             this.taskID = taskID;
-            bool exists = tasks.Any(task => task.taskID == this.taskID);
 
-            if (exists)
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-                Cancel();
-                return;
-            }
+            if (!(taskID is null)) {
+                bool exists = tasks.Any(task => task.taskID == this.taskID);
 
+                if (exists)
+                {
+                    cancellationToken.ThrowIfCancellationRequested();
+                    Cancel();
+                    return;
+                }
+            }
             var set = SettingsTable.GetSetting("TaskALL");
             bool startAuto = set != null;
             if (!startAuto)