fix path funimation-js

fix path funimation-js

.gitignore

@@ -11,3 +11,5 @@ Crunchyroll Downloader/bin/x64/Debug/libcef.dll
 packages/cef.redist.x64.91.1.21/CEF/libcef.dll
 Crunchyroll Downloader/bin/x64/Debug/lib/libcef.dll
 Crunchyroll Downloader/bin/x64/Debug/ffmpeg.exe
+Crunchyroll Downloader/bin/x64/Crunchyroll-Downloader-Chromium/ffmpeg.exe
+packages/

Crunchyroll Downloader/Anime_Add.Designer.vb

@@ -35,10 +35,7 @@ Partial Class Anime_Add
         Me.TextBox2 = New MetroFramework.Controls.MetroTextBox()
 
         Me.textBox2 = New MetroFramework.Controls.MetroTextBox()
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
         Me.groupBox2 = New System.Windows.Forms.GroupBox()
         Me.comboBox4 = New MetroFramework.Controls.MetroComboBox()
         Me.ComboBox1 = New MetroFramework.Controls.MetroComboBox()
@@ -233,11 +230,7 @@ Partial Class Anime_Add
         Me.textBox2.UseSelectable = True
         Me.textBox2.WaterMarkColor = System.Drawing.Color.FromArgb(CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer), CType(CType(109, Byte), Integer))
         Me.textBox2.WaterMarkFont = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Pixel)
-<<<<<<< Updated upstream
 
-=======
-        '
->>>>>>> Stashed changes
         'groupBox2
         '
         Me.groupBox2.BackColor = System.Drawing.Color.Transparent
@@ -405,18 +398,12 @@ Partial Class Anime_Add
         Me.Controls.Add(Me.btn_dl)
         Me.Controls.Add(Me.Btn_min)
         Me.Controls.Add(Me.Btn_Close)
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
         Me.Controls.Add(Me.groupBox1)
         Me.Controls.Add(Me.GroupBox3)
         Me.Controls.Add(Me.groupBox2)
         Me.Font = New System.Drawing.Font("Arial", 24.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
         Me.Name = "Anime_Add"
         Me.Padding = New System.Windows.Forms.Padding(10, 60, 20, 20)
         Me.Text = "Add Video"

Crunchyroll Downloader/Anime_Add.vb

@@ -948,56 +948,21 @@ Public Class Anime_Add
             comboBox4.Enabled = True
 
             If ComboBox1.Text = "OmU" Then
-<<<<<<< Updated upstream
 
                 For i As Integer = 0 To AoD_OmU_Episodes.Count - 1
                     comboBox3.Items.Add(AoD_OmU_Episodes.Item(i).Name)
                     comboBox4.Items.Add(AoD_OmU_Episodes.Item(i).Name)
 
-=======
-                For i As Integer = 0 To AoD_OmU_Episodes.Count - 1
-                    comboBox3.Items.Add(AoD_OmU_Episodes.Item(i).Name)
-                    comboBox4.Items.Add(AoD_OmU_Episodes.Item(i).Name)
->>>>>>> Stashed changes
                 Next
 
-
-                'old
-                'For i As Integer = 0 To AoD_OmUList.Count - 1
-                '    Dim DropDownTitle As String() = AoD_OmUList(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries)
-                '    Dim DropDownTitle2 As String() = DropDownTitle(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
-                '    Dim Title As String = DropDownTitle2(0)
-                '    Title = Title.Replace("&amp;", "&").Replace("&amp", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
-                '    Title = System.Text.RegularExpressions.Regex.Replace(Title, "[^\w\\-]", " ").Trim(CType(" ", Char()))
-                '    Title = Main.RemoveExtraSpaces(Title)
-                '    comboBox3.Items.Add(Title)
-                '    comboBox4.Items.Add(Title)
-                'Next
-
             ElseIf ComboBox1.Text = "Dub" Then
 
                 For i As Integer = 0 To AoD_Dub_Episodes.Count - 1
                     comboBox3.Items.Add(AoD_Dub_Episodes.Item(i).Name)
                     comboBox4.Items.Add(AoD_Dub_Episodes.Item(i).Name)
-<<<<<<< Updated upstream
 
                 Next
 
-=======
-                Next
-
-                'old
-                'For i As Integer = 0 To AoD_DubList.Count - 1
-                '    Dim DropDownTitle As String() = AoD_DubList(i).Split(New String() {My.Resources.AoD_Titel}, System.StringSplitOptions.RemoveEmptyEntries)
-                '    Dim DropDownTitle2 As String() = DropDownTitle(1).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
-                '    Dim Title As String = DropDownTitle2(0)
-                '    Title = Title.Replace("&amp;", "&").Replace("&amp", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
-                '    Title = System.Text.RegularExpressions.Regex.Replace(Title, "[^\w\\-]", " ").Trim(CType(" ", Char()))
-                '    Title = Main.RemoveExtraSpaces(Title)
-                '    comboBox3.Items.Add(Title)
-                '    comboBox4.Items.Add(Title)
-                'Next
->>>>>>> Stashed changes
             End If
 
         End If
@@ -1465,15 +1430,10 @@ Public Class Anime_Add
 
             End Try
 
-<<<<<<< Updated upstream
 
             AoDTitle = AoDTitle.Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
             AoDTitle = System.Text.RegularExpressions.Regex.Replace(AoDTitle, "[^\w\\-]", " ").Trim(CType(" ", Char()))
 
-=======
-            AoDTitle = AoDTitle.Replace("&amp;", "&").Replace("/u0026", "&").Replace("\u002F", "/").Replace("\u0026", "&")
-            AoDTitle = System.Text.RegularExpressions.Regex.Replace(AoDTitle, "[^\w\\-]", " ").Trim(CType(" ", Char()))
->>>>>>> Stashed changes
             AoDTitle = Main.RemoveExtraSpaces(AoDTitle)
 
             Pfad2 = UseSubfolder(AoD_Anime_Title, AoD_Season, Pfad2)
@@ -1788,10 +1748,7 @@ Public Class Anime_Add
 
 
 
-<<<<<<< Updated upstream
 
-=======
->>>>>>> Stashed changes
     Private Sub GroupBox1_VisibleChanged(sender As Object, e As EventArgs) Handles groupBox1.VisibleChanged
         If Not textBox2.Text = "Use Custom Name" Then
             textBox2.Text = "Use Custom Name"

Crunchyroll Downloader/App.config

@@ -1,11 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup>
-              <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+              <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib" />
+      <dependentAssembly>
+        <assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-93.1.140.0" newVersion="93.1.140.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="CefSharp.Core" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-93.1.140.0" newVersion="93.1.140.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Crunchyroll Downloader/ApplicationEvents.vb

@@ -4,17 +4,16 @@ Imports System.IO
 
 Imports System.Environment
 Imports Microsoft.Win32
+
 Namespace My
-
+    ' Für MyApplication sind folgende Ereignisse verfügbar:
-    ' The following events are available for MyApplication:
+    ' Startup: Wird beim Starten der Anwendung noch vor dem Erstellen des Startformulars ausgelöst.
-    '
+    ' Shutdown: Wird nach dem Schließen aller Anwendungsformulare ausgelöst.  Dieses Ereignis wird nicht ausgelöst, wenn die Anwendung mit einem Fehler beendet wird.
-    ' Startup: Raised when the application starts, before the startup form is created.
+    ' UnhandledException: Wird bei einem Ausnahmefehler ausgelöst.
-    ' Shutdown: Raised after all application forms are closed.  This event is not raised if the application terminates abnormally.
+    ' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist. 
-    ' UnhandledException: Raised if the application encounters an unhandled exception.
+    ' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst.
-    ' StartupNextInstance: Raised when launching a single-instance application and the application is already active.
-    ' NetworkAvailabilityChanged: Raised when the network connection is connected or disconnected.
     Partial Friend Class MyApplication
-
-        End Function
     End Class
 End Namespace
+
+

Crunchyroll Downloader/CefSharp_Browser.Designer.vb

@@ -27,13 +27,7 @@ Partial Class CefSharp_Browser
         Me.Button1 = New System.Windows.Forms.Button()
         Me.Btn_Scan = New System.Windows.Forms.Button()
         Me.Panel1 = New System.Windows.Forms.Panel()
-<<<<<<< Updated upstream:Crunchyroll Downloader/CefSharp_Browser.Designer.vb
         Me.WebBrowser1 = New CefSharp.WinForms.ChromiumWebBrowser()
-=======
-#Disable Warning BC40000 ' Der Typ oder Member ist veraltet.
-        Me.WebBrowser1 = New CefSharp.WinForms.ChromiumWebBrowser()
-#Enable Warning BC40000 ' Der Typ oder Member ist veraltet.
->>>>>>> Stashed changes:Crunchyroll Downloader/GeckoFX.Designer.vb
         Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
         Me.Panel1.SuspendLayout()
         Me.SuspendLayout()
@@ -114,11 +108,6 @@ Partial Class CefSharp_Browser
     Friend WithEvents Button1 As Button
     Friend WithEvents Btn_Scan As Button
     Friend WithEvents Panel1 As Panel
-<<<<<<< Updated upstream:Crunchyroll Downloader/CefSharp_Browser.Designer.vb
     Friend WithEvents Timer1 As Timer
     Friend WithEvents WebBrowser1 As CefSharp.WinForms.ChromiumWebBrowser
-=======
-    Public WithEvents WebBrowser1 As CefSharp.WinForms.ChromiumWebBrowser
-    Friend WithEvents Timer1 As Timer
->>>>>>> Stashed changes:Crunchyroll Downloader/GeckoFX.Designer.vb
 End Class

Crunchyroll Downloader/CefSharp_Browser.vb

@@ -236,18 +236,6 @@ Public Class CefSharp_Browser
         End If
     End Sub
 
-<<<<<<< Updated upstream
-=======
-    Private Sub WebBrowser1_GotFocus(sender As Object, e As EventArgs) Handles WebBrowser1.GotFocus
-        'Debug_Mode.ActiveForm = True
-    End Sub
-
-    Private Sub WebBrowser1_LostFocus(sender As Object, e As EventArgs) Handles WebBrowser1.LostFocus
-        'Debug_Mode.TopMost = False
-    End Sub
-
-
->>>>>>> Stashed changes
 
     Private Sub ObserveHttp(e As RequestResourceEventArgs) 'Handles RequestResource.GetUrl
         'Debug.WriteLine(e.RequestUrl)
@@ -287,7 +275,6 @@ Public Class CefSharp_Browser
                 Main.LoadedUrls.Add(e.RequestUrl)
             End If
             Debug.WriteLine(e.RequestUrl)
-<<<<<<< Updated upstream
         ElseIf CBool(InStr(e.RequestUrl, "/data/v1/shows/")) Then
             If (Me.InvokeRequired) Then
                 Me.Invoke(Sub() Main.LoadedUrls.Add(e.RequestUrl))
@@ -295,8 +282,6 @@ Public Class CefSharp_Browser
                 Main.LoadedUrls.Add(e.RequestUrl)
             End If
             Debug.WriteLine(e.RequestUrl)
-=======
->>>>>>> Stashed changes
         End If
 
         Exit Sub
@@ -466,9 +451,5 @@ Public Class CefSharp_Browser
     End Sub
 
 
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
 End Class
 

Crunchyroll Downloader/Crunchyroll Downloader.vbproj

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.props')" />
+  <Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props')" />
-  <Import Project="..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props')" />
+  <Import Project="..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props" Condition="Exists('..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props')" />
-  <Import Project="..\packages\cef.redist.x64.91.1.21\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.91.1.21\build\cef.redist.x64.props')" />
+  <Import Project="..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props" Condition="Exists('..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -109,16 +109,16 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\CEFRequestHandler\CEFRequestHandler\bin\x64\Debug\CEFRequestHandler.dll</HintPath>
     </Reference>
-    <Reference Include="CefSharp, Version=91.1.211.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+    <Reference Include="CefSharp, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
-      <HintPath>..\packages\CefSharp.Common.91.1.211\lib\net452\CefSharp.dll</HintPath>
+      <HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.dll</HintPath>
     </Reference>
-    <Reference Include="CefSharp.Core, Version=91.1.211.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+    <Reference Include="CefSharp.Core, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
-      <HintPath>..\packages\CefSharp.Common.91.1.211\lib\net452\CefSharp.Core.dll</HintPath>
+      <HintPath>..\packages\CefSharp.Common.93.1.140\lib\net452\CefSharp.Core.dll</HintPath>
     </Reference>
-    <Reference Include="CefSharp.WinForms, Version=91.1.211.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+    <Reference Include="CefSharp.WinForms, Version=93.1.140.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
-      <HintPath>..\packages\CefSharp.WinForms.91.1.211\lib\net452\CefSharp.WinForms.dll</HintPath>
+      <HintPath>..\packages\CefSharp.WinForms.93.1.140\lib\net452\CefSharp.WinForms.dll</HintPath>
     </Reference>
-    <Reference Include="MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a, processorArchitecture=AMD64">
+    <Reference Include="MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\metroframework-modern-ui\MetroFramework\bin\Debug\MetroFramework.dll</HintPath>
     </Reference>
@@ -151,6 +151,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ApplicationEvents.vb" />
     <Compile Include="GlobalSuppressions.vb" />
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -410,10 +411,10 @@
     <PropertyGroup>
       <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\cef.redist.x64.91.1.21\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.91.1.21\build\cef.redist.x64.props'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.93.1.14\build\cef.redist.x64.props'))" />
-    <Error Condition="!Exists('..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.91.1.21\build\cef.redist.x86.props'))" />
+    <Error Condition="!Exists('..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.93.1.14\build\cef.redist.x86.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets'))" />
   </Target>
-  <Import Project="..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.91.1.211\build\CefSharp.Common.targets')" />
+  <Import Project="..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.93.1.140\build\CefSharp.Common.targets')" />
 </Project>

Crunchyroll Downloader/ErrorDialog.vb

@@ -210,12 +210,8 @@ Public Class ErrorDialog
         pictureBox3.Image = Main.CloseImg
     End Sub
 
-<<<<<<< Updated upstream
-        pictureBox3.Image = Main.CloseImg
-    End Sub
 
-=======
+
->>>>>>> Stashed changes
     Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
         PictureBox9.Enabled = True
         PictureBox9.Cursor = Cursors.Hand

Crunchyroll Downloader/Main.vb

@@ -4912,7 +4912,7 @@ Public Class Main
                                      End Function))
             End If
 
-
+            DefaultName = DefaultName.Replace(":", "")
 
             DownloadPfad = UseSubfolder(FunimationTitle, FunimationSeason, Pfad)
 
@@ -4920,13 +4920,30 @@ Public Class Main
                 ' Nein! Jetzt erstellen...
                 Try
                     Directory.CreateDirectory(Path.GetDirectoryName(DownloadPfad))
+                    DownloadPfad = Chr(34) + DownloadPfad + DefaultName + VideoFormat + Chr(34)
+
                 Catch ex As Exception
                     ' Ordner wurde nich erstellt
-                    DownloadPfad = Pfad '+ "\" + DefaultName + VideoFormat
+                    DownloadPfad = Chr(34) + Pfad + DefaultName + VideoFormat + Chr(34)
                 End Try
+            Else
+                DownloadPfad = Chr(34) + DownloadPfad + DefaultName + VideoFormat + Chr(34)
             End If
 
-            DownloadPfad = DownloadPfad + DefaultName + VideoFormat
+
+            'DownloadPfad = UseSubfolder(FunimationTitle, FunimationSeason, Pfad)
+
+            'If Not Directory.Exists(Path.GetDirectoryName(DownloadPfad)) Then
+            '    ' Nein! Jetzt erstellen...
+            '    Try
+            '        Directory.CreateDirectory(Path.GetDirectoryName(DownloadPfad))
+            '    Catch ex As Exception
+            '        ' Ordner wurde nich erstellt
+            '        DownloadPfad = Pfad '+ "\" + DefaultName + VideoFormat
+            '    End Try
+            'End If
+
+            'DownloadPfad = DownloadPfad + DefaultName + VideoFormat
 
 
 #Region "lösche doppel download"
@@ -5577,7 +5594,7 @@ Public Class Main
             Dim L1Name_Split As String() = WebbrowserURL.Split(New String() {"/"}, System.StringSplitOptions.RemoveEmptyEntries)
             Dim L1Name As String = L1Name_Split(1).Replace("www.", "") + " | Dub : " + FunimationDub
             Me.Invoke(New Action(Function() As Object
-                                     ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, "Unknown", SubValuesToDisplay(), thumbnail4, Funimation_m3u8_final, Chr(34) + DownloadPfad + Chr(34), "FM")
+                                     ListItemAdd(Pfad_DL, L1Name, DefaultName, ResoHTMLDisplay, "Unknown", SubValuesToDisplay(), thumbnail4, Funimation_m3u8_final, DownloadPfad, "FM")
                                      Return Nothing
                                  End Function))
             liList.Add(My.Resources.htmlvorThumbnail + thumbnail4 + My.Resources.htmlnachTumbnail + FunimationTitle + " <br> " + FunimationSeason + " " + FunimationEpisode + My.Resources.htmlvorAufloesung + ResoHTMLDisplay + My.Resources.htmlvorSoftSubs + vbNewLine + SubValuesToDisplay() + My.Resources.htmlvorHardSubs + "null" + My.Resources.htmlnachHardSubs + "<!-- " + DefaultName + "-->")
@@ -5676,7 +5693,7 @@ Public Class Main
             If b = False Then
                 Try
                     If Address = "https://www.crunchyroll.com/" Then
-                        b = True
+
                     ElseIf Address = "https://www.crunchyroll.com/en-gb" Then
                         b = True
                     ElseIf Address = "https://www.crunchyroll.com/es" Then
@@ -5923,6 +5940,12 @@ Public Class Main
             End If
             If CBool(InStr(requesturl, "/data/v1/shows/")) Then
 
+                MsgBox("The new Funimation Overview is not supportet yet!", MsgBoxStyle.Information)
+                b = True
+                LoadedUrls.Clear()
+                Exit Sub
+
+
                 'Dim ShowJson As String = Nothing
 
                 'Try

Crunchyroll Downloader/bin/x64/Debug/CefSharp.Core.Runtime.xml

@@ -100,7 +100,7 @@ Returns true if this object is read-only.
         </member>
         <member name="M:CefSharp.Core.PostData.#ctor">
             <summary>
-Default constructor.
+Initializes a new instance of the PostData class.
 </summary>
         </member>
         <member name="M:CefSharp.Core.PostData.ThrowIfReadOnly">
@@ -151,58 +151,6 @@ Returns the mime type for the specified file extension or an empty string if unk
             <param name="extension">file extension</param>
             <returns>Returns the mime type for the specified file extension or an empty string if unknown.</returns>
         </member>
-        <member name="M:CefSharp.Core.Cef.RegisterWidevineCdmAsync(System.String)">
-            <summary>
-Register the Widevine CDM plugin.
-
-See <see cref="M:CefSharp.Core.Cef.RegisterWidevineCdm(System.String,CefSharp.IRegisterCdmCallback)" /> for more details.
-</summary>
-            <param name="path"> is a directory that contains the Widevine CDM files</param>
-            <returns>Returns a Task that can be awaited to receive the <see cref="T:CefSharp.CdmRegistration" /> response.</returns>
-        </member>
-        <member name="M:CefSharp.Core.Cef.RegisterWidevineCdm(System.String,CefSharp.IRegisterCdmCallback)">
-            <summary>
-Register the Widevine CDM plugin.
-
-The client application is responsible for downloading an appropriate
-platform-specific CDM binary distribution from Google, extracting the
-contents, and building the required directory structure on the local machine.
-The <see cref="M:CefSharp.IBrowserHost.StartDownload(System.String)" /> method class can be used
-to implement this functionality in CefSharp. Contact Google via
-https://www.widevine.com/contact.html for details on CDM download.
-
-
-path is a directory that must contain the following files:
-  1. manifest.json file from the CDM binary distribution (see below).
-  2. widevinecdm file from the CDM binary distribution (e.g.
-     widevinecdm.dll on Windows).
-  3. widevidecdmadapter file from the CEF binary distribution (e.g.
-     widevinecdmadapter.dll on Windows).
-
-If any of these files are missing or if the manifest file has incorrect
-contents the registration will fail and callback will receive an ErrorCode
-value of <see cref="F:CefSharp.CdmRegistrationErrorCode.IncorrectContents" />.
-
-The manifest.json file must contain the following keys:
-  A. "os": Supported OS (e.g. "mac", "win" or "linux").
-  B. "arch": Supported architecture (e.g. "ia32" or "x64").
-  C. "x-cdm-module-versions": Module API version (e.g. "4").
-  D. "x-cdm-interface-versions": Interface API version (e.g. "8").
-  E. "x-cdm-host-versions": Host API version (e.g. "8").
-  F. "version": CDM version (e.g. "1.4.8.903").
-  G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp9.0,avc1").
-
-A through E are used to verify compatibility with the current Chromium
-version. If the CDM is not compatible the registration will fail and
-callback will receive an ErrorCode value of <see cref="F:CefSharp.CdmRegistrationErrorCode.Incompatible" />.
-
-If registration is not supported at the time that Cef.RegisterWidevineCdm() is called then callback
-will receive an ErrorCode value of <see cref="F:CefSharp.CdmRegistrationErrorCode.NotSupported" />.
-</summary>
-            <param name="path"> is a directory that contains the Widevine CDM files</param>
-            <param name="callback">optional callback - <see cref="M:CefSharp.IRegisterCdmCallback.OnRegistrationComplete(CefSharp.CdmRegistration)" /> 
-will be executed asynchronously once registration is complete</param>
-        </member>
         <member name="M:CefSharp.Core.Cef.SetCrashKeyValue(System.String,System.String)">
             <summary>
 Sets or clears a specific key-value pair from the crash metadata.
@@ -574,6 +522,10 @@ Gets a value that indicates the Git Hash for CEF version currently being used.
             <summary>Gets a value that indicates the version of CefSharp currently being used.</summary>
             <value>The CefSharp version.</value>
         </member>
+        <member name="P:CefSharp.Core.Cef.IsShutdown">
+            <summary>Gets a value that indicates whether CefSharp was shutdown.</summary>
+            <value>true if CefSharp was shutdown; otherwise, false.</value>
+        </member>
         <member name="P:CefSharp.Core.Cef.IsInitialized">
             <summary>Gets a value that indicates whether CefSharp is initialized.</summary>
             <value>true if CefSharp is initialized; otherwise, false.</value>
@@ -583,14 +535,6 @@ Gets a value that indicates the Git Hash for CEF version currently being used.
 Global CEF methods are exposed through this class. e.g. CefInitalize maps to Cef.Initialize
 CEF API Doc https://magpcss.org/ceforum/apidocs3/projects/(default)/(_globals).html
 This class cannot be inherited.
-</summary>
-        </member>
-        <member name="M:CefSharp.Internals.CefRegisterCdmCallbackAdapter.OnCdmRegistrationComplete(cef_cdm_registration_error_t,CefStringBase&lt;CefStringTraitsUTF16&gt;!System.Runtime.CompilerServices.IsConst*!System.Runtime.CompilerServices.IsImplicitlyDereferenced)">
-            <summary>
-Method that will be called when CDM registration is complete. |result|
-will be CEF_CDM_REGISTRATION_ERROR_NONE if registration completed
-successfully. Otherwise, |result| and |error_message| will contain
-additional information about why registration failed.
 </summary>
         </member>
         <member name="M:CefSharp.Core.CefSettingsBase.RegisterScheme(CefSharp.CefCustomScheme)">
@@ -749,9 +693,9 @@ Set to true in order to completely ignore SSL certificate errors. This is NOT re
         </member>
         <member name="P:CefSharp.Core.CefSettingsBase.UserDataPath">
             <summary>
-The location where user data such as spell checking dictionary files will be stored on disk. If this value is empty then the
+The location where user data such as the Widevine CDM module and spell checking dictionary files will be stored on disk.
-default user data directory will be used ("Local Settings\Application Data\CEF\User Data" directory under the user
+If this value is empty then "Local Settings\Application Data\CEF\User Data" directory under the user profile directory
-profile directory on Windows). If this value is non-empty then it must be an absolute path.
+will be used. If this value is non-empty then it must be an absolute path.
 </summary>
         </member>
         <member name="P:CefSharp.Core.CefSettingsBase.RootCachePath">
@@ -1572,7 +1516,7 @@ CachePath is empty or if it matches the CefSettings.CachePath value.
         </member>
         <member name="M:CefSharp.Core.RequestContextSettings.#ctor">
             <summary>
-Default constructor
+Initializes a new instance of the RequestContextSettings class.
 </summary>
         </member>
         <member name="T:CefSharp.Core.RequestContextSettings">

Crunchyroll Downloader/bin/x64/Debug/CefSharp.Core.xml

@@ -186,6 +186,10 @@
             <summary>Gets a value that indicates whether CefSharp is initialized.</summary>
             <value>true if CefSharp is initialized; otherwise, false.</value>
         </member>
+        <member name="P:CefSharp.Cef.IsShutdown">
+            <summary>Gets a value that indicates whether CefSharp was shutdown.</summary>
+            <value>true if CefSharp was shutdown; otherwise, false.</value>
+        </member>
         <member name="P:CefSharp.Cef.CefSharpVersion">
             <summary>Gets a value that indicates the version of CefSharp currently being used.</summary>
             <value>The CefSharp version.</value>
@@ -555,58 +559,6 @@
             </summary>
             <returns>Current Log Level</returns>
         </member>
-        <member name="M:CefSharp.Cef.RegisterWidevineCdm(System.String,CefSharp.IRegisterCdmCallback)">
-             <summary>
-             Register the Widevine CDM plugin.
-             
-             The client application is responsible for downloading an appropriate
-             platform-specific CDM binary distribution from Google, extracting the
-             contents, and building the required directory structure on the local machine.
-             The <see cref="M:CefSharp.IBrowserHost.StartDownload(System.String)"/> method class can be used
-             to implement this functionality in CefSharp. Contact Google via
-             https://www.widevine.com/contact.html for details on CDM download.
-             
-             
-             path is a directory that must contain the following files:
-               1. manifest.json file from the CDM binary distribution (see below).
-               2. widevinecdm file from the CDM binary distribution (e.g.
-                  widevinecdm.dll on Windows).
-               3. widevidecdmadapter file from the CEF binary distribution (e.g.
-                  widevinecdmadapter.dll on Windows).
-            
-             If any of these files are missing or if the manifest file has incorrect
-             contents the registration will fail and callback will receive an ErrorCode
-             value of <see cref="F:CefSharp.CdmRegistrationErrorCode.IncorrectContents"/>.
-            
-             The manifest.json file must contain the following keys:
-               A. "os": Supported OS (e.g. "mac", "win" or "linux").
-               B. "arch": Supported architecture (e.g. "ia32" or "x64").
-               C. "x-cdm-module-versions": Module API version (e.g. "4").
-               D. "x-cdm-interface-versions": Interface API version (e.g. "8").
-               E. "x-cdm-host-versions": Host API version (e.g. "8").
-               F. "version": CDM version (e.g. "1.4.8.903").
-               G. "x-cdm-codecs": List of supported codecs (e.g. "vp8,vp9.0,avc1").
-            
-             A through E are used to verify compatibility with the current Chromium
-             version. If the CDM is not compatible the registration will fail and
-             callback will receive an ErrorCode value of <see cref="F:CefSharp.CdmRegistrationErrorCode.Incompatible"/>.
-            
-             If registration is not supported at the time that Cef.RegisterWidevineCdm() is called then callback
-             will receive an ErrorCode value of <see cref="F:CefSharp.CdmRegistrationErrorCode.NotSupported"/>.
-             </summary>
-             <param name="path"> is a directory that contains the Widevine CDM files</param>
-             <param name="callback">optional callback - <see cref="M:CefSharp.IRegisterCdmCallback.OnRegistrationComplete(CefSharp.CdmRegistration)"/> 
-             will be executed asynchronously once registration is complete</param>
-        </member>
-        <member name="M:CefSharp.Cef.RegisterWidevineCdmAsync(System.String)">
-             <summary>
-             Register the Widevine CDM plugin.
-            
-             See <see cref="M:CefSharp.Cef.RegisterWidevineCdm(System.String,CefSharp.IRegisterCdmCallback)"/> for more details.
-             </summary>
-             <param name="path"> is a directory that contains the Widevine CDM files</param>
-             <returns>Returns a Task that can be awaited to receive the <see cref="T:CefSharp.CdmRegistration"/> response.</returns>
-        </member>
         <member name="M:CefSharp.Cef.GetMimeType(System.String)">
             <summary>
             Returns the mime type for the specified file extension or an empty string if unknown.
@@ -720,9 +672,9 @@
         </member>
         <member name="P:CefSharp.CefSettingsBase.UserDataPath">
             <summary>
-            The location where user data such as spell checking dictionary files will be stored on disk. If this value is empty then the
+            The location where user data such as the Widevine CDM module and spell checking dictionary files will be stored on disk.
-            default user data directory will be used ("Local Settings\Application Data\CEF\User Data" directory under the user
+            If this value is empty then "Local Settings\Application Data\CEF\User Data" directory under the user profile directory
-            profile directory on Windows). If this value is non-empty then it must be an absolute path.
+            will be used. If this value is non-empty then it must be an absolute path.
             </summary>
         </member>
         <member name="P:CefSharp.CefSettingsBase.IgnoreCertificateErrors">

Crunchyroll Downloader/bin/x64/Debug/CefSharp.WinForms.xml

@@ -21,6 +21,17 @@
             The browser initialized - boolean represented as 0 (false) and 1(true) as we use Interlocker to increment/reset
             </summary>
         </member>
+        <member name="F:CefSharp.WinForms.ChromiumWebBrowser.disposeSignaled">
+            <summary>
+            The value for disposal, if it's 1 (one) then this instance is either disposed
+            or in the process of getting disposed
+            </summary>
+        </member>
+        <member name="F:CefSharp.WinForms.ChromiumWebBrowser.browser">
+            <summary>
+            The browser
+            </summary>
+        </member>
         <member name="P:CefSharp.WinForms.ChromiumWebBrowser.CanExecuteJavascriptInMainFrame">
             <summary>
             A flag that indicates if you can execute javascript in the main frame.
@@ -99,6 +110,11 @@
             Implement <see cref="T:CefSharp.IAudioHandler" /> to handle audio events.
             </summary>
         </member>
+        <member name="P:CefSharp.WinForms.ChromiumWebBrowser.FrameHandler">
+            <summary>
+            Implement <see cref="T:CefSharp.IFrameHandler" /> to handle frame events.
+            </summary>
+        </member>
         <member name="P:CefSharp.WinForms.ChromiumWebBrowser.FocusHandler">
             <summary>
             The <see cref="T:CefSharp.IFocusHandler" /> for this ChromiumWebBrowser.
@@ -238,7 +254,13 @@
         <member name="M:CefSharp.WinForms.ChromiumWebBrowser.LoadUrlAsync(System.String,System.Threading.SynchronizationContext)">
             <inheritdoc/>
         </member>
-        <member name="M:CefSharp.WinForms.ChromiumWebBrowser.FreeHandlersExceptLifeSpan">
+        <member name="M:CefSharp.WinForms.ChromiumWebBrowser.OnAfterBrowserCreated(CefSharp.IBrowser)">
+            <summary>
+            Called after browser created.
+            </summary>
+            <param name="browser">The browser.</param>
+        </member>
+        <member name="M:CefSharp.WinForms.ChromiumWebBrowser.FreeHandlersExceptLifeSpanAndFocus">
             <summary>
             Sets the handler references to null.
             Where required also calls Dispose().
@@ -272,11 +294,6 @@
             The parent form message interceptor
             </summary>
         </member>
-        <member name="F:CefSharp.WinForms.ChromiumWebBrowser.browser">
-            <summary>
-            The browser
-            </summary>
-        </member>
         <member name="F:CefSharp.WinForms.ChromiumWebBrowser.designMode">
             <summary>
             A flag that indicates whether or not the designer is active
@@ -318,12 +335,6 @@
             user attempts to set after browser created)
             </summary>
         </member>
-        <member name="F:CefSharp.WinForms.ChromiumWebBrowser.disposeSignaled">
-            <summary>
-            The value for disposal, if it's 1 (one) then this instance is either disposed
-            or in the process of getting disposed
-            </summary>
-        </member>
         <member name="F:CefSharp.WinForms.ChromiumWebBrowser.parkingControl">
             <summary>
             Parking control used to temporarily host the CefBrowser instance
@@ -548,12 +559,6 @@
             </code>
              </example>
         </member>
-        <member name="M:CefSharp.WinForms.ChromiumWebBrowser.CefSharp#Internals#IWebBrowserInternal#OnAfterBrowserCreated(CefSharp.IBrowser)">
-            <summary>
-            Called after browser created.
-            </summary>
-            <param name="browser">The browser.</param>
-        </member>
         <member name="M:CefSharp.WinForms.ChromiumWebBrowser.CefSharp#Internals#IWebBrowserInternal#SetAddress(CefSharp.AddressChangedEventArgs)">
             <summary>
             Sets the address.

Crunchyroll Downloader/bin/x64/Debug/Crunchyroll Downloader.exe.config

@@ -1,11 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup>
-              <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+              <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="lib" />
+      <dependentAssembly>
+        <assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-93.1.140.0" newVersion="93.1.140.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="CefSharp.Core" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-93.1.140.0" newVersion="93.1.140.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

Crunchyroll Downloader/bin/x64/Debug/README.txt

@@ -1,15 +1,15 @@
 Chromium Embedded Framework (CEF) Standard Binary Distribution for Windows
 -------------------------------------------------------------------------------
 
-Date:             June 20, 2021
+Date:             September 17, 2021
 
-CEF Version:      91.1.21+g9dd45fe+chromium-91.0.4472.114
+CEF Version:      93.1.14+gf38ce34+chromium-93.0.4577.82
 CEF URL:          https://bitbucket.org/chromiumembedded/cef.git
-                  @9dd45fe15964fb136e60d16ad40d78023f486360
+                  @f38ce3409c5cfc5dcadbf1e219ffaaf7e720b609
 
-Chromium Version: 91.0.4472.114
+Chromium Version: 93.0.4577.82
 Chromium URL:     https://chromium.googlesource.com/chromium/src.git
-                  @c1e1dff6f551c4aab8578ec695825cc9b27d51e6
+                  @f2d6656bdf16198c04b70efd1952dace3ed7dd8f
 
 This distribution contains all components necessary to build and distribute an
 application using CEF on the Windows platform. Please see the LICENSING

Crunchyroll Downloader/bin/x64/Debug/WebInterface/error_Page.html

@@ -43,11 +43,7 @@
       </div>
         <h1>Failed!</h1> 
         <p>System.IndexOutOfRangeException: Der Index war außerhalb des Arraybereichs.
-<<<<<<< Updated upstream
-   bei Crunchyroll_Downloader.Main.ProcessRequest(NetworkStream stream, String htmlReq) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - CefSharp\Crunchyroll Downloader\Main.vb:Zeile 6153.</p>
-=======
    bei Crunchyroll_Downloader.Main.ProcessRequest(NetworkStream stream, String htmlReq) in D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\Main.vb:Zeile 4697.</p>
->>>>>>> Stashed changes
       </div>
     </body>
 </html>

Crunchyroll Downloader/bin/x64/Debug/WebInterface/geo/v1/region/check

@@ -1 +0,0 @@
-{"region":"US","isSupportedRegion":true}

Crunchyroll Downloader/einstellungen.Designer.vb

@@ -387,11 +387,7 @@ Partial Class Einstellungen
         Me.TabPage2.Location = New System.Drawing.Point(4, 44)
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-<<<<<<< Updated upstream
         Me.TabPage2.Size = New System.Drawing.Size(501, 519)
-=======
-        Me.TabPage2.Size = New System.Drawing.Size(501, 528)
->>>>>>> Stashed changes
         Me.TabPage2.TabIndex = 1
         Me.TabPage2.Text = "Output"
         Me.TabPage2.VerticalScrollbarBarColor = True
@@ -1090,11 +1086,7 @@ Partial Class Einstellungen
         Me.MetroTabPage1.HorizontalScrollbarSize = 10
         Me.MetroTabPage1.Location = New System.Drawing.Point(4, 44)
         Me.MetroTabPage1.Name = "MetroTabPage1"
-<<<<<<< Updated upstream
         Me.MetroTabPage1.Size = New System.Drawing.Size(501, 519)
-=======
-        Me.MetroTabPage1.Size = New System.Drawing.Size(501, 528)
->>>>>>> Stashed changes
         Me.MetroTabPage1.TabIndex = 7
         Me.MetroTabPage1.Text = "Crunchyroll"
         Me.MetroTabPage1.VerticalScrollbarBarColor = True
@@ -1143,11 +1135,7 @@ Partial Class Einstellungen
         Me.TabPage6.Location = New System.Drawing.Point(4, 44)
         Me.TabPage6.Name = "TabPage6"
         Me.TabPage6.Padding = New System.Windows.Forms.Padding(3)
-<<<<<<< Updated upstream
         Me.TabPage6.Size = New System.Drawing.Size(501, 519)
-=======
-        Me.TabPage6.Size = New System.Drawing.Size(501, 528)
->>>>>>> Stashed changes
         Me.TabPage6.TabIndex = 4
         Me.TabPage6.Text = "Funimation"
         Me.TabPage6.VerticalScrollbarBarColor = True
@@ -1345,11 +1333,7 @@ Partial Class Einstellungen
         Me.TabPage8.Controls.Add(Me.GroupBox8)
         Me.TabPage8.Location = New System.Drawing.Point(4, 44)
         Me.TabPage8.Name = "TabPage8"
-<<<<<<< Updated upstream
         Me.TabPage8.Size = New System.Drawing.Size(501, 519)
-=======
-        Me.TabPage8.Size = New System.Drawing.Size(501, 528)
->>>>>>> Stashed changes
         Me.TabPage8.TabIndex = 6
         Me.TabPage8.Text = "  AoD"
         '
@@ -1421,11 +1405,7 @@ Partial Class Einstellungen
         Me.TabPage7.Controls.Add(Me.Label5)
         Me.TabPage7.Location = New System.Drawing.Point(4, 44)
         Me.TabPage7.Name = "TabPage7"
-<<<<<<< Updated upstream
         Me.TabPage7.Size = New System.Drawing.Size(501, 519)
-=======
-        Me.TabPage7.Size = New System.Drawing.Size(501, 528)
->>>>>>> Stashed changes
         Me.TabPage7.TabIndex = 5
         Me.TabPage7.Text = "About   "
         '