fixes and error dialog added for crunchyroll beta website

fix coustum name issue fix base url in mass download fix singele episode selection in mass download fix ConvertCC function values added error handling for unavailable hardsubs
2024-11-14 04:05:07 +01:00 · 2021-05-23 22:27:56 +02:00 · 2021-05-23 22:27:56 +02:00 · a30ef1814f
commit a30ef1814f
parent 1b00b91dca
17 changed files with 1156 additions and 152 deletions
--- a/Downloader/v15/.suo
+++ b/Downloader/v15/.suo
--- a/Downloader/v15/Server/sqlite3/storage.ide
+++ b/Downloader/v15/Server/sqlite3/storage.ide
--- a/Downloader/v15/Server/sqlite3/storage.ide-shm
+++ b/Downloader/v15/Server/sqlite3/storage.ide-shm
--- a/Downloader/v15/Server/sqlite3/storage.ide-wal
+++ b/Downloader/v15/Server/sqlite3/storage.ide-wal
--- a/Downloader/Anime_Add.vb
+++ b/Downloader/Anime_Add.vb
@ -186,7 +186,15 @@ Public Class Anime_Add
                If CBool(InStr(textBox1.Text, "crunchyroll.com")) Or CBool(InStr(textBox1.Text, "funimation.com")) Then 'Or CBool(InStr(textBox1.Text, "anime-on-demand.de")) Then

 #Region "Funimation url parameter"
-                    If InStr(textBox1.Text, "funimation.com") Then
+                    If CBool(InStr(textBox1.Text, "funimation.com")) Then
+                        Main.WebbrowserURL = textBox1.Text
+                        If CBool(InStr(Main.FunimationAPIRegion, "?region=")) And CBool(InStr(textBox1.Text, "/shows/")) Then
+
+                            ProcessFunimationJS(textBox1.Text)
+
+                            Exit Sub
+                        End If
+
                        If Main.DubFunimation = "Disabled" Then
                        Else
                            If InStr(textBox1.Text, "?lang=") Then
@ -289,7 +297,7 @@ Public Class Anime_Add
                    'MsgBox(Main.URL_Invaild, MsgBoxStyle.OkOnly)
                End If
            Catch ex As Exception
-                'MsgBox(ex.ToString)
+                MsgBox(ex.ToString)
                Main.b = True
                MsgBox(Main.URL_Invaild, MsgBoxStyle.OkOnly)
            End Try
@ -304,6 +312,19 @@ Public Class Anime_Add
                Main.b = True
                groupBox1.Visible = True
                pictureBox4.Image = My.Resources.main_button_download_default
+            ElseIf CBool(InStr(Main.WebbrowserURL, "funimation.com")) = True Then
+
+
+                StatusLabel.Text = "Status: idle"
+                pictureBox4.Image = My.Resources.add_mass_running_cancel
+                Mass_DL_Cancel = True
+                PictureBox1.Enabled = False
+                PictureBox1.Visible = False
+                Main.DownloadFunimationJS_Seasons()
+                comboBox4.Enabled = False
+                comboBox3.Enabled = False
+                ComboBox1.Enabled = False
+
            ElseIf CBool(InStr(Main.WebbrowserURL, "beta.crunchyroll.com")) = True Then

                StatusLabel.Text = "Status: idle"
@ -364,7 +385,7 @@ Public Class Anime_Add
            End If

        ElseIf GroupBox3.Visible = True Then
-                GroupBox3.Visible = False
+            GroupBox3.Visible = False
            groupBox2.Visible = False
            groupBox1.Visible = True
            List_DL_Cancel = False
@ -374,6 +395,44 @@ Public Class Anime_Add
        pictureBox4.Enabled = True
    End Sub

+    Public Sub ProcessFunimationJS(ByVal InputURL As String)
+
+
+        Dim FunUri As String = Nothing
+        If InStr(InputURL, "?") Then
+            Dim ClearUri As String() = InputURL.Split(New String() {"?"}, System.StringSplitOptions.RemoveEmptyEntries)
+            FunUri = ClearUri(0)
+        Else
+            FunUri = InputURL
+        End If
+        Dim ShowPath As String = Nothing
+        Dim EpisodePath As String = Nothing
+        Dim ShowPath1 As String() = FunUri.Split(New String() {"/shows/"}, System.StringSplitOptions.RemoveEmptyEntries)
+        'If InStr(ShowPath1(1), "/") Then
+        Dim ShowPath2 As String() = ShowPath1(1).Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
+
+        If ShowPath2.Count > 1 Then
+
+            ShowPath = ShowPath2(0)
+            EpisodePath = ShowPath2(1)
+        Else
+            ShowPath = ShowPath1(1)
+        End If
+        Main.FunimationShowPath = ShowPath
+        If EpisodePath = Nothing Then 'overview site
+            Main.GetFunimationJS_Seasons("https://title-api.prd.funimationsvc.com/v2/shows/" + ShowPath + Main.FunimationAPIRegion)
+
+        Else 'single episode
+
+
+        End If
+
+        Dim FunimationCC As String() = ShowPath1(0).Split(New String() {"funimation.com"}, System.StringSplitOptions.RemoveEmptyEntries)
+        If FunimationCC.Count > 1 Then
+            Main.FunimationRegion = FunimationCC(1).Replace("/", "")
+        End If
+    End Sub
+
    Public Sub ProcessAoD()

        AoD_DubList.Clear()
@ -531,11 +590,13 @@ Public Class Anime_Add
            comboBox4.Items.Clear()
            comboBox3.Enabled = True
            comboBox4.Enabled = True
+            comboBox3.Text = Nothing
+            comboBox4.Text = Nothing
            Dim SeasonSplit() As String = Main.CrBetaMass.Split(New String() {Chr(34) + "id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)

            Dim SeasonSplit2() As String = SeasonSplit(ComboBox1.SelectedIndex + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)

-            Dim EpisodeJsonURL As String = "https://beta-api.crunchyroll.com/cms/v2/DE/M3/crunchyroll/episodes?season_id=" + SeasonSplit2(0) + "&locale=" + Main.CrBetaMassParameters
+            Dim EpisodeJsonURL As String = Main.CrBetaMassBaseURL + "episodes?season_id=" + SeasonSplit2(0) + "&locale=" + Main.CrBetaMassParameters
            Dim EpisodeJson As String = Nothing
            Debug.WriteLine(EpisodeJsonURL)

@ -553,14 +614,70 @@ Public Class Anime_Add



+            Dim EpisodeNameSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "title" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+

            Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episode" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+            For i As Integer = 1 To EpisodeSplit.Count - 1
+                Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+                Dim EpisodeNameSplit2() As String = EpisodeNameSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+                If EpisodeSplit(i).Substring(0, 1) = Chr(34) Then
+                    comboBox3.Items.Add(EpisodeNameSplit2(0))
+                    comboBox4.Items.Add(EpisodeNameSplit2(0))
+                Else
+                    comboBox3.Items.Add("Episode " + EpisodeSplit2(0))
+                    comboBox4.Items.Add("Episode " + EpisodeSplit2(0))
+                End If
+
+            Next
+        ElseIf main.WebbrowserURL = "funimation.com/js" Then
+
+            'MsgBox(Main.FunimtaionAPISeasonID.Item(ComboBox1.SelectedIndex))
+
+            comboBox3.Items.Clear()
+            comboBox4.Items.Clear()
+            comboBox3.Enabled = True
+            comboBox4.Enabled = True
+            comboBox3.Text = Nothing
+            comboBox4.Text = Nothing
+
+            'Dim SeasonSplit() As String = Main.CrBetaMass.Split(New String() {Chr(34) + "id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+            'Dim SeasonSplit2() As String = SeasonSplit(ComboBox1.SelectedIndex + 1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+            '
+            'https://title-api.prd.funimationsvc.com/v1/seasons/1007609?region=US&deviceType=web
+
+
+            Dim EpisodeJsonURL As String = "https://title-api.prd.funimationsvc.com/v1/seasons/" + Main.FunimtaionAPISeasonID.Item(ComboBox1.SelectedIndex) + Main.FunimationAPIRegion
+            Dim EpisodeJson As String = Nothing
+            Debug.WriteLine(EpisodeJsonURL)
+
+            Try
+                Using client As New WebClient()
+                    client.Encoding = System.Text.Encoding.UTF8
+                    client.Headers.Add(My.Resources.ffmpeg_user_agend.Replace(Chr(34), ""))
+                    EpisodeJson = client.DownloadString(EpisodeJsonURL)
+                End Using
+            Catch ex As Exception
+                Debug.WriteLine("error- getting EpisodeJson data")
+                Exit Sub
+            End Try
+
+            Main.FunimationEpisodeJSON = EpisodeJson
+
+
+
+
+            Dim EpisodeSplit() As String = EpisodeJson.Split(New String() {Chr(34) + "episodeNumber" + Chr(34) + ": " + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
            For i As Integer = 1 To EpisodeSplit.Count - 1
                Dim EpisodeSplit2() As String = EpisodeSplit(i).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
                comboBox3.Items.Add("Episode " + EpisodeSplit2(0))
                comboBox4.Items.Add("Episode " + EpisodeSplit2(0))
            Next

+
+
+
        ElseIf AoD_Mode = False Then

            'MsgBox(Main.WebbrowserURL)
@ -1406,4 +1523,6 @@ Public Class Anime_Add
            Main.SubsOnly = True
        End If
    End Sub
+
+
 End Class
--- a/Downloader/ErrorDialog.vb
+++ b/Downloader/ErrorDialog.vb
@ -27,6 +27,21 @@ Public Class ErrorDialog
                ComboBox1.Items.Add(langsplit(0))
            Next
            SurroundingSub()
+        ElseIf Main.DialogTaskString = "Language_CR_Beta" Then
+            'CheckBox1.Visible = False
+            StatusLabel.Text = Main.LabelLangNotFoundText
+
+            Dim lang_avalibe As String() = Main.ResoNotFoundString.Split(New String() {"hardsub_locale" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+
+            For i As Integer = 1 To lang_avalibe.Count - 1
+                If lang_avalibe(i).Substring(0, 1) = Chr(34) Then
+                    ComboBox1.Items.Add("No Hardsubs")
+                    Continue For 'Chr(34) +
+                End If
+                Dim langsplit As String() = lang_avalibe(i).Split(New String() {Chr(34) + ","}, System.StringSplitOptions.RemoveEmptyEntries)
+                ComboBox1.Items.Add(Main.HardSubValuesToDisplay(langsplit(0)))
+            Next
+            SurroundingSub()
        ElseIf Main.DialogTaskString = "Resolution" Then
            StatusLabel.Text = Main.LabelResoNotFoundText
            Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
@ -126,12 +141,49 @@ Public Class ErrorDialog
    Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click
        If ComboBox1.SelectedItem.ToString = Nothing Then
        Else
-            Main.ResoBackString = ComboBox1.SelectedItem.ToString
-            Main.UserCloseDialog = False
-            Me.Close()
+            If Main.DialogTaskString = "Language_CR_Beta" Then
+                Main.ResoBackString = DisplayToHardSubValues(ComboBox1.SelectedItem.ToString)
+                Main.UserCloseDialog = False
+                Me.Close()
+            Else
+                Main.ResoBackString = ComboBox1.SelectedItem.ToString
+                Main.UserCloseDialog = False
+                Me.Close()
+            End If
        End If
    End Sub

+    Public Function DisplayToHardSubValues(ByVal HardSub As String) As String
+        Try
+            If HardSub = "Deutsch" Then
+                Return "de-DE"
+            ElseIf HardSub = "English" Then
+                Return "en-US"
+            ElseIf HardSub = "Português (Brasil)" Then
+                Return "pt-BR"
+            ElseIf HardSub = "Español (LA)" Then
+                Return "es-LA"
+            ElseIf HardSub = "Français (France)" Then
+                Return "fr-FR"
+            ElseIf HardSub = "العربية (Arabic)" Then
+                Return "ar-ME"
+            ElseIf HardSub = "Русский (Russian)" Then
+                Return "ru-RU"
+            ElseIf HardSub = "Italiano (Italian)" Then
+                Return "it-IT"
+            ElseIf HardSub = "Español (España)" Then
+                Return "es-ES"
+            Else
+
+                Return Nothing
+            End If
+
+        Catch ex As Exception
+            Return Nothing
+        End Try
+
+    End Function
+
    Private Sub PictureBox9_MouseEnter(sender As Object, e As EventArgs) Handles PictureBox9.MouseEnter
        PictureBox9.Image = My.Resources.DialogNotFound_Submit_hover
    End Sub
--- a/Downloader/GeckoFX.vb
+++ b/Downloader/GeckoFX.vb
@ -67,7 +67,8 @@ Public Class GeckoFX
                End Try

            End If
-        ElseIf Main.LoginOnly = "US_UnBlock_Finsihed" And Main.UserBowser = False Then
+        ElseIf Main.LoginOnly = "US_UnBlock_Finsihed" Then
+            Main.LoginOnly = "ClosedAfterUS_UnBlock"
            Main.UserBowser = False
            Me.Close()
        Else
@ -438,7 +439,13 @@ Public Class GeckoFX


    Private Sub ObserveHttpModifyRequest(sender As Object, e As GeckoObserveHttpModifyRequestEventArgs) Handles WebBrowser1.ObserveHttpModifyRequest
-        Dim requesturl As String = e.Channel.Uri.ToString()
+        Dim requesturl As String = Nothing
+        Try
+            requesturl = e.Channel.Uri.ToString()
+        Catch ex As Exception
+            Exit Sub
+        End Try
+
        Dim url As New Uri(requesturl)

        If Main.BlockList.Contains(url.Host) Then
@ -469,9 +476,22 @@ Public Class GeckoFX
            End If

        End If
-        'If CBool(InStr(requesturl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(requesturl, "episodes?")) Then
-        '    Debug.WriteLine(requesturl)
-        'End If
+
+        If CBool(InStr(requesturl, "https://title-api.prd.funimationsvc.com")) And CBool(InStr(requesturl, "?region=")) Then
+            Dim parms As String() = requesturl.Split(New String() {"?region="}, System.StringSplitOptions.RemoveEmptyEntries)
+            Main.FunimationAPIRegion = "?region=" + parms(1)
+            If Main.b = False Then
+                If CBool(InStr(requesturl, "https://title-api.prd.funimationsvc.com/v1/show")) And CBool(InStr(requesturl, "/episodes/")) Then
+
+                Else
+                    MsgBox(Main.WebbrowserURL)
+                    Anime_Add.ProcessFunimationJS(Main.WebbrowserURL)
+                    Main.b = True
+                End If
+
+
+            End If
+        End If
        If ScanTrue = True Then

            If InStr(requesturl, ".m3u8") Then
--- a/Downloader/Main.resx
+++ b/Downloader/Main.resx
@ -231,12 +231,6 @@
  <data name="&gt;&gt;Btn_Browser.ZOrder" xml:space="preserve">
    <value>8</value>
  </data>
-  <data name="Link.Text" xml:space="preserve">
-    <value>Link</value>
-  </data>
-  <data name="Link.Width" type="System.Int32, mscorlib">
-    <value>818</value>
-  </data>
  <data name="ListView1.Font" type="System.Drawing.Font, System.Drawing">
    <value>Microsoft Sans Serif, 93pt</value>
  </data>
@ -267,6 +261,12 @@
  <data name="&gt;&gt;ListView1.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
+  <data name="Link.Text" xml:space="preserve">
+    <value>Link</value>
+  </data>
+  <data name="Link.Width" type="System.Int32, mscorlib">
+    <value>818</value>
+  </data>
  <data name="PictureBox5.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
    <value>Stretch</value>
  </data>
@ -378,31 +378,6 @@
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
    <value>842, 630</value>
  </data>
-  <data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>None</value>
-  </data>
-  <data name="Btn_min.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa
-        CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="Btn_min.Location" type="System.Drawing.Point, System.Drawing">
-    <value>764, 8</value>
-  </data>
-  <data name="Btn_min.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 0</value>
-  </data>
-  <data name="Btn_min.Size" type="System.Drawing.Size, System.Drawing">
-    <value>25, 25</value>
-  </data>
-  <data name="Btn_min.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>Zoom</value>
-  </data>
-  <data name="Btn_min.TabIndex" type="System.Int32, mscorlib">
-    <value>71</value>
-  </data>
  <data name="&gt;&gt;Btn_min.Name" xml:space="preserve">
    <value>Btn_min</value>
  </data>
@ -481,6 +456,43 @@
  <data name="&gt;&gt;$this.Type" xml:space="preserve">
    <value>MetroFramework.Forms.MetroForm, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
  </data>
+  <data name="Btn_min.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="Btn_min.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAhCAYAAADH97ugAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAAAd0SU1FB+QMDQ03N1b5UIAAAAApSURBVEhL7cyxCQAwDASx339pZ4EUcTC4keDa
+        CwDMqs/abpOXAGBZcgDKSBvlblfsRgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="Btn_min.Location" type="System.Drawing.Point, System.Drawing">
+    <value>764, 8</value>
+  </data>
+  <data name="Btn_min.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>0, 0, 0, 0</value>
+  </data>
+  <data name="Btn_min.Size" type="System.Drawing.Size, System.Drawing">
+    <value>25, 25</value>
+  </data>
+  <data name="Btn_min.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>Zoom</value>
+  </data>
+  <data name="Btn_min.TabIndex" type="System.Int32, mscorlib">
+    <value>71</value>
+  </data>
+  <data name="&gt;&gt;Btn_min.Name" xml:space="preserve">
+    <value>Btn_min</value>
+  </data>
+  <data name="&gt;&gt;Btn_min.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Btn_min.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;Btn_min.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
  <metadata name="BackgroundWorker1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>714, 17</value>
  </metadata>
--- a/Downloader/Main.vb
+++ b/Downloader/Main.vb
--- a/Downloader/bin/x86/Debug/Crunchyroll
+++ b/Downloader/bin/x86/Debug/Crunchyroll
--- a/Downloader/bin/x86/Debug/Crunchyroll
+++ b/Downloader/bin/x86/Debug/Crunchyroll
--- a/Downloader/einstellungen.Designer.vb
+++ b/Downloader/einstellungen.Designer.vb
@ -44,6 +44,8 @@ Partial Class Einstellungen
        Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox()
        Me.TabPage2 = New MetroFramework.Controls.MetroTabPage()
        Me.GroupBox12 = New System.Windows.Forms.GroupBox()
+        Me.KodiSupport = New MetroFramework.Controls.MetroToggle()
+        Me.MetroLink1 = New MetroFramework.Controls.MetroLink()
        Me.DD_Episode_Prefix = New MetroFramework.Controls.MetroComboBox()
        Me.DD_Season_Prefix = New MetroFramework.Controls.MetroComboBox()
        Me.CR_Filename = New MetroFramework.Controls.MetroComboBox()
@ -60,9 +62,12 @@ Partial Class Einstellungen
        Me.ListC3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListC4 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListC5 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListC6 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListC7 = New System.Windows.Forms.ToolStripMenuItem()
        Me.FFMPEG_CommandP2 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListP1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListP2 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListP3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.FFMPEG_CommandP3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit1 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit2 = New System.Windows.Forms.ToolStripMenuItem()
@ -398,10 +403,10 @@ Partial Class Einstellungen
        Me.TabPage2.HorizontalScrollbarBarColor = True
        Me.TabPage2.HorizontalScrollbarHighlightOnWheel = False
        Me.TabPage2.HorizontalScrollbarSize = 10
-        Me.TabPage2.Location = New System.Drawing.Point(4, 44)
+        Me.TabPage2.Location = New System.Drawing.Point(4, 35)
        Me.TabPage2.Name = "TabPage2"
        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(501, 452)
+        Me.TabPage2.Size = New System.Drawing.Size(501, 461)
        Me.TabPage2.TabIndex = 1
        Me.TabPage2.Text = "Output"
        Me.TabPage2.VerticalScrollbarBarColor = True
@ -412,6 +417,8 @@ Partial Class Einstellungen
        'GroupBox12
        '
        Me.GroupBox12.BackColor = System.Drawing.Color.Transparent
+        Me.GroupBox12.Controls.Add(Me.KodiSupport)
+        Me.GroupBox12.Controls.Add(Me.MetroLink1)
        Me.GroupBox12.Controls.Add(Me.DD_Episode_Prefix)
        Me.GroupBox12.Controls.Add(Me.DD_Season_Prefix)
        Me.GroupBox12.Controls.Add(Me.CR_Filename)
@ -419,11 +426,34 @@ Partial Class Einstellungen
        Me.GroupBox12.ForeColor = System.Drawing.Color.Black
        Me.GroupBox12.Location = New System.Drawing.Point(5, 11)
        Me.GroupBox12.Name = "GroupBox12"
-        Me.GroupBox12.Size = New System.Drawing.Size(490, 126)
+        Me.GroupBox12.Size = New System.Drawing.Size(490, 150)
        Me.GroupBox12.TabIndex = 53
        Me.GroupBox12.TabStop = False
        Me.GroupBox12.Text = "Filename"
        '
+        'KodiSupport
+        '
+        Me.KodiSupport.AutoSize = True
+        Me.KodiSupport.Location = New System.Drawing.Point(259, 120)
+        Me.KodiSupport.Name = "KodiSupport"
+        Me.KodiSupport.Size = New System.Drawing.Size(80, 20)
+        Me.KodiSupport.TabIndex = 38
+        Me.KodiSupport.Text = "Aus"
+        Me.KodiSupport.UseSelectable = True
+        '
+        'MetroLink1
+        '
+        Me.MetroLink1.FontSize = MetroFramework.MetroLinkSize.Medium
+        Me.MetroLink1.ForeColor = System.Drawing.Color.SteelBlue
+        Me.MetroLink1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.MetroLink1.Location = New System.Drawing.Point(97, 120)
+        Me.MetroLink1.Name = "MetroLink1"
+        Me.MetroLink1.Size = New System.Drawing.Size(145, 23)
+        Me.MetroLink1.TabIndex = 37
+        Me.MetroLink1.Text = "enable Kodi naming"
+        Me.MetroLink1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.MetroLink1.UseSelectable = True
+        '
        'DD_Episode_Prefix
        '
        Me.DD_Episode_Prefix.DropDownHeight = 250
@ -433,7 +463,7 @@ Partial Class Einstellungen
        Me.DD_Episode_Prefix.IntegralHeight = False
        Me.DD_Episode_Prefix.ItemHeight = 23
        Me.DD_Episode_Prefix.Items.AddRange(New Object() {"[default episode prefix]"})
-        Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 79)
+        Me.DD_Episode_Prefix.Location = New System.Drawing.Point(248, 70)
        Me.DD_Episode_Prefix.Name = "DD_Episode_Prefix"
        Me.DD_Episode_Prefix.Size = New System.Drawing.Size(225, 29)
        Me.DD_Episode_Prefix.TabIndex = 36
@ -448,7 +478,7 @@ Partial Class Einstellungen
        Me.DD_Season_Prefix.IntegralHeight = False
        Me.DD_Season_Prefix.ItemHeight = 23
        Me.DD_Season_Prefix.Items.AddRange(New Object() {"[default season prefix]"})
-        Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 79)
+        Me.DD_Season_Prefix.Location = New System.Drawing.Point(6, 70)
        Me.DD_Season_Prefix.Name = "DD_Season_Prefix"
        Me.DD_Season_Prefix.Size = New System.Drawing.Size(225, 29)
        Me.DD_Season_Prefix.TabIndex = 35
@ -462,7 +492,7 @@ Partial Class Einstellungen
        Me.CR_Filename.IntegralHeight = False
        Me.CR_Filename.ItemHeight = 23
        Me.CR_Filename.Items.AddRange(New Object() {"[episode number]", "[episode name]", "[episode number] [episode name]", "[episode name] [episode number]"})
-        Me.CR_Filename.Location = New System.Drawing.Point(6, 25)
+        Me.CR_Filename.Location = New System.Drawing.Point(6, 27)
        Me.CR_Filename.Name = "CR_Filename"
        Me.CR_Filename.Size = New System.Drawing.Size(467, 29)
        Me.CR_Filename.TabIndex = 34
@ -475,7 +505,7 @@ Partial Class Einstellungen
        Me.GroupBox4.Controls.Add(Me.CB_Format)
        Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GroupBox4.ForeColor = System.Drawing.Color.Black
-        Me.GroupBox4.Location = New System.Drawing.Point(5, 205)
+        Me.GroupBox4.Location = New System.Drawing.Point(5, 230)
        Me.GroupBox4.Name = "GroupBox4"
        Me.GroupBox4.Size = New System.Drawing.Size(490, 78)
        Me.GroupBox4.TabIndex = 42
@ -512,7 +542,7 @@ Partial Class Einstellungen
        Me.CheckBox1.BackColor = System.Drawing.Color.Transparent
        Me.CheckBox1.FontSize = MetroFramework.MetroCheckBoxSize.Medium
        Me.CheckBox1.ForeColor = System.Drawing.Color.Black
-        Me.CheckBox1.Location = New System.Drawing.Point(67, 295)
+        Me.CheckBox1.Location = New System.Drawing.Point(67, 320)
        Me.CheckBox1.Name = "CheckBox1"
        Me.CheckBox1.Size = New System.Drawing.Size(369, 19)
        Me.CheckBox1.TabIndex = 6
@ -526,7 +556,7 @@ Partial Class Einstellungen
        Me.GroupBox2.Enabled = False
        Me.GroupBox2.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GroupBox2.ForeColor = System.Drawing.Color.Black
-        Me.GroupBox2.Location = New System.Drawing.Point(5, 325)
+        Me.GroupBox2.Location = New System.Drawing.Point(5, 350)
        Me.GroupBox2.Name = "GroupBox2"
        Me.GroupBox2.Size = New System.Drawing.Size(490, 63)
        Me.GroupBox2.TabIndex = 40
@ -554,7 +584,7 @@ Partial Class Einstellungen
        '
        'FFMPEG_CommandP1
        '
-        Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListC1, Me.ListC2, Me.ListC3, Me.ListC4, Me.ListC5})
+        Me.FFMPEG_CommandP1.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListC1, Me.ListC2, Me.ListC3, Me.ListC4, Me.ListC5, Me.ListC6, Me.ListC7})
        Me.FFMPEG_CommandP1.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.FFMPEG_CommandP1.Name = "FFMPEG_CommandP1"
        Me.FFMPEG_CommandP1.Size = New System.Drawing.Size(64, 20)
@ -590,9 +620,21 @@ Partial Class Einstellungen
        Me.ListC5.Size = New System.Drawing.Size(174, 22)
        Me.ListC5.Text = "-c:v libx265"
        '
+        'ListC6
+        '
+        Me.ListC6.Name = "ListC6"
+        Me.ListC6.Size = New System.Drawing.Size(174, 22)
+        Me.ListC6.Text = "-c:v h264_amf"
+        '
+        'ListC7
+        '
+        Me.ListC7.Name = "ListC7"
+        Me.ListC7.Size = New System.Drawing.Size(174, 22)
+        Me.ListC7.Text = "-c:v hevc_amf"
+        '
        'FFMPEG_CommandP2
        '
-        Me.FFMPEG_CommandP2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListP1, Me.ListP2})
+        Me.FFMPEG_CommandP2.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListP1, Me.ListP2, Me.ListP3})
        Me.FFMPEG_CommandP2.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.FFMPEG_CommandP2.Name = "FFMPEG_CommandP2"
        Me.FFMPEG_CommandP2.Size = New System.Drawing.Size(86, 20)
@ -610,6 +652,12 @@ Partial Class Einstellungen
        Me.ListP2.Size = New System.Drawing.Size(148, 22)
        Me.ListP2.Text = "-preset slow"
        '
+        'ListP3
+        '
+        Me.ListP3.Name = "ListP3"
+        Me.ListP3.Size = New System.Drawing.Size(148, 22)
+        Me.ListP3.Text = "[no Preset]"
+        '
        'FFMPEG_CommandP3
        '
        Me.FFMPEG_CommandP3.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ListBit1, Me.ListBit2, Me.ListBit3, Me.ListBit4, Me.ListBit5, Me.ListBit6, Me.ListBit7})
@ -678,7 +726,7 @@ Partial Class Einstellungen
        Me.GB_Resolution.Controls.Add(Me.A1080p)
        Me.GB_Resolution.Font = New System.Drawing.Font("Arial", 9.75!)
        Me.GB_Resolution.ForeColor = System.Drawing.Color.Black
-        Me.GB_Resolution.Location = New System.Drawing.Point(5, 140)
+        Me.GB_Resolution.Location = New System.Drawing.Point(5, 165)
        Me.GB_Resolution.Name = "GB_Resolution"
        Me.GB_Resolution.Size = New System.Drawing.Size(490, 59)
        Me.GB_Resolution.TabIndex = 38
@ -763,10 +811,10 @@ Partial Class Einstellungen
        Me.TabPage1.HorizontalScrollbarBarColor = True
        Me.TabPage1.HorizontalScrollbarHighlightOnWheel = False
        Me.TabPage1.HorizontalScrollbarSize = 10
-        Me.TabPage1.Location = New System.Drawing.Point(4, 44)
+        Me.TabPage1.Location = New System.Drawing.Point(4, 35)
        Me.TabPage1.Name = "TabPage1"
        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(501, 452)
+        Me.TabPage1.Size = New System.Drawing.Size(501, 461)
        Me.TabPage1.TabIndex = 0
        Me.TabPage1.Text = "  Main"
        Me.TabPage1.VerticalScrollbar = True
@ -984,7 +1032,7 @@ Partial Class Einstellungen
        Me.TabControl1.FontWeight = MetroFramework.MetroTabControlWeight.Regular
        Me.TabControl1.Location = New System.Drawing.Point(22, 60)
        Me.TabControl1.Name = "TabControl1"
-        Me.TabControl1.SelectedIndex = 4
+        Me.TabControl1.SelectedIndex = 5
        Me.TabControl1.Size = New System.Drawing.Size(509, 500)
        Me.TabControl1.TabIndex = 38
        Me.TabControl1.UseSelectable = True
@ -998,9 +1046,9 @@ Partial Class Einstellungen
        Me.MetroTabPage1.HorizontalScrollbarBarColor = True
        Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False
        Me.MetroTabPage1.HorizontalScrollbarSize = 10
-        Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44)
+        Me.MetroTabPage1.Location = New System.Drawing.Point(4, 35)
        Me.MetroTabPage1.Name = "MetroTabPage1"
-        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 452)
+        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 461)
        Me.MetroTabPage1.TabIndex = 7
        Me.MetroTabPage1.Text = "Crunchyroll"
        Me.MetroTabPage1.VerticalScrollbarBarColor = True
@ -1018,10 +1066,10 @@ Partial Class Einstellungen
        Me.TabPage6.HorizontalScrollbarBarColor = True
        Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
        Me.TabPage6.HorizontalScrollbarSize = 10
-        Me.TabPage6.Location = New System.Drawing.Point(4, 44)
+        Me.TabPage6.Location = New System.Drawing.Point(4, 35)
        Me.TabPage6.Name = "TabPage6"
        Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage6.Size = New System.Drawing.Size(501, 452)
+        Me.TabPage6.Size = New System.Drawing.Size(501, 461)
        Me.TabPage6.TabIndex = 4
        Me.TabPage6.Text = "Funimation"
        Me.TabPage6.VerticalScrollbarBarColor = True
@ -1217,9 +1265,9 @@ Partial Class Einstellungen
        '
        Me.TabPage8.BackColor = System.Drawing.Color.Transparent
        Me.TabPage8.Controls.Add(Me.GroupBox8)
-        Me.TabPage8.Location = New System.Drawing.Point(4, 44)
+        Me.TabPage8.Location = New System.Drawing.Point(4, 35)
        Me.TabPage8.Name = "TabPage8"
-        Me.TabPage8.Size = New System.Drawing.Size(501, 452)
+        Me.TabPage8.Size = New System.Drawing.Size(501, 461)
        Me.TabPage8.TabIndex = 6
        Me.TabPage8.Text = "  AoD"
        '
@ -1289,9 +1337,9 @@ Partial Class Einstellungen
        Me.TabPage7.Controls.Add(Me.Label4)
        Me.TabPage7.Controls.Add(Me.Label6)
        Me.TabPage7.Controls.Add(Me.Label5)
-        Me.TabPage7.Location = New System.Drawing.Point(4, 35)
+        Me.TabPage7.Location = New System.Drawing.Point(4, 44)
        Me.TabPage7.Name = "TabPage7"
-        Me.TabPage7.Size = New System.Drawing.Size(493, 461)
+        Me.TabPage7.Size = New System.Drawing.Size(501, 452)
        Me.TabPage7.TabIndex = 5
        Me.TabPage7.Text = "About   "
        '
@ -1435,6 +1483,7 @@ Partial Class Einstellungen
        Me.TabPage2.ResumeLayout(False)
        Me.TabPage2.PerformLayout()
        Me.GroupBox12.ResumeLayout(False)
+        Me.GroupBox12.PerformLayout()
        Me.GroupBox4.ResumeLayout(False)
        Me.GroupBox4.PerformLayout()
        Me.GroupBox2.ResumeLayout(False)
@ -1578,4 +1627,9 @@ Partial Class Einstellungen
    Friend WithEvents CB_Format As MetroFramework.Controls.MetroComboBox
    Friend WithEvents HybridMode_CB As MetroFramework.Controls.MetroCheckBox
    Friend WithEvents MetroTabPage1 As MetroFramework.Controls.MetroTabPage
+    Friend WithEvents ListC6 As ToolStripMenuItem
+    Friend WithEvents ListC7 As ToolStripMenuItem
+    Friend WithEvents ListP3 As ToolStripMenuItem
+    Friend WithEvents KodiSupport As MetroFramework.Controls.MetroToggle
+    Friend WithEvents MetroLink1 As MetroFramework.Controls.MetroLink
 End Class
--- a/Downloader/einstellungen.resx
+++ b/Downloader/einstellungen.resx
@ -126,9 +126,6 @@
  <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
@ -13,10 +13,11 @@ Public Class Einstellungen
    Inherits MetroForm

    Dim Manager As MetroStyleManager = Main.Manager
+    Dim LastVersionString As String = "v3.8-Beta"

    Private Sub Einstellungen_Load(sender As Object, e As EventArgs) Handles MyBase.Load

-        Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Beta-U3"
+        Label6.Text = "You have: v" + Application.ProductVersion.ToString + " Beta-U6"
        BackgroundWorker1.RunWorkerAsync()


@ -27,6 +28,9 @@ Public Class Einstellungen

        Manager.Owner = Me
        Me.StyleManager = Manager
+        If Main.KodiNaming = True Then
+            KodiSupport.Checked = True
+        End If

        If Main.DarkModeValue = True Then
            DarkMode.Checked = True
@ -230,7 +234,23 @@ Public Class Einstellungen
        If InStr(Main.ffmpeg_command, "-c copy") Then
            FFMPEG_CommandP1.Text = "-c copy"
            FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc"
+        ElseIf InStr(Main.ffmpeg_command, "-c:a copy ") Then
+            Dim ffmpegDisplayCurrent As String() = Main.ffmpeg_command.Split(New String() {" "}, System.StringSplitOptions.RemoveEmptyEntries)
+            If ffmpegDisplayCurrent.Count > 8 Then
+                FFMPEG_CommandP1.Text = ffmpegDisplayCurrent(0) + " " + ffmpegDisplayCurrent(1)
+                FFMPEG_CommandP2.Text = ffmpegDisplayCurrent(2) + " " + ffmpegDisplayCurrent(3)
+                FFMPEG_CommandP3.Text = ffmpegDisplayCurrent(4) + " " + ffmpegDisplayCurrent(5)
+                FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc"
+            Else
+                FFMPEG_CommandP1.Text = ffmpegDisplayCurrent(0) + " " + ffmpegDisplayCurrent(1)
+                FFMPEG_CommandP2.Text = "[no Preset]"
+                FFMPEG_CommandP3.Text = ffmpegDisplayCurrent(2) + " " + ffmpegDisplayCurrent(3)
+                FFMPEG_CommandP4.Text = "-c:a copy -bsf:a aac_adtstoasc"
+            End If
+
+
        Else
+
            Dim ffmpegDisplayCurrent As String() = Main.ffmpeg_command.Split(New String() {" "}, System.StringSplitOptions.RemoveEmptyEntries)
            FFMPEG_CommandP1.Text = ffmpegDisplayCurrent(0) + " " + ffmpegDisplayCurrent(1)
            FFMPEG_CommandP2.Text = ffmpegDisplayCurrent(2) + " " + ffmpegDisplayCurrent(3)
@ -322,6 +342,13 @@ Public Class Einstellungen

        End If

+        If KodiSupport.Checked = True Then
+            Main.KodiNaming = True
+            rk.SetValue("KodiSupport", 1, RegistryValueKind.String)
+        Else
+            Main.KodiNaming = False
+            rk.SetValue("KodiSupport", 0, RegistryValueKind.String)
+        End If

        '  MsgBox(Name_season.Text)
        If InStr(TextBox1.Text, "https://") Then
@ -599,6 +626,9 @@ Public Class Einstellungen
            Dim ffpmeg_cmd As String = Nothing
            If FFMPEG_CommandP1.Text = "-c copy" Then
                ffpmeg_cmd = " " + FFMPEG_CommandP1.Text + " " + FFMPEG_CommandP4.Text
+            ElseIf FFMPEG_CommandP2.Text = "[no Preset]" Then
+
+                ffpmeg_cmd = " " + FFMPEG_CommandP1.Text + " " + FFMPEG_CommandP3.Text + " " + FFMPEG_CommandP4.Text
            Else

                ffpmeg_cmd = " " + FFMPEG_CommandP1.Text + " " + FFMPEG_CommandP2.Text + " " + FFMPEG_CommandP3.Text + " " + FFMPEG_CommandP4.Text
@ -798,7 +828,7 @@ Public Class Einstellungen
        End If
    End Sub

-    Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles ListC1.Click, ListC2.Click, ListC3.Click, ListC4.Click, ListC5.Click
+    Private Sub ListC1_Click(sender As Object, e As EventArgs) Handles ListC1.Click, ListC2.Click, ListC3.Click, ListC4.Click, ListC5.Click, ListC6.Click, ListC7.Click
        Dim Button As ToolStripMenuItem = sender
        If Button.Text = "-c copy" Then
            FFMPEG_CommandP1.Text = "-c copy"
@ -812,7 +842,7 @@ Public Class Einstellungen

    End Sub

-    Private Sub ListP1_Click(sender As Object, e As EventArgs) Handles ListP1.Click, ListP2.Click
+    Private Sub ListP1_Click(sender As Object, e As EventArgs) Handles ListP1.Click, ListP2.Click, ListP3.Click
        Dim Button As ToolStripMenuItem = sender
        FFMPEG_CommandP2.Text = Button.Text
        FFMPEG_CommandP2.Enabled = True
@ -932,10 +962,9 @@ Public Class Einstellungen
            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)

-            Me.Invoke(New Action(Function()
-                                     LastVersion.Text = "last release: " + GitHubLastTag1(0)
-                                     Return Nothing
-                                 End Function))
+            LastVersionString = GitHubLastTag1(0)
+
+            'Debug.WriteLine(GitHubLastTag1(0))

        Catch ex As Exception
            Debug.WriteLine(ex.ToString)
@ -1110,6 +1139,19 @@ Public Class Einstellungen
        End If
    End Sub

+    Private Sub MetroLink1_Click(sender As Object, e As EventArgs) Handles MetroLink1.Click
+        Process.Start("https://github.com/hama3254/Crunchyroll-Downloader-v3.0/discussions/276")
+    End Sub
+
+
+    Private Sub TabPage7_Enter(sender As Object, e As EventArgs) Handles TabPage7.Enter
+        LastVersion.Text = "last release: " + LastVersionString
+    End Sub
+
+
+
+
+
 #End Region


--- a/Downloader/obj/x86/Debug/Crunchyroll
+++ b/Downloader/obj/x86/Debug/Crunchyroll
--- a/Downloader/obj/x86/Debug/Crunchyroll
+++ b/Downloader/obj/x86/Debug/Crunchyroll
--- a/Downloader.vbproj.GenerateResource.cache
+++ b/Downloader.vbproj.GenerateResource.cache