fix user agent, auto update finished

fix user agent #970 auto update finished #969
2025-04-05 05:56:55 +02:00 · 2024-05-29 22:57:59 +02:00 · 2024-05-29 22:57:59 +02:00 · 1bf1e7d89e
commit 1bf1e7d89e
parent 1b8098057a
11 changed files with 85 additions and 25 deletions
--- a/Downloader/v17/.suo
+++ b/Downloader/v17/.suo
--- a/Downloader/App.config
+++ b/Downloader/App.config
@ -162,6 +162,9 @@
   <setting name="UpdateLog" serializeAs="String">
    <value>0</value>
   </setting>
+   <setting name="UpdateMode" serializeAs="String">
+    <value>0</value>
+   </setting>
  </Crunchyroll_Downloader.My.MySettings>
 </userSettings>
 </configuration>
--- a/Downloader/CRD-Classes.vb
+++ b/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
--- a/Downloader/GetData.vb
+++ b/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



--- a/Downloader/Main.vb
+++ b/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


--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("3.23.6")>
-<Assembly: AssemblyFileVersion("3.23.6")>
+<Assembly: AssemblyVersion("3.23.7")>
+<Assembly: AssemblyFileVersion("3.23.7")>
 <Assembly: NeutralResourcesLanguage("en")>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@ -618,6 +618,18 @@ Namespace My
                Me("UpdateLog") = value
            End Set
        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("0")>  _
+        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

--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@ -143,5 +143,8 @@
    <Setting Name="UpdateLog" Type="System.String" Scope="User">
      <Value Profile="(Default)">0</Value>
    </Setting>
+    <Setting Name="UpdateMode" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
  </Settings>
 </SettingsFile>
--- a/Downloader/einstellungen.Designer.vb
+++ b/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
--- a/Downloader/einstellungen.resx
+++ b/Downloader/einstellungen.resx
@ -126,6 +126,9 @@
  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>118, 20</value>
  </metadata>
+  <metadata name="MenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>118, 20</value>
+  </metadata>
  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>332, 20</value>
  </metadata>
--- a/Downloader/einstellungen.vb
+++ b/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