Fix Setup to .NET8

Fix genPlaylist
MaKrotos · Sep 27, 2024 · d978479 · d978479
1 parent 5f58c49
commit d978479
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 24 deletions.
diff --git a/Setup/Setup.Designer.cs b/Setup/Setup.Designer.cs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)