added default page for the browser, some changes on the us unlock

added default page for the browser wich can be set in the options, some minor changes for the us unlocker (i hope it works now like it shoudl)
This commit is contained in:
hama3254 2019-12-22 16:15:17 +01:00
parent 905011d049
commit 916124751b
15 changed files with 84 additions and 27 deletions

Binary file not shown.

View File

@ -23,7 +23,11 @@ Public Class GeckoFX
'My.Computer.Clipboard.SetText(WebBrowser1.Document.Body.InnerHtml)
If Main.LoginOnly = "US_UnBlock" Then
Main.LoginOnly = "US_UnBlock_Wait"
'MsgBox(WebBrowser1.Document.Cookie)
'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 = ""
'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
@ -44,10 +48,14 @@ Public Class GeckoFX
Main.LoginOnly = "false"
If CBool(InStr(WebBrowser1.Document.Body.OuterHtml, "Your detected location is United States of America.")) Then
MsgBox("unlock successful", MsgBoxStyle.Information)
Me.Close()
'MsgBox(WebBrowser1.Document.Cookie)
Else
'MsgBox(WebBrowser1.Document.Cookie)
'MsgBox(WebBrowser1.Document.Cookie)
MsgBox("unlock failes", MsgBoxStyle.Exclamation)
Me.Close()
End If
Else
@ -126,7 +134,7 @@ Public Class GeckoFX
'ElseIf CBool(InStr(WebBrowser1.Document.Body.OuterHtml, Chr(34) + "premium_status" + Chr(34) + ":" + Chr(34) + "free_trial" + Chr(34))) Then
'Main.MassGrapp()
'Else
' MsgBox(Main.CR_Premium_Failed, MsgBoxStyle.Information)
' 'MsgBox(Main.CR_Premium_Failed, MsgBoxStyle.Information)
' Anime_Add.groupBox1.Visible = True
' Anime_Add.groupBox2.Visible = False
' Anime_Add.GroupBox3.Visible = False
@ -175,23 +183,29 @@ Public Class GeckoFX
'End If
End If
End If
End If
If Main.UserBowser = False Then
Me.Close()
End If
End If
End Sub
Private Sub GeckoFX_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If WebBrowser1.Url.ToString = "about:blank" Then
If Main.LoginOnly = "US_UnBlock" Then
WebBrowser1.Navigate("https://www.crunchyroll.com/login")
Else
'WebBrowser1.Navigate("https://duckduckgo.com/") '")
WebBrowser1.Navigate(Main.Startseite)
End If
'WebBrowser1.Navigate("about:preferences")
'WebBrowser1.Navigate("about:addons")
WebBrowser1.Navigate("https://duckduckgo.com/") '")
'WebBrowser1.Navigate("https://www.crunchyroll.com/de/rwby/episode-45-world-of-remnant-1-dust-658499")
'WebBrowser1.Navigate("https://www.crunchyroll.com/de/rwby")
End If
Me.Icon = My.Resources.icon
'MsgBox(WebBrowser1.Url.ToString)
Main.UserBowser = True
End Sub
Private Sub GeckoFX_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing

View File

@ -30,6 +30,7 @@ Public Class Main
Dim CR_Unlock_Error As String
Dim versuch2 As Integer = 0
Public keks As String = Nothing
Public Startseite As String = "https://www.crunchyroll.com/"
Dim SubSprache2 As String
Dim URL_DL As String
Dim Pfad_DL As String
@ -143,6 +144,12 @@ Public Class Main
End Try
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
Startseite = rkg.GetValue("Startseite").ToString
Catch ex As Exception
End Try
#Region "Startup IU"
StatusToolTip.Active = True
#End Region
@ -477,7 +484,7 @@ Public Class Main
If CBool(InStr(WebbrowserText, Chr(34) + "premium_status" + Chr(34) + ":" + Chr(34) + "premium" + Chr(34))) Then
ElseIf CBool(InStr(WebbrowserText, Chr(34) + "premium_status" + Chr(34) + ":" + Chr(34) + "free_trial" + Chr(34))) Then
'Else
' MsgBox(CR_Premium_Failed, MsgBoxStyle.Information)
' 'MsgBox(CR_Premium_Failed, MsgBoxStyle.Information)
' Anime_Add.groupBox1.Visible = True
' Anime_Add.groupBox2.Visible = False
' Anime_Add.GroupBox3.Visible = False
@ -950,7 +957,7 @@ Public Class Main
' Catch ex As Exception
' End Try
' Next
' MsgBox(CR_URI_Master)
' 'MsgBox(CR_URI_Master)
' Dim FFMPEG_ResoBack As String = FFMPEG_Reso(CR_URI_Master)
' 'MsgBox(FFMPEG_ResoBack)
' Dim FFMPEG_Back() As String = FFMPEG_ResoBack.Split(New String() {"#1"}, System.StringSplitOptions.RemoveEmptyEntries)
@ -1397,7 +1404,7 @@ Public Class Main
End If
Next
If StreamNR = Nothing Then
MsgBox(cmd + vbNewLine + ffmpegOutput)
'MsgBox(cmd + vbNewLine + ffmpegOutput)
ResoNotFoundString = ffmpegOutput
DialogTaskString = "Resolution"
Reso.ShowDialog()
@ -1589,15 +1596,15 @@ Public Class Main
' Grapp_RDY = True
' 'MsgBox(ex.ToString)
' If CBool(InStr(ex.ToString, "Could not find the sub language")) Then
' MsgBox(Sub_language_NotFound + SubSprache)
' 'MsgBox(Sub_language_NotFound + SubSprache)
' ElseIf CBool(InStr(ex.ToString, "RESOLUTION Not Found")) Then
' MsgBox(Resolution_NotFound)
' 'MsgBox(Resolution_NotFound)
' ElseIf CBool(InStr(ex.ToString, "Premnium Episode")) Then
' MsgBox(Premium_Stream, MsgBoxStyle.Information)
' 'MsgBox(Premium_Stream, MsgBoxStyle.Information)
' ElseIf CBool(InStr(ex.ToString, "System.UnauthorizedAccessException")) Then
' MsgBox(ErrorNoPermisson + vbNewLine + ex.ToString, MsgBoxStyle.Information)
' 'MsgBox(ErrorNoPermisson + vbNewLine + ex.ToString, MsgBoxStyle.Information)
' ElseIf CBool(InStr(ex.ToString, Chr(34) + "UserAbort" + Chr(34))) Then
' MsgBox(ex.ToString, MsgBoxStyle.Information)
' 'MsgBox(ex.ToString, MsgBoxStyle.Information)
' Else
' ' MsgBox(ex.ToString, MsgBoxStyle.Information)
@ -1629,7 +1636,7 @@ Public Class Main
' Dim Version_Check2 As String() = Version_Check(1).Split(New String() {"</div>"}, System.StringSplitOptions.RemoveEmptyEntries)
' If Application.ProductVersion = Version_Check2(0) Then
' Else
' MsgBox("A newer version is available: v" + Version_Check2(0))
' 'MsgBox("A newer version is available: v" + Version_Check2(0))
' End If
' End If
' End If

View File

@ -43,6 +43,8 @@ Partial Class einstellungen
Me.pictureBox1 = New System.Windows.Forms.PictureBox()
Me.pictureBox4 = New System.Windows.Forms.PictureBox()
Me.GroupBox1 = New System.Windows.Forms.GroupBox()
Me.Label1 = New System.Windows.Forms.Label()
Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.Firefox_True = New System.Windows.Forms.CheckBox()
Me.PictureBox6 = New System.Windows.Forms.PictureBox()
Me.TabControl1 = New System.Windows.Forms.TabControl()
@ -223,9 +225,9 @@ Partial Class einstellungen
Me.GroupBox4.Controls.Add(Me.pictureBox3)
Me.GroupBox4.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox4.ForeColor = System.Drawing.Color.Black
Me.GroupBox4.Location = New System.Drawing.Point(6, 119)
Me.GroupBox4.Location = New System.Drawing.Point(6, 173)
Me.GroupBox4.Name = "GroupBox4"
Me.GroupBox4.Size = New System.Drawing.Size(339, 115)
Me.GroupBox4.Size = New System.Drawing.Size(339, 81)
Me.GroupBox4.TabIndex = 4
Me.GroupBox4.TabStop = False
Me.GroupBox4.Text = "Crunchyroll US"
@ -299,24 +301,43 @@ Partial Class einstellungen
'GroupBox1
'
Me.GroupBox1.BackColor = System.Drawing.Color.Transparent
Me.GroupBox1.Controls.Add(Me.Label1)
Me.GroupBox1.Controls.Add(Me.TextBox1)
Me.GroupBox1.Controls.Add(Me.Firefox_True)
Me.GroupBox1.Font = New System.Drawing.Font("Arial", 9.75!)
Me.GroupBox1.ForeColor = System.Drawing.Color.Black
Me.GroupBox1.Location = New System.Drawing.Point(6, 17)
Me.GroupBox1.Name = "GroupBox1"
Me.GroupBox1.Size = New System.Drawing.Size(339, 80)
Me.GroupBox1.Size = New System.Drawing.Size(339, 138)
Me.GroupBox1.TabIndex = 4
Me.GroupBox1.TabStop = False
Me.GroupBox1.Text = "Browser Settings"
'
'Label1
'
Me.Label1.AutoSize = True
Me.Label1.Location = New System.Drawing.Point(120, 28)
Me.Label1.Name = "Label1"
Me.Label1.Size = New System.Drawing.Size(100, 16)
Me.Label1.TabIndex = 2
Me.Label1.Text = "Default Website"
'
'TextBox1
'
Me.TextBox1.Location = New System.Drawing.Point(6, 57)
Me.TextBox1.Name = "TextBox1"
Me.TextBox1.Size = New System.Drawing.Size(327, 22)
Me.TextBox1.TabIndex = 1
Me.TextBox1.Text = "https://www.crunchyroll.com/"
'
'Firefox_True
'
Me.Firefox_True.AutoSize = True
Me.Firefox_True.Font = New System.Drawing.Font("Arial", 12.0!, System.Drawing.FontStyle.Bold)
Me.Firefox_True.Font = New System.Drawing.Font("Arial", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.Firefox_True.ForeColor = System.Drawing.Color.Black
Me.Firefox_True.Location = New System.Drawing.Point(54, 35)
Me.Firefox_True.Location = New System.Drawing.Point(88, 99)
Me.Firefox_True.Name = "Firefox_True"
Me.Firefox_True.Size = New System.Drawing.Size(212, 23)
Me.Firefox_True.Size = New System.Drawing.Size(166, 20)
Me.Firefox_True.TabIndex = 0
Me.Firefox_True.Text = "Use Firefox Profil Folder"
Me.Firefox_True.UseVisualStyleBackColor = True
@ -325,7 +346,7 @@ Partial Class einstellungen
'
Me.PictureBox6.Cursor = System.Windows.Forms.Cursors.Hand
Me.PictureBox6.Image = Global.Crunchyroll_Downloader.My.Resources.Resources.main_credits_default
Me.PictureBox6.Location = New System.Drawing.Point(134, 267)
Me.PictureBox6.Location = New System.Drawing.Point(131, 276)
Me.PictureBox6.Name = "PictureBox6"
Me.PictureBox6.Size = New System.Drawing.Size(76, 39)
Me.PictureBox6.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize
@ -433,4 +454,6 @@ Partial Class einstellungen
Friend WithEvents TabControl1 As TabControl
Friend WithEvents TabPage1 As TabPage
Friend WithEvents TabPage2 As TabPage
Friend WithEvents Label1 As Label
Friend WithEvents TextBox1 As TextBox
End Class

View File

@ -76,6 +76,7 @@ Public Class einstellungen
RBStaffel.Checked = True
End If
NumericUpDown1.Value = Main.MaxDL
TextBox1.Text = Main.Startseite
Try
Dim rkg As RegistryKey = Registry.CurrentUser.OpenSubKey("Software\CRDownloader")
Firefox_True.Checked = CBool(Integer.Parse(rkg.GetValue("NoUse").ToString))
@ -86,6 +87,15 @@ Public Class einstellungen
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles pictureBox4.Click
Dim rk As RegistryKey = Registry.CurrentUser.CreateSubKey("Software\CRDownloader")
If InStr(TextBox1.Text, "https://") Then
Main.Startseite = TextBox1.Text
rk.SetValue("Startseite", Main.Startseite, RegistryValueKind.String)
ElseIf TextBox1.Text = Nothing Then
Main.Startseite = "https://www.crunchyroll.com/"
rk.SetValue("Startseite", Main.Startseite, RegistryValueKind.String)
Else
End If
If A1080p.Checked Then
Main.Resu = 1080
rk.SetValue("Resu", 1080, RegistryValueKind.String)
@ -182,6 +192,7 @@ Public Class einstellungen
Private Sub pictureBox3_Click(sender As Object, e As EventArgs) Handles pictureBox3.Click
Main.LoginOnly = "US_UnBlock"
GeckoFX.keks = InputBox("Please insert the cookie below.")
GeckoFX.Show()
GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/")
End Sub
@ -208,12 +219,16 @@ Public Class einstellungen
Exit Sub
Else
'MsgBox(Session)
GeckoFX.Show()
GeckoFX.WebBrowser1.Navigate("https://www.crunchyroll.com/")
Dim SessionID1 As String() = Session.Split(New String() {Chr(34) + "session_id" + Chr(34) + ":" + Chr(34)}, System.StringSplitOptions.RemoveEmptyEntries)
Dim SessionID2 As String() = SessionID1(1).Split(New [Char]() {Chr(34)})
GeckoFX.keks = SessionID2(0)
End If
'MsgBox(Session)
'Dim JS As String = "javascript:console.log(`got session id.Setting cookie " + GeckoFX.keks + ".`);browser.cookies.set({url:`http:name:'session_id',value:" + GeckoFX.keks + ",domain:`crunchyroll.com`,httpOnly:true},()=>{browser.cookies.set({url:`http:name:'sess_id',value:" + GeckoFX.keks + ",domain:`crunchyroll.com`,httpOnly:true},()=>{browser.cookies.set({url:`http:name:'c_locale',value:'enUS',domain:`crunchyroll.com`,httpOnly:true}})});"
End Sub
Private Function GeräteID() As String
@ -348,7 +363,5 @@ Public Class einstellungen
End Sub
#End Region
End Class