diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index eff15f9..dba9b09 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 b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide index 0ccb58a..9618cbd 100644 Binary files a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide and b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm b/.vs/Crunchyroll Downloader/v15/Server/sqlite3/storage.ide-shm index 4b1aee8..674c8c0 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 2ffaed1..f61c71c 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/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index 60cb702..edd3395 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -49,6 +49,8 @@ Public Class GeckoFX Main.Pause(1) If Main.LoginDialog = True Then Login.ShowDialog() + Else + WebBrowser1.Navigate("https://www.crunchyroll.com/") End If End If @@ -375,6 +377,7 @@ Public Class GeckoFX MsgBox("copied: " + Chr(34) + WebBrowser1.Url.ToString + Chr(34)) Catch ex As Exception End Try + 'MsgBox(WebBrowser1.Document.Cookie) End Sub diff --git a/Crunchyroll Downloader/Login.vb b/Crunchyroll Downloader/Login.vb index 694955e..f063583 100644 --- a/Crunchyroll Downloader/Login.vb +++ b/Crunchyroll Downloader/Login.vb @@ -90,7 +90,8 @@ Public Class Login End Sub Private Sub pictureBox3_Click(sender As Object, e As EventArgs) Handles pictureBox3.Click - Main.UserCloseDialog = True + 'Main.UserCloseDialog = True + GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/") Me.Close() End Sub @@ -111,6 +112,7 @@ Public Class Login End Sub Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click + GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/") Me.Close() End Sub End Class \ No newline at end of file diff --git a/Crunchyroll Downloader/Main.vb b/Crunchyroll Downloader/Main.vb index e356414..c9d00b3 100644 --- a/Crunchyroll Downloader/Main.vb +++ b/Crunchyroll Downloader/Main.vb @@ -652,13 +652,32 @@ Public Class Main #Region "Name von Crunchyroll" + 'Dim Bug_Deutsch As String = "-" + 'If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then + ' Bug_Deutsch = ":" + 'End If + 'Dim CR_Name_by_Titel_2 As String() = WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries) + 'CR_FilenName = CR_Name_by_Titel_2(0).Trim() + Dim Bug_Deutsch As String = "-" If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then Bug_Deutsch = ":" End If Dim CR_Name_by_Titel_2 As String() = WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries) - CR_FilenName = CR_Name_by_Titel_2(0).Trim() + Dim CR_Title As String = Nothing + If CR_Name_by_Titel_2.Count > 2 Then + For i As Integer = 0 To CR_Name_by_Titel_2.Count - 2 + If CR_Title = Nothing Then + CR_Title = CR_Name_by_Titel_2(i).Trim() + Else + CR_Title = CR_Title + " " + CR_Name_by_Titel_2(i).Trim() + End If + Next + End If + CR_FilenName = CR_Title + CR_FilenName_Backup = CR_Title + 'MsgBox(CR_FilenName) If CBool(InStr(WebbrowserText, "

")) Then ' false on movie true on series Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) Dim CR_Name_2 As String() = CR_Name_1(1).Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) '(New [Char]() {"-"}) @@ -1095,12 +1114,32 @@ Public Class Main #Region "Name von Crunchyroll" If TextBox2_Text = Nothing Or TextBox2_Text = "Name of the Anime" Then 'MsgBox("True") + 'Dim Bug_Deutsch As String = "-" + 'If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then + ' Bug_Deutsch = ":" + 'End If + 'Dim CR_Name_by_Titel_2 As String() = WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries) + 'CR_FilenName = CR_Name_by_Titel_2(0).Trim() '+ " " + CR_Name_by_Script2(0).Trim + Dim Bug_Deutsch As String = "-" If CBool(InStr(WebbrowserTitle, "Anschauen auf Crunchyroll")) Then Bug_Deutsch = ":" End If Dim CR_Name_by_Titel_2 As String() = WebbrowserTitle.Split(New String() {Bug_Deutsch}, System.StringSplitOptions.RemoveEmptyEntries) - CR_FilenName = CR_Name_by_Titel_2(0).Trim() '+ " " + CR_Name_by_Script2(0).Trim + Dim CR_Title As String = Nothing + If CR_Name_by_Titel_2.Count > 2 Then + For i As Integer = 0 To CR_Name_by_Titel_2.Count - 2 + If CR_Title = Nothing Then + CR_Title = CR_Name_by_Titel_2(i).Trim() + Else + CR_Title = CR_Title + " " + CR_Name_by_Titel_2(i).Trim() + End If + + Next + End If + CR_FilenName = CR_Title + CR_FilenName_Backup = CR_Title + 'MsgBox(CR_FilenName) If CBool(InStr(WebbrowserText, "

")) Then ' false on movie true on series Dim CR_Name_1 As String() = WebbrowserText.Split(New String() {"

"}, System.StringSplitOptions.RemoveEmptyEntries) diff --git a/Crunchyroll Downloader/My Project/AssemblyInfo.vb b/Crunchyroll Downloader/My Project/AssemblyInfo.vb index 40c60d8..0b1458c 100644 --- a/Crunchyroll Downloader/My Project/AssemblyInfo.vb +++ b/Crunchyroll Downloader/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 9cc357d..ba87a41 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 33ca78a..4ecc92e 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/bin/x86/Debug/ffmpeg.exe b/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe index a3a8948..ff4c907 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe and b/Crunchyroll Downloader/bin/x86/Debug/ffmpeg.exe differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index 9cc357d..ba87a41 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 33ca78a..4ecc92e 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ