diff --git a/.vs/Crunchyroll Downloader/v17/.suo b/.vs/Crunchyroll Downloader/v17/.suo index 91ffdf9..4a4dd8a 100644 Binary files a/.vs/Crunchyroll Downloader/v17/.suo and b/.vs/Crunchyroll Downloader/v17/.suo differ diff --git a/Crunchyroll Downloader/App.config b/Crunchyroll Downloader/App.config index 8fd0d53..5756e9d 100644 --- a/Crunchyroll Downloader/App.config +++ b/Crunchyroll Downloader/App.config @@ -162,6 +162,9 @@ 0 + + 0 + diff --git a/Crunchyroll Downloader/CRD-Classes.vb b/Crunchyroll Downloader/CRD-Classes.vb index 5484cee..9aabdb9 100644 --- a/Crunchyroll Downloader/CRD-Classes.vb +++ b/Crunchyroll Downloader/CRD-Classes.vb @@ -6,6 +6,13 @@ SubsOnly = 2 AudioOnly = 3 End Enum + Public Enum UpdateScope + Skip = 0 + Info = 1 + InfoPre = 2 + Auto = 3 + Pre = 4 + End Enum Public Enum ConvertSubsEnum DisplayText = 0 diff --git a/Crunchyroll Downloader/GetData.vb b/Crunchyroll Downloader/GetData.vb index 65d1d81..7db43df 100644 --- a/Crunchyroll Downloader/GetData.vb +++ b/Crunchyroll Downloader/GetData.vb @@ -207,7 +207,7 @@ Module GetData End Function - Public Function CurlDeleteNew(ByVal Url As String, ByVal Auth As String, Optional ByVal UserAgent As String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0") As String + Public Function CurlDeleteNew(ByVal Url As String, ByVal Auth As String, Optional ByVal UserAgent As String = Chr(34) + "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:126.0) Gecko/20100101 Firefox/126.0" + Chr(34)) As String diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index c9fce72..fb9f582 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -1982,7 +1982,8 @@ Public Class Main 'MsgBox(ex.ToString) Else - MsgBox(ex.ToString, MsgBoxStyle.Information) + Error_msg.ShowErrorDia(ex.ToString, "Unknown Error - See details", False) + 'MsgBox(ex.ToString, MsgBoxStyle.Information) End If End Try ' End Sub @@ -3278,6 +3279,9 @@ Public Class Main Private Sub BGW_Update_DoWork(sender As Object, e As DoWorkEventArgs) Handles BGW_Update.DoWork Try + If My.Settings.UpdateMode = UpdateScope.Skip Then + Exit Sub + End If Dim client0 As New WebClient client0.Encoding = Encoding.UTF8 @@ -3286,19 +3290,23 @@ Public Class Main Dim str0 As String = client0.DownloadString("https://api.github.com/repos/hama3254/Crunchyroll-Downloader-v3.0/releases") Dim GitHubLastIsPre() As String = str0.Split(New String() {Chr(34) + "prerelease" + Chr(34) + ": "}, System.StringSplitOptions.RemoveEmptyEntries) - Dim LastNonPreRelase As Integer = 0 + Dim LastRelase As Integer = 0 + Dim PreRelease As Boolean = False For i As Integer = 1 To GitHubLastIsPre.Count - 1 Dim GitHubLastIsPre1() As String = GitHubLastIsPre(i).Split(New String() {","}, System.StringSplitOptions.RemoveEmptyEntries) - 'If GitHubLastIsPre1(0) = "false" Then - LastNonPreRelase = i - Exit For - 'End If + If GitHubLastIsPre1(0) = "false" Or My.Settings.UpdateMode = UpdateScope.Pre Or My.Settings.UpdateMode = UpdateScope.InfoPre Then + If GitHubLastIsPre1(0) = "true" Then + PreRelease = True + End If + LastRelase = i + Exit For + End If Next Dim GitHubLastTag() As String = str0.Split(New String() {Chr(34) + "tag_name" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) - Dim GitHubLastTag1() As String = GitHubLastTag(LastNonPreRelase).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) + Dim GitHubLastTag1() As String = GitHubLastTag(LastRelase).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries) 'LastVersionString = GitHubLastTag1(0) 'MsgBox(GitHubLastTag1(0)) @@ -3331,6 +3339,20 @@ Public Class Main If UpdateAv = False Then 'no update needed Debug.WriteLine("Update check passed") Exit Sub + ElseIf UpdateAv = True Then + If My.Settings.UpdateMode = UpdateScope.Info Or My.Settings.UpdateMode = UpdateScope.InfoPre Then 'Infos only + Dim DisplayTest As String = "Update available: v" + If PreRelease = True Then + DisplayTest = "PreRelease available: v" + End If + Me.Invoke(New Action(Function() As Object + Me.Text = DisplayTest + OnlineVersionNumber + Me.Invalidate() + Return Nothing + End Function)) + + Exit Sub + End If End If Debug.WriteLine("Update check failed") 'Check for updated file @@ -3368,12 +3390,12 @@ Public Class Main End If My.Settings.UpdateLog = Date.Now.Day.ToString + Date.Now.Month.ToString - My.Computer.FileSystem.RenameFile(Application.StartupPath + "\Auto_Updated.exe", GeräteID() + ".exe") + My.Computer.FileSystem.RenameFile(Application.StartupPath + "\Auto_Updated.exe", GeräteID() + ".exe") 'getting rid of the old version like its a temp file End If - If CBool(InStr(str0, "Auto_Update_" + GitHubLastTag1(0) + ".exe")) Then + If CBool(InStr(str0, "Auto_Update_" + GitHubLastTag1(0) + ".exe")) Then ' check if i even upoaded the autoupdate Debug.WriteLine(True.ToString) Dim UpdateUrl() As String = str0.Split(New String() {"Auto_Update_" + GitHubLastTag1(0) + ".exe"}, System.StringSplitOptions.RemoveEmptyEntries) Dim UpdateUrl2() As String = UpdateUrl(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries) @@ -3403,6 +3425,12 @@ Public Class Main Me.Close() Return Nothing End Function)) + Else + Me.Invoke(New Action(Function() As Object + Me.Text = "No Auto-Update possible" + Me.Invalidate() + Return Nothing + End Function)) End If diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 7e1ae6c..c3022bf 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/My Project/Settings.Designer.vb b/Crunchyroll Downloader/My Project/Settings.Designer.vb index 0eb4ba1..6ad4209 100644 --- a/Crunchyroll Downloader/My Project/Settings.Designer.vb +++ b/Crunchyroll Downloader/My Project/Settings.Designer.vb @@ -618,6 +618,18 @@ Namespace My Me("UpdateLog") = value End Set End Property + + _ + Public Property UpdateMode() As Integer + Get + Return CType(Me("UpdateMode"),Integer) + End Get + Set + Me("UpdateMode") = value + End Set + End Property End Class End Namespace diff --git a/Crunchyroll Downloader/My Project/Settings.settings b/Crunchyroll Downloader/My Project/Settings.settings index f91839f..aa33416 100644 --- a/Crunchyroll Downloader/My Project/Settings.settings +++ b/Crunchyroll Downloader/My Project/Settings.settings @@ -143,5 +143,8 @@ 0 + + 0 + \ No newline at end of file diff --git a/Crunchyroll Downloader/einstellungen.Designer.vb b/Crunchyroll Downloader/einstellungen.Designer.vb index 0633f6b..b84c20f 100644 --- a/Crunchyroll Downloader/einstellungen.Designer.vb +++ b/Crunchyroll Downloader/einstellungen.Designer.vb @@ -142,7 +142,7 @@ Partial Class Einstellungen Me.Label5 = New MetroFramework.Controls.MetroLabel() Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker() Me.Btn_Save = New System.Windows.Forms.Button() - Me.CB_Update_Pre = New MetroFramework.Controls.MetroCheckBox() + Me.DD_Update = New MetroFramework.Controls.MetroComboBox() CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox14.SuspendLayout() Me.SoftSubs.SuspendLayout() @@ -949,9 +949,9 @@ Partial Class Einstellungen 'GroupBox5 ' Me.GroupBox5.BackColor = System.Drawing.Color.Transparent + Me.GroupBox5.Controls.Add(Me.DD_Update) Me.GroupBox5.Controls.Add(Me.Chb_Ign_tls) Me.GroupBox5.Controls.Add(Me.http_support) - Me.GroupBox5.Controls.Add(Me.CB_Update_Pre) Me.GroupBox5.Controls.Add(Me.DarkMode) Me.GroupBox5.Font = New System.Drawing.Font("Arial", 9.75!) Me.GroupBox5.ForeColor = System.Drawing.Color.Black @@ -1597,16 +1597,19 @@ Partial Class Einstellungen Me.Btn_Save.TabIndex = 9 Me.Btn_Save.UseVisualStyleBackColor = False ' - 'CB_Update_Pre + 'DD_Update ' - Me.CB_Update_Pre.AutoSize = True - Me.CB_Update_Pre.FontSize = MetroFramework.MetroCheckBoxSize.Medium - Me.CB_Update_Pre.Location = New System.Drawing.Point(39, 90) - Me.CB_Update_Pre.Name = "CB_Update_Pre" - Me.CB_Update_Pre.Size = New System.Drawing.Size(176, 19) - Me.CB_Update_Pre.TabIndex = 5 - Me.CB_Update_Pre.Text = "Pre-Release Notifications" - Me.CB_Update_Pre.UseSelectable = True + Me.DD_Update.DropDownHeight = 275 + Me.DD_Update.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.DD_Update.FormattingEnabled = True + Me.DD_Update.IntegralHeight = False + Me.DD_Update.ItemHeight = 23 + Me.DD_Update.Items.AddRange(New Object() {"Skip Updates", "Notify Only", "Notify Only (Beta Versions)", "Automatic Updates", "Automatic Updates (Beta Versions)"}) + Me.DD_Update.Location = New System.Drawing.Point(21, 90) + Me.DD_Update.Name = "DD_Update" + Me.DD_Update.Size = New System.Drawing.Size(215, 29) + Me.DD_Update.TabIndex = 47 + Me.DD_Update.UseSelectable = True ' 'Einstellungen ' @@ -1792,5 +1795,5 @@ Partial Class Einstellungen Friend WithEvents CB_vttStyle As MetroFramework.Controls.MetroCheckBox Friend WithEvents AMD_AV1 As ToolStripMenuItem Friend WithEvents CB_HideQueue As MetroFramework.Controls.MetroCheckBox - Friend WithEvents CB_Update_Pre As MetroFramework.Controls.MetroCheckBox + Friend WithEvents DD_Update As MetroFramework.Controls.MetroComboBox End Class diff --git a/Crunchyroll Downloader/einstellungen.resx b/Crunchyroll Downloader/einstellungen.resx index e809bf5..f49b9b4 100644 --- a/Crunchyroll Downloader/einstellungen.resx +++ b/Crunchyroll Downloader/einstellungen.resx @@ -126,6 +126,9 @@ 118, 20 + + 118, 20 + 332, 20 diff --git a/Crunchyroll Downloader/einstellungen.vb b/Crunchyroll Downloader/einstellungen.vb index d9cc70d..58af3a4 100644 --- a/Crunchyroll Downloader/einstellungen.vb +++ b/Crunchyroll Downloader/einstellungen.vb @@ -26,7 +26,7 @@ Public Class Einstellungen Label6.Text = "You have: v" + Application.ProductVersion.ToString '+ " WebView2_Test" BackgroundWorker1.RunWorkerAsync() - + DD_Update.SelectedIndex = My.Settings.UpdateMode 'CR_Anime_Folge = CR_Name_Staffel0_Folge1(1) 'If GitHubLastTag1(0) @@ -298,6 +298,7 @@ Public Class Einstellungen My.Settings.LeadingZero = LeadingZeroDD.SelectedIndex My.Settings.OverrideDub = CB_OverrideDub.Checked My.Settings.Captions = CB_Cap.Checked + My.Settings.UpdateMode = DD_Update.SelectedIndex If http_support.Text = "add-on support disabled" Then My.Settings.ServerPort = 0