fix funimation download

2024-12-23 22:51:48 +01:00 · 2021-10-29 20:38:09 +02:00 · 2021-10-29 20:38:09 +02:00 · afcedabfb9
commit afcedabfb9
parent ae651736a8
18 changed files with 1423 additions and 348 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/App.config
+++ b/Downloader/App.config
@ -6,7 +6,7 @@
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <probing privatePath="lib" />
-      <dependentAssembly>
+          <dependentAssembly>
        <assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-93.1.140.0" newVersion="93.1.140.0" />
      </dependentAssembly>
@ -16,4 +16,10 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
+  <system.net>
+    <settings>
+      <httpWebRequest useUnsafeHeaderParsing = "true"/>
+    </settings>
+  </system.net>
 </configuration>
+
--- a/Downloader/CefSharp_Browser.vb
+++ b/Downloader/CefSharp_Browser.vb
@ -134,7 +134,6 @@ Public Class CefSharp_Browser

    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click

-
        Try
            My.Computer.Clipboard.SetText(WebBrowser1.Address)
            MsgBox("copied: " + Chr(34) + WebBrowser1.Address + Chr(34))
@ -247,7 +246,12 @@ Public Class CefSharp_Browser
                Exit Sub
            End If
        End If
+        '
+        If CBool(InStr(e.RequestUrl, "?deviceType=web")) Then
+            Dim parms As String() = e.RequestUrl.Split(New String() {"?deviceType="}, System.StringSplitOptions.RemoveEmptyEntries)
+            Main.FunimationDeviceRegion = "?deviceType=" + parms(1)

+        End If
        If CBool(InStr(e.RequestUrl, "https://title-api.prd.funimationsvc.com")) Then
            If (Me.InvokeRequired) Then
                Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl))
@ -266,6 +270,16 @@ Public Class CefSharp_Browser
                Exit Sub
            End If
            Debug.WriteLine(e.RequestUrl)
+        ElseIf CBool(InStr(e.RequestUrl, "/data/v1/episodes/")) Then
+            If (Me.InvokeRequired) Then
+                Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl))
+                Exit Sub
+            Else
+                Main.LoadedUrls.Add(e.RequestUrl)
+                Exit Sub
+            End If
+            Debug.WriteLine(e.RequestUrl)
+
        ElseIf CBool(InStr(e.RequestUrl, "https://beta-api.crunchyroll.com/")) And CBool(InStr(e.RequestUrl, "streams?")) Then
            If (Me.InvokeRequired) Then
                Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl))
--- a/Downloader/Main.vb
+++ b/Downloader/Main.vb
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -319,7 +319,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die &quot;User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0&quot; ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die &quot;User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36&quot; ähnelt.
        '''</summary>
        Friend ReadOnly Property ffmpeg_user_agend() As String
            Get
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -401,7 +401,7 @@ Dialogue: 0,0:00:00.00,0:00:00.00,Default,,0000,0000,0000,,some ideas on how tem
    <value>..\Resources\crdSettings_Button_SafeExit_hover.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ffmpeg_user_agend" xml:space="preserve">
-    <value>"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:87.0) Gecko/20100101 Firefox/87.0"</value>
+    <value>"User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/95.0.4638.69 Safari/537.36"</value>
  </data>
  <data name="crdSettings_Button_SafeExit" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\crdSettings_Button_SafeExit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
--- a/Downloader/bin/x64/Debug/Crunchyroll
+++ b/Downloader/bin/x64/Debug/Crunchyroll
--- a/Downloader/bin/x64/Debug/Crunchyroll
+++ b/Downloader/bin/x64/Debug/Crunchyroll
@ -6,7 +6,7 @@
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <probing privatePath="lib" />
-      <dependentAssembly>
+          <dependentAssembly>
        <assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-93.1.140.0" newVersion="93.1.140.0" />
      </dependentAssembly>
@ -16,4 +16,10 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
+  <system.net>
+    <settings>
+      <httpWebRequest useUnsafeHeaderParsing = "true"/>
+    </settings>
+  </system.net>
 </configuration>
+
--- a/Downloader/bin/x64/Debug/Crunchyroll
+++ b/Downloader/bin/x64/Debug/Crunchyroll
--- a/Downloader/einstellungen.Designer.vb
+++ b/Downloader/einstellungen.Designer.vb
@ -69,10 +69,15 @@ Partial Class Einstellungen
        Me.ListP3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.FFMPEG_CommandP3 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_7000 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListBit_6500 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_6000 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListBit_5500 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_5000 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListBit_4500 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_4000 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListBit_3500 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_3000 = New System.Windows.Forms.ToolStripMenuItem()
+        Me.ListBit_2500 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_2000 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_1500 = New System.Windows.Forms.ToolStripMenuItem()
        Me.ListBit_1000 = New System.Windows.Forms.ToolStripMenuItem()
@ -137,11 +142,6 @@ Partial Class Einstellungen
        Me.Label5 = New MetroFramework.Controls.MetroLabel()
        Me.BackgroundWorker1 = New System.ComponentModel.BackgroundWorker()
        Me.Btn_Save = New System.Windows.Forms.Button()
-        Me.ListBit_6500 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListBit_5500 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListBit_4500 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListBit_3500 = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ListBit_2500 = New System.Windows.Forms.ToolStripMenuItem()
        CType(Me.pictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.GroupBox14.SuspendLayout()
        Me.SoftSubs.SuspendLayout()
@ -666,49 +666,79 @@ Partial Class Einstellungen
        'ListBit_7000
        '
        Me.ListBit_7000.Name = "ListBit_7000"
-        Me.ListBit_7000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_7000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_7000.Text = "-b:v 7000k"
        '
+        'ListBit_6500
+        '
+        Me.ListBit_6500.Name = "ListBit_6500"
+        Me.ListBit_6500.Size = New System.Drawing.Size(136, 22)
+        Me.ListBit_6500.Text = "-b:v 6500k"
+        '
        'ListBit_6000
        '
        Me.ListBit_6000.Name = "ListBit_6000"
-        Me.ListBit_6000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_6000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_6000.Text = "-b:v 6000k"
        '
+        'ListBit_5500
+        '
+        Me.ListBit_5500.Name = "ListBit_5500"
+        Me.ListBit_5500.Size = New System.Drawing.Size(136, 22)
+        Me.ListBit_5500.Text = "-b:v 5500k"
+        '
        'ListBit_5000
        '
        Me.ListBit_5000.Name = "ListBit_5000"
-        Me.ListBit_5000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_5000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_5000.Text = "-b:v 5000k"
        '
+        'ListBit_4500
+        '
+        Me.ListBit_4500.Name = "ListBit_4500"
+        Me.ListBit_4500.Size = New System.Drawing.Size(136, 22)
+        Me.ListBit_4500.Text = "-b:v 4500k"
+        '
        'ListBit_4000
        '
        Me.ListBit_4000.Name = "ListBit_4000"
-        Me.ListBit_4000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_4000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_4000.Text = "-b:v 4000k"
        '
+        'ListBit_3500
+        '
+        Me.ListBit_3500.Name = "ListBit_3500"
+        Me.ListBit_3500.Size = New System.Drawing.Size(136, 22)
+        Me.ListBit_3500.Text = "-b:v 3500k"
+        '
        'ListBit_3000
        '
        Me.ListBit_3000.Name = "ListBit_3000"
-        Me.ListBit_3000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_3000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_3000.Text = "-b:v 3000k"
        '
+        'ListBit_2500
+        '
+        Me.ListBit_2500.Name = "ListBit_2500"
+        Me.ListBit_2500.Size = New System.Drawing.Size(136, 22)
+        Me.ListBit_2500.Text = "-b:v 2500k"
+        '
        'ListBit_2000
        '
        Me.ListBit_2000.Name = "ListBit_2000"
-        Me.ListBit_2000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_2000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_2000.Text = "-b:v 2000k"
        '
        'ListBit_1500
        '
        Me.ListBit_1500.Name = "ListBit_1500"
-        Me.ListBit_1500.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_1500.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_1500.Text = "-b:v 1500k"
        '
        'ListBit_1000
        '
        Me.ListBit_1000.Name = "ListBit_1000"
-        Me.ListBit_1000.Size = New System.Drawing.Size(196, 22)
+        Me.ListBit_1000.Size = New System.Drawing.Size(136, 22)
        Me.ListBit_1000.Text = "-b:v 1000k"
        '
        'FFMPEG_CommandP4
@ -1082,7 +1112,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 = 1
+        Me.TabControl1.SelectedIndex = 3
        Me.TabControl1.Size = New System.Drawing.Size(509, 567)
        Me.TabControl1.TabIndex = 0
        Me.TabControl1.UseSelectable = True
@ -1096,9 +1126,9 @@ Partial Class Einstellungen
        Me.MetroTabPage1.HorizontalScrollbarBarColor = True
        Me.MetroTabPage1.HorizontalScrollbarHighlightOnWheel = False
        Me.MetroTabPage1.HorizontalScrollbarSize = 10
-        Me.MetroTabPage1.Location = New System.Drawing.Point(4, 35)
+        Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44)
        Me.MetroTabPage1.Name = "MetroTabPage1"
-        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 528)
+        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519)
        Me.MetroTabPage1.TabIndex = 7
        Me.MetroTabPage1.Text = "Crunchyroll"
        Me.MetroTabPage1.VerticalScrollbarBarColor = True
@ -1144,10 +1174,10 @@ Partial Class Einstellungen
        Me.TabPage6.HorizontalScrollbarBarColor = True
        Me.TabPage6.HorizontalScrollbarHighlightOnWheel = False
        Me.TabPage6.HorizontalScrollbarSize = 10
-        Me.TabPage6.Location = New System.Drawing.Point(4, 35)
+        Me.TabPage6.Location = New System.Drawing.Point(4, 44)
        Me.TabPage6.Name = "TabPage6"
        Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage6.Size = New System.Drawing.Size(501, 528)
+        Me.TabPage6.Size = New System.Drawing.Size(501, 519)
        Me.TabPage6.TabIndex = 4
        Me.TabPage6.Text = "Funimation"
        Me.TabPage6.VerticalScrollbarBarColor = True
@ -1277,6 +1307,7 @@ Partial Class Einstellungen
        'CB_Fun_HardSubs
        '
        Me.CB_Fun_HardSubs.DropDownHeight = 250
+        Me.CB_Fun_HardSubs.Enabled = False
        Me.CB_Fun_HardSubs.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.CB_Fun_HardSubs.FormattingEnabled = True
        Me.CB_Fun_HardSubs.IntegralHeight = False
@ -1549,36 +1580,6 @@ Partial Class Einstellungen
        Me.Btn_Save.TabIndex = 9
        Me.Btn_Save.UseVisualStyleBackColor = False
        '
-        'ListBit_6500
-        '
-        Me.ListBit_6500.Name = "ListBit_6500"
-        Me.ListBit_6500.Size = New System.Drawing.Size(180, 22)
-        Me.ListBit_6500.Text = "-b:v 6500k"
-        '
-        'ListBit_5500
-        '
-        Me.ListBit_5500.Name = "ListBit_5500"
-        Me.ListBit_5500.Size = New System.Drawing.Size(180, 22)
-        Me.ListBit_5500.Text = "-b:v 5500k"
-        '
-        'ListBit_4500
-        '
-        Me.ListBit_4500.Name = "ListBit_4500"
-        Me.ListBit_4500.Size = New System.Drawing.Size(180, 22)
-        Me.ListBit_4500.Text = "-b:v 4500k"
-        '
-        'ListBit_3500
-        '
-        Me.ListBit_3500.Name = "ListBit_3500"
-        Me.ListBit_3500.Size = New System.Drawing.Size(180, 22)
-        Me.ListBit_3500.Text = "-b:v 3500k"
-        '
-        'ListBit_2500
-        '
-        Me.ListBit_2500.Name = "ListBit_2500"
-        Me.ListBit_2500.Size = New System.Drawing.Size(180, 22)
-        Me.ListBit_2500.Text = "-b:v 2500k"
-        '
        'Einstellungen
        '
        Me.ApplyImageInvert = True
--- a/Downloader/obj/x64/Debug/Crunchyroll
+++ b/Downloader/obj/x64/Debug/Crunchyroll
--- a/Downloader/obj/x64/Debug/Crunchyroll
+++ b/Downloader/obj/x64/Debug/Crunchyroll
--- a/Downloader.vbproj.GenerateResource.cache
+++ b/Downloader.vbproj.GenerateResource.cache
--- a/Downloader/obj/x64/Debug/Crunchyroll_Downloader.Resources.resources
+++ b/Downloader/obj/x64/Debug/Crunchyroll_Downloader.Resources.resources
--- a/Downloader/obj/x64/Debug/TempPE/My
+++ b/Downloader/obj/x64/Debug/TempPE/My