diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo
index 52cf494..8066c48 100644
Binary files a/.vs/Crunchyroll Downloader/v15/.suo and b/.vs/Crunchyroll Downloader/v15/.suo differ
diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm
index 05af633..5534768 100644
Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal
index 11e8aa9..223bb0e 100644
Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
index 563d0e0..ce93a7a 100644
--- a/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
+++ b/Crunchyroll Downloader/Crunchyroll Downloader.vbproj
@@ -140,6 +140,12 @@
Form
+
+ Form1.vb
+
+
+ Form
+
GeckoFX.vb
@@ -203,6 +209,9 @@
Debug_Mode.vb
+
+ Form1.vb
+
GeckoFX.vb
diff --git a/Crunchyroll Downloader/Form1.Designer.vb b/Crunchyroll Downloader/Form1.Designer.vb
new file mode 100644
index 0000000..4245868
--- /dev/null
+++ b/Crunchyroll Downloader/Form1.Designer.vb
@@ -0,0 +1,72 @@
+ _
+Partial Class Form1
+ Inherits System.Windows.Forms.Form
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Wird vom Windows Form-Designer benötigt.
+ Private components As System.ComponentModel.IContainer
+
+ 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+ 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
+ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+ _
+ Private Sub InitializeComponent()
+ Me.RichTextBox1 = New System.Windows.Forms.RichTextBox()
+ Me.TextBox1 = New System.Windows.Forms.TextBox()
+ Me.Button1 = New System.Windows.Forms.Button()
+ Me.SuspendLayout()
+ '
+ 'RichTextBox1
+ '
+ Me.RichTextBox1.Location = New System.Drawing.Point(23, 24)
+ Me.RichTextBox1.Name = "RichTextBox1"
+ Me.RichTextBox1.Size = New System.Drawing.Size(1269, 685)
+ Me.RichTextBox1.TabIndex = 0
+ Me.RichTextBox1.Text = ""
+ '
+ 'TextBox1
+ '
+ Me.TextBox1.Location = New System.Drawing.Point(39, 798)
+ Me.TextBox1.Name = "TextBox1"
+ Me.TextBox1.Size = New System.Drawing.Size(1240, 20)
+ Me.TextBox1.TabIndex = 1
+ '
+ 'Button1
+ '
+ Me.Button1.Location = New System.Drawing.Point(81, 739)
+ Me.Button1.Name = "Button1"
+ Me.Button1.Size = New System.Drawing.Size(75, 23)
+ Me.Button1.TabIndex = 2
+ Me.Button1.Text = "Button1"
+ Me.Button1.UseVisualStyleBackColor = True
+ '
+ 'Form1
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(1332, 843)
+ Me.Controls.Add(Me.Button1)
+ Me.Controls.Add(Me.TextBox1)
+ Me.Controls.Add(Me.RichTextBox1)
+ Me.Name = "Form1"
+ Me.Text = "Form1"
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
+
+ End Sub
+
+ Friend WithEvents RichTextBox1 As RichTextBox
+ Friend WithEvents TextBox1 As TextBox
+ Friend WithEvents Button1 As Button
+End Class
diff --git a/Crunchyroll Downloader/Form1.resx b/Crunchyroll Downloader/Form1.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/Crunchyroll Downloader/Form1.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/Crunchyroll Downloader/Form1.vb b/Crunchyroll Downloader/Form1.vb
new file mode 100644
index 0000000..8e8b725
--- /dev/null
+++ b/Crunchyroll Downloader/Form1.vb
@@ -0,0 +1,11 @@
+Public Class Form1
+ Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+ If InStr(RichTextBox1.Text, ".srt") Then
+ Dim SubTitle1() As String = RichTextBox1.Text.Split(New String() {".srt"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ TextBox1.Text = SubTitle2(SubTitle2.Count - 1) + ".srt"
+ Else
+ TextBox1.Text = "nope"
+ End If
+ End Sub
+End Class
\ No newline at end of file
diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb
index 0db7dbd..5280d23 100644
--- a/Crunchyroll Downloader/GeckoFX.vb
+++ b/Crunchyroll Downloader/GeckoFX.vb
@@ -166,6 +166,14 @@ Public Class GeckoFX
Dim SubTitle1() As String = WebBrowser1.Document.Body.OuterHtml.Split(New String() {".srt"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Main.WebbrowserSoftSubURL = SubTitle2(SubTitle2.Count - 1) + ".srt"
+ ElseIf InStr(WebBrowser1.Document.Body.OuterHtml, ".vtt") Then
+ Dim SubTitle1() As String = WebBrowser1.Document.Body.OuterHtml.Split(New String() {".vtt"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ Main.WebbrowserSoftSubURL = SubTitle2(SubTitle2.Count - 1) + ".vtt"
+ ElseIf InStr(WebBrowser1.Document.Body.OuterHtml, ".dfxp") Then
+ Dim SubTitle1() As String = WebBrowser1.Document.Body.OuterHtml.Split(New String() {".dfxp"}, System.StringSplitOptions.RemoveEmptyEntries)
+ Dim SubTitle2() As String = SubTitle1(0).Split(New String() {Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
+ Main.WebbrowserSoftSubURL = SubTitle2(SubTitle2.Count - 1) + ".dfxp"
Else
Main.WebbrowserSoftSubURL = Nothing
End If
diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb
index 56be4aa..d1600b9 100644
--- a/Crunchyroll Downloader/Main.vb
+++ b/Crunchyroll Downloader/Main.vb
@@ -1838,6 +1838,8 @@ Public Class Main
Dim FunimationName() As String = WebbrowserText.Split(New String() {""}, System.StringSplitOptions.RemoveEmptyEntries)
Dim FunimationName2() As String = FunimationName(0).Split(New String() {Chr(34) + ">"}, System.StringSplitOptions.RemoveEmptyEntries)
Dim FunimationName3 As String = FunimationName2(FunimationName2.Count - 1).Replace("", "")
+ FunimationName3 = System.Text.RegularExpressions.Regex.Replace(FunimationName3, "[^\w\\-]", " ")
+ FunimationName3 = RemoveExtraSpaces(FunimationName3)
#End Region
#Region "m3u8 URL"
@@ -1917,7 +1919,7 @@ Public Class Main
Next
End If
- '
+
'MsgBox(FunimationName3)
'MsgBox(Funimation_m3u8_final)
#Region "thumbnail"
@@ -1939,8 +1941,14 @@ Public Class Main
Else
'MsgBox(WebbrowserSoftSubURL)
Dim str2 As String = client0.DownloadString(WebbrowserSoftSubURL)
+ Dim SubtitelFormat As String = ".srt"
+ If InStr(WebbrowserSoftSubURL, ".vtt") Then
+ SubtitelFormat = ".vtt"
+ ElseIf InStr(WebbrowserSoftSubURL, ".dfxp") Then
+ SubtitelFormat = ".dfxp"
+ End If
Dim Pfad3 As String = DownloadPfad.Replace(Chr(34), "")
- Dim Pfad4 As String = Pfad3.Replace(".mp4", ".srt")
+ Dim Pfad4 As String = Pfad3.Replace(".mp4", SubtitelFormat)
File.WriteAllText(Pfad4, str2, Encoding.UTF8)
End If
Catch ex As Exception
@@ -1949,4 +1957,8 @@ Public Class Main
End Try
Funimation_Grapp_RDY = True
End Sub
+
+ Private Sub Main_Click(sender As Object, e As EventArgs) Handles Me.Click
+ 'Form1.Show()
+ End Sub
End Class
\ No newline at end of file
diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe
index 5262312..8759581 100644
Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe differ
diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb
index 0768865..930f07e 100644
Binary files a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.pdb differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe
index 5262312..8759581 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb
index 0768865..930f07e 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
index bad1f3e..5ec28eb 100644
--- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
+++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.CoreCompileInputs.cache
@@ -1 +1 @@
-0db4032339f4d8d75cab06e12a54a2b08d757c23
+348eb56a763eaa729d1b1d6687372d0a26db13f4
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
index 8185bd8..f9f9e5e 100644
--- a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
+++ b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.FileListAbsolute.txt
@@ -65,3 +65,4 @@ D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - Ko
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - Kopie\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Core.dll
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - Kopie\Crunchyroll Downloader\bin\x86\Debug\Geckofx-Winforms.dll
D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0 - Kopie\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll Downloader.vbproj.CopyComplete
+D:\Projecte\Crunchyroll Downloader - v3.0-final\Crunchyroll-Downloader-v3.0\Crunchyroll Downloader\obj\x86\Debug\Crunchyroll_Downloader.Form1.resources
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache
index d9466ea..e37a22b 100644
Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.vbproj.GenerateResource.cache differ
diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Form1.resources b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Form1.resources
new file mode 100644
index 0000000..6c05a97
Binary files /dev/null and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll_Downloader.Form1.resources differ