diff --git a/.vs/Crunchyroll Downloader/v15/.suo b/.vs/Crunchyroll Downloader/v15/.suo index 8e4d01a..8feed1c 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 979f245..8026a61 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 0aa34df..faad77e 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 e740816..e5c66c2 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/Anime_Add.vb b/Crunchyroll Downloader/Anime_Add.vb index 6256acf..3ae75a9 100644 --- a/Crunchyroll Downloader/Anime_Add.vb +++ b/Crunchyroll Downloader/Anime_Add.vb @@ -203,6 +203,7 @@ Public Class Anime_Add If MessageBox.Show("This in NOT a Crunchyroll URL, try anyway?", "confirm?", MessageBoxButtons.YesNo, MessageBoxIcon.Question) = DialogResult.Yes Then GeckoFX.WebBrowser1.Navigate(textBox1.Text) StatusLabel.Text = "Status: looking for non CR video file" + 'System.Threading.Thread.Sleep(20000) Else Exit Sub pictureBox4.Enabled = True diff --git a/Crunchyroll Downloader/GeckoFX.vb b/Crunchyroll Downloader/GeckoFX.vb index 01fac04..894192a 100644 --- a/Crunchyroll Downloader/GeckoFX.vb +++ b/Crunchyroll Downloader/GeckoFX.vb @@ -22,21 +22,37 @@ Public Class GeckoFX 'End Try 'My.Computer.Clipboard.SetText(WebBrowser1.Document.Body.InnerHtml) If Main.LoginOnly = "US_UnBlock" Then - Main.LoginOnly = "US_UnBlock_Wait" + Main.LoginOnly = "US_UnBlocck_Wait2nd" + 'Main.LoginOnly = "US_UnBlock_Wait" 'My.Computer.Clipboard.SetText(WebBrowser1.Url.ToString + vbNewLine + "before" + vbNewLine + vbNewLine + WebBrowser1.Document.Cookie) 'einstellungen.RichTextBox1.Text = WebBrowser1.Url.ToString + vbNewLine + "before" + vbNewLine + vbNewLine + WebBrowser1.Document.Cookie - WebBrowser1.Document.Cookie = "" + 'WebBrowser1.Document.Cookie = "" + 'WebBrowser1.Navigate("javascript:document.cookie = 'session_id=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';") + 'WebBrowser1.Navigate("javascript:$$") + 'WebBrowser1.ExecuteCommand("alert(document.cookie);") + 'WebBrowser1.Document.Body.InnerHtml = WebBrowser1.Document.Body.InnerHtml + "" 'einstellungen.RichTextBox1.Text = einstellungen.RichTextBox1.Text + vbNewLine + WebBrowser1.Url.ToString + vbNewLine + "after" + vbNewLine + vbNewLine + WebBrowser1.Document.Cookie 'My.Computer.Clipboard.SetText(before + vbNewLine + WebBrowser1.Url.ToString + vbNewLine + "after" + vbNewLine + vbNewLine + WebBrowser1.Document.Cookie) Try - Dim cookieName As String = "session_id" - Dim cookieValue As String = keks - WebBrowser1.Document.Cookie = String.Format("{0}={1}; {2}", cookieName, cookieValue, WebBrowser1.Document.Cookie) - Dim cookieName2 As String = "sess_id" - WebBrowser1.Document.Cookie = String.Format("{0}={1}; {2}", cookieName2, cookieValue, WebBrowser1.Document.Cookie) - Dim cookieFillName As String = "c_locale" - Dim cookieFillValue As String = "enUS" - WebBrowser1.Document.Cookie = String.Format("{0}={1}; {2}", cookieFillName, cookieFillValue, WebBrowser1.Document.Cookie) + 'Dim cookieName As String = "session_id" + 'Dim cookieValue As String = keks + 'WebBrowser1.Document.Cookie = String.Format("{0}={1}; {2}", cookieName, cookieValue, WebBrowser1.Document.Cookie) + 'Dim cookieName2 As String = "sess_id" + 'WebBrowser1.Document.Cookie = String.Format("{0}={1}; {2}", cookieName2, cookieValue, WebBrowser1.Document.Cookie) + 'Dim cookieFillName As String = "c_locale" + 'Dim cookieFillValue As String = "enUS" + 'WebBrowser1.Document.Cookie = String.Format("{0}={1}; {2}", cookieFillName, cookieFillValue, WebBrowser1.Document.Cookie) + WebBrowser1.Navigate("javascript:document.cookie =" + Chr(34) + "session_id=" + keks + "; expires=Thu, 05 Jan 2021 00:00:00 UTC; path=/;" + Chr(34) + ";") + Main.Pause(2) + WebBrowser1.Navigate("javascript:document.cookie = " + Chr(34) + "sess_id=" + keks + "; expires=Thu, 05 Jan 2021 00:00:00 UTC; path=/;" + Chr(34) + ";") + Main.Pause(2) + WebBrowser1.Navigate("javascript:document.cookie = " + Chr(34) + "c_locale=enUS; expires=Thu, 05 Jan 2021 00:00:00 UTC; path=/;" + Chr(34) + ";") + Main.Pause(2) + 'WebBrowser1.Navigate("javascript:alert(document.cookie);") + 'Main.Pause(2) + WebBrowser1.Navigate("https://www.crunchyroll.com/") + Main.LoginOnly = "US_UnBlock_Check" + 'WebBrowser1.Navigate("https://www.crunchyroll.com/") Catch ex As Exception End Try ElseIf Main.LoginOnly = "US_UnBlock_Wait" Then @@ -47,13 +63,14 @@ Public Class GeckoFX ElseIf Main.LoginOnly = "US_UnBlock_Check" Then Main.LoginOnly = "false" If CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "Your detected location is United States of America.")) Then + 'MsgBox(keks + vbNewLine + WebBrowser1.Document.Cookie) MsgBox("unlock successful", MsgBoxStyle.Information) Me.Close() 'MsgBox(WebBrowser1.Document.Cookie) Else 'MsgBox(WebBrowser1.Document.Cookie) - 'MsgBox(WebBrowser1.Document.Cookie) + 'MsgBox(keks + vbNewLine + WebBrowser1.Document.Cookie) MsgBox("unlock failes", MsgBoxStyle.Exclamation) Me.Close() End If diff --git a/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/bin/x86/Debug/Crunchyroll Downloader.exe index 7fa35f8..a997867 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 de57d70..d456ebb 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/Dev-build-51-19-Crunchyroll-Downloader-v3.x.zip b/Crunchyroll Downloader/bin/x86/Debug/Dev-build-51-19-Crunchyroll-Downloader-v3.x.zip index 38ae587..6376170 100644 Binary files a/Crunchyroll Downloader/bin/x86/Debug/Dev-build-51-19-Crunchyroll-Downloader-v3.x.zip and b/Crunchyroll Downloader/bin/x86/Debug/Dev-build-51-19-Crunchyroll-Downloader-v3.x.zip differ diff --git a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.exe index 7fa35f8..a997867 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 de57d70..d456ebb 100644 Binary files a/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb and b/Crunchyroll Downloader/obj/x86/Debug/Crunchyroll Downloader.pdb differ